Author: dmeyer
Date: Sat Feb 18 12:50:23 2006
New Revision: 1193
Modified:
trunk/metadata/src/factory.py
Log:
handle system exit
Modified: trunk/metadata/src/factory.py
==============================================================================
--- trunk/metadata/src/factory.py (original)
+++ trunk/metadata/src/factory.py Sat Feb 18 12:50:23 2006
@@ -34,6 +34,7 @@
# python imports
import stat
import os
+import sys
import urlparse
import traceback
import urllib
@@ -166,6 +167,8 @@
return self.extmap[e[1:]][3](file)
except mediainfo.KaaMetadataParseError:
pass
+ except (KeyboardInterrupt, SystemExit):
+ sys.exit(0)
except:
log.exception('parse error')
@@ -176,6 +179,8 @@
file.seek(0,0)
try:
return e[3](file)
+ except (KeyboardInterrupt, SystemExit):
+ sys.exit(0)
except:
pass
return None
@@ -209,6 +214,8 @@
return e[3](url)
except mediainfo.KaaMetadataParseError:
pass
+ except (KeyboardInterrupt, SystemExit):
+ sys.exit(0)
else:
(scheme, location, path, query, fragment) = split
uhandle = urllib.urlopen(url)
@@ -219,6 +226,8 @@
return self.mimemap[mime][3](file)
except mediainfo.KaaMetadataParseError:
pass
+ except (KeyboardInterrupt, SystemExit):
+ sys.exit(0)
# XXX Todo: Try other types
pass
@@ -235,6 +244,8 @@
except IOError:
log.error('IOError reading %s' % filename)
return None
+ except (KeyboardInterrupt, SystemExit):
+ sys.exit(0)
r = self.create_from_file(f)
f.close()
if r:
@@ -263,6 +274,8 @@
return t
except mediainfo.KaaMetadataParseError:
pass
+ except (KeyboardInterrupt, SystemExit):
+ sys.exit(0)
return None
@@ -276,6 +289,8 @@
return e[3](dirname)
except mediainfo.KaaMetadataParseError:
pass
+ except (KeyboardInterrupt, SystemExit):
+ sys.exit(0)
return None
@@ -299,6 +314,8 @@
if os.path.isdir(name):
return self.create_from_directory(name)
return self.create_from_filename(name)
+ except (KeyboardInterrupt, SystemExit):
+ sys.exit(0)
except:
log.exception('kaa.metadata.create error')
log.warning('Please report this bug to the Freevo mailing list')
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
