Author: dmeyer
Date: Sat Apr 14 19:24:38 2007
New Revision: 9440
Modified:
trunk/ui/src/menu/files.py
trunk/ui/src/util.py
Log:
move util.unlink to menu.files
Modified: trunk/ui/src/menu/files.py
==============================================================================
--- trunk/ui/src/menu/files.py (original)
+++ trunk/ui/src/menu/files.py Sat Apr 14 19:24:38 2007
@@ -33,9 +33,13 @@
# python imports
import os
+import stat
import shutil
import logging
+# kaa imports
+import kaa.notifier
+
# freevo imports
from freevo.ui import util
@@ -117,4 +121,14 @@
for f in self.files + [ self.fxd_file, self.image ]:
if not f:
continue
- util.unlink(f)
+ try:
+ if os.path.isdir(filename) or \
+ os.stat(filename)[stat.ST_SIZE] > 1000000:
+ base = '.' + os.path.basename(filename) + '.freevo~'
+ name = os.path.join(os.path.dirname(filename), base)
+ os.rename(filename, name)
+ kaa.notifier.Process(['rm', '-rf', name]).start()
+ else:
+ os.unlink(filename)
+ except (OSError, IOError), e:
+ log.error('can\'t delete %s: %s' % (filename, e))
Modified: trunk/ui/src/util.py
==============================================================================
--- trunk/ui/src/util.py (original)
+++ trunk/ui/src/util.py Sat Apr 14 19:24:38 2007
@@ -175,23 +175,6 @@
del self.cache[key]
del self.lru[self.lru.index(key)]
-#
-# misc file ops
-#
-
-def unlink(filename):
- try:
- if os.path.isdir(filename) or \
- os.stat(filename)[stat.ST_SIZE] > 1000000:
- base = '.' + os.path.basename(filename) + '.freevo~'
- name = os.path.join(os.path.dirname(filename), base)
- os.rename(filename, name)
- kaa.notifier.Process(['rm', '-rf', name]).start()
- else:
- os.unlink(filename)
- except (OSError, IOError), e:
- log.error('can\'t delete %s: %s' % (filename, e))
-
#
# find files by pattern or suffix
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
