From be0dc8af62e0aea2c703f94c78f0e049fb53f75f Mon Sep 17 00:00:00 2001 From: urlbot Date: Sat, 9 Aug 2014 23:39:00 +0200 Subject: [PATCH 1/2] fixed some code style complaints --- eventlooper.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/eventlooper.py b/eventlooper.py index d2c5c2d..5265113 100755 --- a/eventlooper.py +++ b/eventlooper.py @@ -14,7 +14,7 @@ fifo_path = os.path.join(basedir, 'cmdfifo') # rate limiting to 5 messages per 10 minutes hist_max_count = 5 -hist_max_time = 10 * 60 +hist_max_time = 10 * 60 hist_ts = [] hist_flag = True uptime = -time.time() @@ -48,7 +48,7 @@ def fetch_page(url): return (html, response.headers) except IOError as e: logger('warn', 'failed: ' + e.errno) - + return (None, None) def extract_title(url): @@ -64,12 +64,12 @@ def extract_title(url): if 'text/' != headers['content-type'][:len('text/')]: return (1, headers['content-type']) - result = re.match(r'.*?(.*?).*?', html, re.S|re.M|re.IGNORECASE) + result = re.match(r'.*?(.*?).*?', html, re.S | re.M | re.IGNORECASE) if result: return (0, result.groups()[0]) else: return (2, 'no title') - + return (-1, 'error') def chat_write(message, prefix='/say '): @@ -146,7 +146,7 @@ def mental_ill(data): c = 0 if (min_ill <= c): return True - + return False def parse_other(data): @@ -223,7 +223,7 @@ def parse_delete(filepath): os.remove(filepath) # probably better crash here def print_version_git(): - import subprocess, sys + import subprocess cmd = ['git', 'log', '-n', '1', '--oneline', '--abbrev-commit'] From 7fbc00d0cddd29f7d227f104eea935f56ad13e6f Mon Sep 17 00:00:00 2001 From: urlbot Date: Sat, 9 Aug 2014 23:50:40 +0200 Subject: [PATCH 2/2] __main__ check added --- eventlooper.py | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/eventlooper.py b/eventlooper.py index 5265113..7939bdd 100755 --- a/eventlooper.py +++ b/eventlooper.py @@ -235,14 +235,15 @@ def print_version_git(): else: print sys.argv[0] + " (unknown version)" -print_version_git() +if '__main__' == __name__: + print_version_git() -while 1: - try: - for f in os.listdir(event_files_dir): - if 'mcabber-' == f[:8]: - parse_delete(os.path.join(event_files_dir, f)) + while 1: + try: + for f in os.listdir(event_files_dir): + if 'mcabber-' == f[:8]: + parse_delete(os.path.join(event_files_dir, f)) - time.sleep(delay) - except KeyboardInterrupt: - exit(130) + time.sleep(delay) + except KeyboardInterrupt: + exit(130)