Update of /cvsroot/freevo/freevo/src/plugins
In directory sc8-pr-cvs1:/tmp/cvs-serv29181/src/plugins

Modified Files:
        file_ops.py 
Log Message:
fxd and imdb patches from Eirik Meland


Index: file_ops.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/plugins/file_ops.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** file_ops.py 20 Sep 2003 15:08:26 -0000      1.5
--- file_ops.py 20 Sep 2003 15:46:48 -0000      1.6
***************
*** 10,13 ****
--- 10,16 ----
  # -----------------------------------------------------------------------
  # $Log$
+ # Revision 1.6  2003/09/20 15:46:48  dischi
+ # fxd and imdb patches from Eirik Meland
+ #
  # Revision 1.5  2003/09/20 15:08:26  dischi
  # some adjustments to the missing testfiles
***************
*** 64,80 ****
          create list of possible actions
          """
          if ((item.type == 'video' and item.mode == 'file') or \
              item.type in ( 'audio', 'image' )) and not item.media:
              self.item = item
!             return [ (self.confirm_delete, 'Delete file', 'delete') ]
!         return []
  
  
      def confirm_delete(self, arg=None, menuw=None):
          self.menuw = menuw
!         ConfirmBox(text='Do you wish to delete\n %s?' % self.item.name,
                     handler=self.delete_file, default_choice=1).show()
  
!     def save_unlink(self, filename):
          try:
              os.unlink(filename)
--- 67,91 ----
          create list of possible actions
          """
+         items = []
          if ((item.type == 'video' and item.mode == 'file') or \
              item.type in ( 'audio', 'image' )) and not item.media:
              self.item = item
!             items.append((self.confirm_delete, 'Delete file', 'delete'))
!             if item.type == 'video' and hasattr(item, 'fxd_file'):
!                 items.append((self.confirm_info_delete, 'Delete info', 
'delete_info'))
!         return items
  
  
      def confirm_delete(self, arg=None, menuw=None):
          self.menuw = menuw
!         ConfirmBox(text='Do you wish to delete\n \'%s\'?' % self.item.name,
                     handler=self.delete_file, default_choice=1).show()
+         
+     def confirm_info_delete(self, arg=None, menuw=None):
+         self.menuw = menuw
+         ConfirmBox(text='Delete info about\n \'%s\'?' % self.item.name,
+                    handler=self.delete_info, default_choice=1).show()
  
!     def safe_unlink(self, filename):
          try:
              os.unlink(filename)
***************
*** 82,107 ****
              print 'can\'t delete %s' % filename
          
!     def delete_file(self):
!         _debug_('Deleting %s' % self.item.filename)
! 
          if self.item.type in ('video', 'audio'):
              base = os.path.splitext(self.item.filename)[0] + '.'
              if os.path.isfile(base + 'jpg'):
!                 self.save_unlink(base + 'jpg')
              if os.path.isfile(base + 'png'):
!                 self.save_unlink(base + 'png')
  
          if os.path.isfile(self.item.filename):
!             self.save_unlink(self.item.filename)
  
!         if self.item.type == 'video' and hasattr(self, 'fxd_file') and \
!                os.path.isfile(self.item.fxd_file) and \
!                (not config.MOVIE_DATA_DIR or \
!                 self.item.fxd_file.find(config.MOVIE_DATA_DIR)) and \
!                (not config.TV_SHOW_DATA_DIR or \
!                 self.item.fxd_file.find(config.TV_SHOW_DATA_DIR) == -1)
!                (not config.TV_SHOW_IMAGE_DIR or \
!                 self.item.fxd_file.find(config.TV_SHOW_IMAGE_DIR) == -1):
!                    self.save_unlink(self.item.fxd_file)
          if self.menuw:
              self.menuw.back_one_menu(arg='reload')
--- 93,129 ----
              print 'can\'t delete %s' % filename
          
!     def delete_pictures(self):
!         _debug_('Deleting pictures for %s' % self.item.filename)
          if self.item.type in ('video', 'audio'):
              base = os.path.splitext(self.item.filename)[0] + '.'
              if os.path.isfile(base + 'jpg'):
!                 self.safe_unlink(base + 'jpg')
              if os.path.isfile(base + 'png'):
!                 self.safe_unlink(base + 'png')
! 
!     def delete_fxd(self):
!         _debug_('Deleting fxd for %s' % self.item.filename)
!         if self.item.type == 'video' and hasattr(self.item, 'fxd_file') and \
!                os.path.isfile(self.item.fxd_file) and \
!                ((not config.TV_SHOW_DATA_DIR) or \
!                 (self.item.fxd_file.find(config.TV_SHOW_DATA_DIR) != 0)):
!             self.safe_unlink(self.item.fxd_file)
! 
!     def delete_file(self):
!         _debug_('Deleting %s' % self.item.filename)
! 
!         self.delete_pictures()
!         self.delete_fxd()
  
          if os.path.isfile(self.item.filename):
!             self.safe_unlink(self.item.filename)
  
!         if self.menuw:
!             self.menuw.back_one_menu(arg='reload')
! 
!     def delete_info(self):
!         _debug_('Deleting info for %s' % self.item.filename)
!         self.delete_pictures()
!         self.delete_fxd()
          if self.menuw:
              self.menuw.back_one_menu(arg='reload')




-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog

Reply via email to