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

Modified Files:
        mover.py 
Log Message:
patch from Eirik Meland

Index: mover.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/video/plugins/mover.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** mover.py    14 Oct 2003 18:15:59 -0000      1.4
--- mover.py    16 Oct 2003 09:18:20 -0000      1.5
***************
*** 13,16 ****
--- 13,19 ----
  # -----------------------------------------------------------------------
  # $Log$
+ # Revision 1.5  2003/10/16 09:18:20  dischi
+ # patch from Eirik Meland
+ #
  # Revision 1.4  2003/10/14 18:15:59  dischi
  # patch from Eirik Meland
***************
*** 114,140 ****
      def mover_to_series(self, arg=None, menuw=None):
          # make to_dir an absolute path
          if not os.path.isabs(self.to_dir):
!             self.to_dir = os.path.join(os.path.dirname(self.item.filename),
!                                        self.to_dir)
  
          # make to_dir if it doesn't exist and makedirs==True
!         if not os.path.exists(self.to_dir):
!             if os.path.exists(os.path.dirname(self.to_dir)):
                  if self.makedirs:
!                     os.makedirs(self.to_dir)
                  else:
                      _debug_("Path doesn't exist, and makedirs=%s" % self.makedirs)
                      menuw.delete_menu(menuw=menuw)
                      return
!         elif not os.path.isdir(self.to_dir):
!             _debug_("%s is not a dir" % self.to_dir)
              return
  
          # move file
!         os.system('mv "%s" "%s"' % (self.item.filename, self.to_dir))
  
          # move fxd file
          if hasattr(self.item, 'fxd_file'):
!             os.system('mv "%s" "%s"' % (self.item.fxd_file, self.to_dir))
  
          # move picture(s)
--- 117,145 ----
      def mover_to_series(self, arg=None, menuw=None):
          # make to_dir an absolute path
+         local_to_dir = self.to_dir
          if not os.path.isabs(self.to_dir):
!             local_to_dir = os.path.join(os.path.dirname(self.item.filename),
!                                         self.to_dir)
!         
  
          # make to_dir if it doesn't exist and makedirs==True
!         if not os.path.exists(local_to_dir):
!             if os.path.exists(os.path.dirname(local_to_dir)):
                  if self.makedirs:
!                     os.makedirs(local_to_dir)
                  else:
                      _debug_("Path doesn't exist, and makedirs=%s" % self.makedirs)
                      menuw.delete_menu(menuw=menuw)
                      return
!         elif not os.path.isdir(local_to_dir):
!             _debug_("%s is not a dir" % local_to_dir)
              return
  
          # move file
!         os.system('mv "%s" "%s"' % (self.item.filename, local_to_dir))
  
          # move fxd file
          if hasattr(self.item, 'fxd_file'):
!             os.system('mv "%s" "%s"' % (self.item.fxd_file, local_to_dir))
  
          # move picture(s)
***************
*** 143,147 ****
              file = base + '.' + suffix
              if os.path.isfile(file):
!                 os.system('mv "%s" "%s"' % (file, self.to_dir))
  
          menuw.delete_menu(menuw=menuw)
--- 148,152 ----
              file = base + '.' + suffix
              if os.path.isfile(file):
!                 os.system('mv "%s" "%s"' % (file, local_to_dir))
  
          menuw.delete_menu(menuw=menuw)




-------------------------------------------------------
This SF.net email is sponsored by: SF.net Giveback Program.
SourceForge.net hosts over 70,000 Open Source Projects.
See the people who have HELPED US provide better services:
Click here: http://sourceforge.net/supporters.php
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog

Reply via email to