utf8 fixes in eventlogging plugin

This commit is contained in:
Marcos Pinto 2008-07-11 23:59:02 +00:00
commit 69f8bd7f89

View file

@ -147,24 +147,32 @@ class LogTabManager(object):
logfile.close() logfile.close()
if event['event_type'] is self.manager.constants['EVENT_TRACKER_ALERT']: if event['event_type'] is self.manager.constants['EVENT_TRACKER_ALERT']:
torrent = self.manager.unique_IDs[event['unique_ID']].filename.replace(os.path.join(common.CONFIG_DIR, 'torrentfiles/'), '') torrent = self.manager.unique_IDs[event['unique_ID']].filename.replace(os.path.join(common.CONFIG_DIR, 'torrentfiles/'), '')
event_message = _("Tracker alert") + " {" + _("event message: ") + event['message'] + ", "\ try:
+ _("torrent: ") + torrent + ", "\ event_message = _("Tracker alert") + " {" + _("event message: ") + event['message'] + ", "\
+ _("status code: ") + str(event['status_code']) + ", " + _("Times in a row: ")\ + _("torrent: ") + torrent + ", "\
+ str(event['times_in_row']) + "}" + _("status code: ") + str(event['status_code']) + ", " + _("Times in a row: ")\
if self.log_files: + str(event['times_in_row']) + "}"
log = os.path.join(self.logdir, torrent.replace('.torrent', '.log')) except UnicodeDecodeError:
logfile = open(log, "a") event_message = _("Unicode error")
logfile.write(time.asctime(time.localtime()) + ", " +event_message + '\n') else:
if self.log_files:
log = os.path.join(self.logdir, torrent.replace('.torrent', '.log'))
logfile = open(log, "a")
logfile.write(time.asctime(time.localtime()) + ", " +event_message + '\n')
logfile.close() logfile.close()
if event['event_type'] is self.manager.constants['EVENT_TRACKER_WARNING']: if event['event_type'] is self.manager.constants['EVENT_TRACKER_WARNING']:
torrent = self.manager.unique_IDs[event['unique_ID']].filename.replace(os.path.join(common.CONFIG_DIR, 'torrentfiles/'), '') torrent = self.manager.unique_IDs[event['unique_ID']].filename.replace(os.path.join(common.CONFIG_DIR, 'torrentfiles/'), '')
event_message = _("Tracker warning") + " {" + _("event message: ") + event['message'] + ", "\ try:
+ _("torrent: ") + torrent + "}" event_message = _("Tracker warning") + " {" + _("event message: ") + event['message'] + ", "\
if self.log_files: + _("torrent: ") + torrent + "}"
log = os.path.join(self.logdir, torrent.replace('.torrent', '.log')) except UnicodeDecodeError:
logfile = open(log, "a") event_message = _("Unicode error")
logfile.write(time.asctime(time.localtime()) + ", " +event_message + '\n') else:
logfile.close() if self.log_files:
log = os.path.join(self.logdir, torrent.replace('.torrent', '.log'))
logfile = open(log, "a")
logfile.write(time.asctime(time.localtime()) + ", " +event_message + '\n')
logfile.close()
if event['event_type'] is self.manager.constants['EVENT_STORAGE_MOVED']: if event['event_type'] is self.manager.constants['EVENT_STORAGE_MOVED']:
torrent = self.manager.unique_IDs[event['unique_ID']].filename.replace(os.path.join(common.CONFIG_DIR, 'torrentfiles/'), '') torrent = self.manager.unique_IDs[event['unique_ID']].filename.replace(os.path.join(common.CONFIG_DIR, 'torrentfiles/'), '')
event_message = _("Storage moved") + " {" + _("event message: ") + event['message'] + ", "\ event_message = _("Storage moved") + " {" + _("event message: ") + event['message'] + ", "\
@ -215,12 +223,16 @@ class LogTabManager(object):
logfile.write(time.asctime(time.localtime()) + ", " +event_message + '\n') logfile.write(time.asctime(time.localtime()) + ", " +event_message + '\n')
logfile.close() logfile.close()
if event['event_type'] is self.manager.constants['EVENT_OTHER']: if event['event_type'] is self.manager.constants['EVENT_OTHER']:
event_message = _("Other") + " {" + _("event message: ") + event['message'] + "}" try:
if self.log_files: event_message = _("Other") + " {" + _("event message: ") + event['message'] + "}"
log = os.path.join(self.logdir, 'other.log') except UnicodeDecodeError:
logfile = open(log, "a") event_message = _("Unicode error")
logfile.write(time.asctime(time.localtime()) + ", " +event_message + '\n') else:
logfile.close() if self.log_files:
log = os.path.join(self.logdir, 'other.log')
logfile = open(log, "a")
logfile.write(time.asctime(time.localtime()) + ", " +event_message + '\n')
logfile.close()
if not event_message is None: if not event_message is None:
label = gtk.Label() label = gtk.Label()
self.labels.append(label) self.labels.append(label)