Update of /cvsroot/freevo/freevo/src/audio/plugins
In directory sc8-pr-cvs1:/tmp/cvs-serv21680
Modified Files:
cdbackup.py
Log Message:
Forgot to commit this stuff.
1. Fix filenames so songs with ' work
2. Show time taken to encode in the popup box.
Index: cdbackup.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/audio/plugins/cdbackup.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** cdbackup.py 1 Jul 2003 06:10:52 -0000 1.4
--- cdbackup.py 1 Jul 2003 06:34:31 -0000 1.5
***************
*** 28,31 ****
--- 28,37 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.5 2003/07/01 06:34:31 outlyer
+ # Forgot to commit this stuff.
+ #
+ # 1. Fix filenames so songs with ' work
+ # 2. Show time taken to encode in the popup box.
+ #
# Revision 1.4 2003/07/01 06:10:52 gsbarbieri
# Destination dir is now configurable via AUDIO_BACKUP_DIR
***************
*** 210,213 ****
--- 216,224 ----
# Keep track of track#
track = i +1
+
+ # store start time
+
+ begin = time.time()
+
# CD_RIP_PATH = '%(artist)s/%(album)/%(song)s'
***************
*** 231,235 ****
if rip_format=='mp3' or rip_format== 'MP3':
pathname_cdparanoia = '/tmp'
! path_tail_cdparanoia = '/track_being_rippped'
# Otherwise if it's going to be a .wav just use the the users preferred
directory and filename.
# i.e. don't bother putting into /tmp directory, just use directory and
filename of final destination.
--- 242,246 ----
if rip_format=='mp3' or rip_format== 'MP3':
pathname_cdparanoia = '/tmp'
! path_tail_cdparanoia = '/track_being_ripped'
# Otherwise if it's going to be a .wav just use the the users preferred
directory and filename.
# i.e. don't bother putting into /tmp directory, just use directory and
filename of final destination.
***************
*** 247,251 ****
+ '.wav"' \
! if DEBUG: print 'After Command = %s' %cdparanoia_command
# Have the OS execute the CD Paranoia rip command
--- 258,262 ----
+ '.wav"' \
! if DEBUG: print 'cdparanoia: %s' %cdparanoia_command
# Have the OS execute the CD Paranoia rip command
***************
*** 277,290 ****
+ config.CD_RIP_LAME_OPTS \
+ id3_tag_opts \
! + ' \'' \
+ pathname_cdparanoia \
+ path_tail_cdparanoia \
! + '.wav\'' \
! + ' \'' \
+ pathname \
+ path_tail \
! + '.mp3\'' \
! if DEBUG: print 'lame_command = %s' %lame_command
os.system(lame_command)
--- 288,301 ----
+ config.CD_RIP_LAME_OPTS \
+ id3_tag_opts \
! + ' \"' \
+ pathname_cdparanoia \
+ path_tail_cdparanoia \
! + '.wav\"' \
! + ' \"' \
+ pathname \
+ path_tail \
! + '.mp3\"' \
! if DEBUG: 'lame:= %s' %lame_command
os.system(lame_command)
***************
*** 295,303 ****
# Flash a popup window indicating copying is done
! popup_string="Finished Copying CD"
! pop = PopupBox(text=popup_string)
pop.show()
- time.sleep(4)
- pop.destroy()
def get_formatted_cd_info(self, device):
--- 306,315 ----
# Flash a popup window indicating copying is done
! time_taken = time.time() - begin + 300
! min = int(time_taken/60)
! sec = int(time_taken%60)
! popup_string="Finished Copying CD in %im%is" % (min,sec)
! pop = AlertBox(text=popup_string)
pop.show()
def get_formatted_cd_info(self, device):
***************
*** 420,424 ****
def replace_special_char(self, string, repl='-'):
# Regular Expression Special Chars = . ^ $ * + ? { [ ] \ | ( )
! special_chars = [ '\"', '\`', '\\\\', '/' ]
"""
--- 432,436 ----
def replace_special_char(self, string, repl='-'):
# Regular Expression Special Chars = . ^ $ * + ? { [ ] \ | ( )
! special_chars = [ '\"', '\`', '\\\\', '/','\'' ]
"""
***************
*** 442,446 ****
# rather than what is passed in as repl
if (pattern == '\''):
! (new_string, num) = re.subn(pattern, '', new_string, count=0)
elif (pattern == '/'):
(new_string, num) = re.subn(pattern, '\\\\', new_string,
count=0)
--- 454,458 ----
# rather than what is passed in as repl
if (pattern == '\''):
! (new_string, num) = re.subn(pattern, '\\\'', new_string, count=0)
elif (pattern == '/'):
(new_string, num) = re.subn(pattern, '\\\\', new_string,
count=0)
-------------------------------------------------------
This SF.Net email sponsored by: Free pre-built ASP.NET sites including
Data Reports, E-commerce, Portals, and Forums are available now.
Download today and enter to win an XBOX or Visual Studio .NET.
http://aspnet.click-url.com/go/psa00100006ave/direct;at.asp_061203_01/01
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
