Author: duncan
Date: Mon Oct  2 10:05:44 2006
New Revision: 8299

Modified:
   branches/rel-1-5/freevo/src/audio/plugins/cdbackup.py

Log:
[ 1569162 ] cdbackup plugin patch
Patch applied.


Modified: branches/rel-1-5/freevo/src/audio/plugins/cdbackup.py
==============================================================================
--- branches/rel-1-5/freevo/src/audio/plugins/cdbackup.py       (original)
+++ branches/rel-1-5/freevo/src/audio/plugins/cdbackup.py       Mon Oct  2 
10:05:44 2006
@@ -70,6 +70,7 @@
 import threading
 import re
 import shutil
+import errno
 
 import config
 import menu
@@ -207,6 +208,7 @@
     def stop_ripping(self, arg=None, menuw=None):
         self.rip_thread.abort = True
         self.rip_thread.join()
+        self.rip_thread = None
         menuw.delete_submenu()
 
 
@@ -297,7 +299,7 @@
         dir_audio = config.AUDIO_BACKUP_DIR
 
         user_rip_path_prefs = {  'artist': artist,
-                                        'album': album,
+                                 'album': album,
                                  'genre': genre }
 
         path_list = re.split("\\/", config.CD_RIP_PN_PREF)
@@ -318,14 +320,18 @@
 
         try:
             os.makedirs(pathname, 0777)
-        except:
-            _debug_(_( 'Directory %s already exists' ) % pathname)
+        except OSError, e:
+            if e.errno == errno.EEXIST:
+                _debug_(_( 'Directory %s already exists' ) % pathname)
+            else:
+                # FIXME: popup
+                _debug_(_( "Cannot rip to '%s'! (%s)") % (pathname, 
e.strerror))
 
         try:
-           mycoverart = '%s/mmpython/disc/%s.jpg' % (config.FREEVO_CACHEDIR, 
discid)
-           if os.path.isfile(mycoverart):
-               shutil.copy(mycoverart, os.path.join(pathname,'cover.jpg'))
-       except:
+            mycoverart = '%s/mmpython/disc/%s.jpg' % (config.FREEVO_CACHEDIR, 
discid)
+            if os.path.isfile(mycoverart):
+                shutil.copy(mycoverart, os.path.join(pathname,'cover.jpg'))
+        except:
             _debug_('can not copy over cover art')
 
         self.output_directory = pathname

-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog

Reply via email to