exman       08/06/21 02:35:51

  Log:
  songtax
  
  Status:
  
  Vendor Tag:	simin
  Release Tags:	head
  
  N songtax/config.mk
  N songtax/config.mk.in
  N songtax/configure
  N songtax/Makefile
  N songtax/setup.py
  N songtax/songtax-ko.ts
  N songtax/songtax.desktop
  N songtax/songtax.desktop.in
  N songtax/songtax.icns
  N songtax/songtax.png
  N songtax/songtax.py
  N songtax/songtax.qrc
  
  No conflicts created by this import


exman       08/06/21 02:37:17

  Removed:     .        config.mk songtax.desktop
  Log:
  


exman       08/06/21 02:44:05

  Log:
  Directory /cvsroot/simin/songtax/mactool added to the repository


exman       08/06/21 02:44:27

  Added:       mactool  libX11.6.dylib libXau.6.dylib libfreetype.6.dylib
                        libjpeg.62.dylib libmp3lame.0.dylib
                        libungif.4.dylib libxcb-xlib.0.dylib libxcb.1.dylib
                        swfextract
  Log:
  
  
  Revision  Changes    Path
  1.1                  songtax/mactool/libX11.6.dylib
  
  	<<Binary file>>
  
  
  1.1                  songtax/mactool/libXau.6.dylib
  
  	<<Binary file>>
  
  
  1.1                  songtax/mactool/libfreetype.6.dylib
  
  	<<Binary file>>
  
  
  1.1                  songtax/mactool/libjpeg.62.dylib
  
  	<<Binary file>>
  
  
  1.1                  songtax/mactool/libmp3lame.0.dylib
  
  	<<Binary file>>
  
  
  1.1                  songtax/mactool/libungif.4.dylib
  
  	<<Binary file>>
  
  
  1.1                  songtax/mactool/libxcb-xlib.0.dylib
  
  	<<Binary file>>
  
  
  1.1                  songtax/mactool/libxcb.1.dylib
  
  	<<Binary file>>
  
  
  1.1                  songtax/mactool/swfextract
  
  	<<Binary file>>
  
  


exman       08/06/21 16:03:21

  Modified:    .        setup.py songtax.py
  Added:       .        macbuild.sh mkdmg
  Log:
  
  
  Revision  Changes    Path
  1.2       +14 -1     songtax/setup.py
  
  Index: setup.py
  ===================================================================
  RCS file: /cvsroot/simin/songtax/setup.py,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- setup.py	20 Jun 2008 17:35:51 -0000	1.1
  +++ setup.py	21 Jun 2008 07:03:21 -0000	1.2
  @@ -19,7 +19,20 @@
   )
   
   APP = ['songtax.py']
  -DATA_FILES = ['songtax-ko.qm', ]
  +
  +
  +
  +DATA_FILES = ['songtax-ko.qm', 
  +            'mactool/libX11.6.dylib',
  +            'mactool/libXau.6.dylib',
  +            'mactool/libfreetype.6.dylib',
  +            'mactool/libjpeg.62.dylib',
  +            'mactool/libmp3lame.0.dylib',
  +            'mactool/libungif.4.dylib',
  +            'mactool/libxcb-xlib.0.dylib',
  +            'mactool/libxcb.1.dylib',
  +            'mactool/swfextract',
  +                ]
   OPTIONS = {'includes': ['sip', 'PyQt4._qt'], 
              'argv_emulation': True, 
              'iconfile': 'songtax.icns',
  
  
  
  1.2       +6 -2      songtax/songtax.py
  
  Index: songtax.py
  ===================================================================
  RCS file: /cvsroot/simin/songtax/songtax.py,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- songtax.py	20 Jun 2008 17:35:51 -0000	1.1
  +++ songtax.py	21 Jun 2008 07:03:21 -0000	1.2
  @@ -11,6 +11,10 @@
   import urllib
   cnaver=re.compile('http://jr.naver.com/kidsong/view.nhn.+')
   cnid=re.compile('nid=([0-9]+)')
  +prefix = ''
  +if sys.platform=='darwin':
  +    prefix='./'
  +
   
   class Songtax(QtGui.QWidget):
       def __init__(self, parent=None):
  @@ -66,14 +70,14 @@
           tmpswf = '/tmp/output.swf'
           open(tmpswf,'wb').write(c.read())
           cp=re.compile('1 MP3')
  -        result = os.popen('swfextract %s' % tmpswf).read()
  +        result = os.popen(prefix+'swfextract %s' % tmpswf).read()
           m = cp.search(result)
           if not m:
               os.unlink(tmpswf)
               QtGui.QMessageBox.warning(self, self.tr("Warning"),
                           self.tr('Could not found mp3 from swf'))
               return
  -        cmd = 'swfextract -o %s -m %s' % (tmpoutput, tmpswf)
  +        cmd = prefix+'swfextract -o %s -m %s' % (tmpoutput, tmpswf)
           ret = os.popen(cmd).read()
           os.unlink(tmpswf)
           if not ret.startswith('NOTICE'):
  
  
  
  1.1                  songtax/macbuild.sh
  
  Index: macbuild.sh
  ===================================================================
  rm -rf build/ dist
  python2.4 setup.py py2app
  rm -f *.dmg
  ./mkdmg dist Songtax
  mv dist.dmg songtax-0.1.dmg
  
  
  
  1.1                  songtax/mkdmg
  
  Index: mkdmg
  ===================================================================
  #!/usr/bin/env ruby
  
  # usage error
  if ARGV.length < 1 or ARGV.length > 2 then
      $stderr.puts( "Usage: #{File.basename( $0 )} directory [cd name]" )
      exit( 1 )
  end
  
  # get variables
  dir = ARGV.shift.sub( /\/$/, "" )
  volname = if ARGV.length == 0 then
          File.basename( File.expand_path( dir ) )
      else
          ARGV.shift
      end
  output = "#{dir}.dmg"
  
  # dmg the folder
  `hdiutil create -fs HFS+ -srcfolder "#{dir}" -volname "#{volname}" "#{output}"`
  
  
  
  


exman       08/06/21 17:31:38

  Modified:    .        songtax.py
  Log:
  
  
  Revision  Changes    Path
  1.3       +14 -5     songtax/songtax.py
  
  Index: songtax.py
  ===================================================================
  RCS file: /cvsroot/simin/songtax/songtax.py,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- songtax.py	21 Jun 2008 07:03:21 -0000	1.2
  +++ songtax.py	21 Jun 2008 08:31:38 -0000	1.3
  @@ -20,6 +20,7 @@
       def __init__(self, parent=None):
           QtGui.QWidget.__init__(self, parent)
           self.setWindowTitle(self.tr("Songtax"))
  +        self.setWindowIcon(QtGui.QIcon(":songtax.png"))
           self.__bg = QtGui.QPixmap(":songtax.png")
           self.setWindowFlags(QtCore.Qt.FramelessWindowHint)
           self.setMask(self.__bg.mask())
  @@ -56,41 +57,49 @@
           else:
               event.ignore()
       def __openLater(self):
  +        self.setCursor(QtGui.QCursor(QtCore.Qt.WaitCursor))
           tmpoutput = QtCore.QDir.tempPath ()+'output.mp3'
  +        tmpswf = QtCore.QDir.tempPath ()+'output.swf'
           c = urllib.urlopen(self.__url)
           html = c.read()
           cp=re.compile('http://.+swf')
           m = cp.search(html)
           if not m:
  +            self.setCursor(QtGui.QCursor())
               QtGui.QMessageBox.warning(self, self.tr("Warning"),
                           self.tr('Could not found swf from URL'))
               return
           swfpath = m.group()
           c = urllib.urlopen(swfpath)
  -        tmpswf = '/tmp/output.swf'
           open(tmpswf,'wb').write(c.read())
           cp=re.compile('1 MP3')
           result = os.popen(prefix+'swfextract %s' % tmpswf).read()
           m = cp.search(result)
           if not m:
  -            os.unlink(tmpswf)
  +            self.setCursor(QtGui.QCursor())
  +            f = QtCore.QFile(tmpswf)
  +            f.remove()
               QtGui.QMessageBox.warning(self, self.tr("Warning"),
                           self.tr('Could not found mp3 from swf'))
               return
           cmd = prefix+'swfextract -o %s -m %s' % (tmpoutput, tmpswf)
           ret = os.popen(cmd).read()
  -        os.unlink(tmpswf)
  +        f = QtCore.QFile(tmpswf)
  +        f.remove()
           if not ret.startswith('NOTICE'):
  +            self.setCursor(QtGui.QCursor())
               QtGui.QMessageBox.warning(self, self.tr("Warning"),
                           ret.strip())
               return
           abspath = QtGui.QFileDialog.getSaveFileName (self, 
                   self.tr('Save file'), QtCore.QDir.homePath(), 
                   self.tr("MP3 (*.mp3)"))
  +        f = QtCore.QFile(tmpoutput)
           if abspath:
  -            os.rename(tmpoutput, abspath)
  +            f.rename(abspath)
           else:
  -            os.unlink(tmpoutput)
  +            f.remove()
  +        self.setCursor(QtGui.QCursor())
   
   
   
  
  
  


exman       08/06/21 18:30:07

  Modified:    .        songtax.py
  Log:
  
  
  Revision  Changes    Path
  1.4       +1 -1      songtax/songtax.py
  
  Index: songtax.py
  ===================================================================
  RCS file: /cvsroot/simin/songtax/songtax.py,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- songtax.py	21 Jun 2008 08:31:38 -0000	1.3
  +++ songtax.py	21 Jun 2008 09:30:07 -0000	1.4
  @@ -91,6 +91,7 @@
               QtGui.QMessageBox.warning(self, self.tr("Warning"),
                           ret.strip())
               return
  +        self.setCursor(QtGui.QCursor())
           abspath = QtGui.QFileDialog.getSaveFileName (self, 
                   self.tr('Save file'), QtCore.QDir.homePath(), 
                   self.tr("MP3 (*.mp3)"))
  @@ -99,7 +100,6 @@
               f.rename(abspath)
           else:
               f.remove()
  -        self.setCursor(QtGui.QCursor())
   
   
   
  
  
  


exman       08/06/21 18:43:51

  Modified:    .        songtax.py
  Added:       .        setup-win.py songtax.ico
  Log:
  
  
  Revision  Changes    Path
  1.5       +1 -0      songtax/songtax.py
  
  Index: songtax.py
  ===================================================================
  RCS file: /cvsroot/simin/songtax/songtax.py,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- songtax.py	21 Jun 2008 09:30:07 -0000	1.4
  +++ songtax.py	21 Jun 2008 09:43:51 -0000	1.5
  @@ -3,6 +3,7 @@
   
   
   import sys, os
  +import sip
   from PyQt4 import QtCore, QtGui
   import signal
   signal.signal(signal.SIGINT, signal.SIG_DFL)
  
  
  
  1.1                  songtax/setup-win.py
  
  Index: setup-win.py
  ===================================================================
  # -*- coding: utf-8 -*-
  # setup.py
  from distutils.core import setup
  import glob
  import py2exe
  
  options = {"py2exe": {"compressed": 1,
                        "optimize": 2}}
  
  from py2exe.build_exe import py2exe
  
  setup(
      options = options,
      name="Songtax",
      windows=[{"script":"songtax.py",
          'icon_resources': [(1, 'songtax.ico')]}],
      )
  
  
  
  # vim600: sw=4 ts=8 sts=4 et bs=2 fdm=marker fileencoding=utf8 encoding=utf8
  
  
  
  1.1                  songtax/songtax.ico
  
  	<<Binary file>>
  
  


exman       08/07/09 10:49:57

  Added:       .        songtax.iss winbuild.bat
  Log:
  
  
  Revision  Changes    Path
  1.1                  songtax/songtax.iss
  
  Index: songtax.iss
  ===================================================================
  ; Script generated by the Inno Setup Script Wizard.
  ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
  
  [Setup]
  AppName=Songtax
  AppVerName=Songtax 0.1
  AppPublisher=Jooncheol Park
  AppPublisherURL=http://exman.pe.kr
  AppSupportURL=http://exman.pe.kr
  AppUpdatesURL=http://exman.pe.kr
  DefaultDirName={pf}\Songtax 0.1
  DefaultGroupName=Songtax 0.1
  OutputDir=C:\cygwin\home\Administrator\songtax\output
  OutputBaseFilename=songtax-0.1-setup
  Compression=lzma
  SolidCompression=yes
  UnInstallable=yes
  
  [Languages]
  Name: "english"; MessagesFile: "compiler:Default.isl"
  Name: "korean"; MessagesFile: "compiler:Languages\Korean.isl"
  
  [Tasks]
  Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
  
  [Files]
  Source: "C:\cygwin\home\Administrator\songtax\dist\*"; DestDir: "{app}"; Flags: ignoreversion
  
  ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
  
  [Icons]
  Name: "{group}\Songtax 0.1"; Filename: "{app}\Songtax.exe"; WorkingDir: "{app}"
  Name: "{userdesktop}\Songtax 0.1"; Filename: "{app}\Songtax.exe"; Tasks: desktopicon; WorkingDir: "{app}"
  Name: "{group}\uninstall"; Filename: "{uninstallexe}"
  
  [Run]
  Filename: "{app}\Songtax.exe"; WorkingDir: "{app}"; Description: "{cm:LaunchProgram,Songtax}"; Flags: nowait postinstall skipifsilent
  
  
  
  
  1.1                  songtax/winbuild.bat
  
  Index: winbuild.bat
  ===================================================================
  \Python25\python setup-win.py py2exe
  copy *.qm dist
  copy "c:\Program Files\SWFTools\swfextract.exe" dist
  pause
  
  
  


