From 907fb0065523e89f0c3786013fc21b49596e1009 Mon Sep 17 00:00:00 2001 From: Gra Date: Fri, 24 Apr 2009 20:06:10 +0200 Subject: [PATCH] Reworked KeyLogger.process_settings to improve readability. --- keylogger.pyw | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/keylogger.pyw b/keylogger.pyw index f144afa..3415340 100644 --- a/keylogger.pyw +++ b/keylogger.pyw @@ -110,14 +110,19 @@ class KeyLogger: file before doing anything. ''' + log_dir = os.path.normpath(self.settings['General']['Log Directory']) if os.path.isabs(self.settings['General']['Log Directory']): - self.settings['General']['Log Directory'] = os.path.normpath(self.settings['General']['Log Directory']) + self.settings['General']['Log Directory'] = log_dir else: - self.settings['General']['Log Directory'] = os.path.join(myutils.get_main_dir(), os.path.normpath(self.settings['General']['Log Directory'])) - - self.filter = re.compile(r"[\\\/\:\*\?\"\<\>\|]+") #regexp filter for the non-allowed characters in windows filenames. - self.settings['General']['Log File'] = self.filter.sub(r'__',self.settings['General']['Log File']) - self.settings['General']['System Log'] = self.filter.sub(r'__',self.settings['General']['System Log']) + self.settings['General']['Log Directory'] = \ + os.path.join(myutils.get_main_dir(), log_dir) + + # Regexp filter for the non-allowed characters in windows filenames. + self.filter = re.compile(r"[\\\/\:\*\?\"\<\>\|]+") + self.settings['General']['Log File'] = \ + self.filter.sub(r'__',self.settings['General']['Log File']) + self.settings['General']['System Log'] = \ + self.filter.sub(r'__',self.settings['General']['System Log']) # todo: also want to run imagesdirectoryname (tbc) through self.filter -- 2.45.1