catdog2/urlbot-native
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
Conflicts:
	eventlooper.py
This commit is contained in:
Dino
2014-08-10 00:32:44 +02:00
parent 762a2618bc 7fbc00d0cd
commit 9d8e5983a9
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
eventlooper.py
View File

@@ -14,7 +14,7 @@ fifo_path = os.path.join(basedir, 'cmdfifo')
# rate limiting to 5 messages per 10 minutes # rate limiting to 5 messages per 10 minutes
hist_max_count = 5 hist_max_count = 5
hist_max_time = 10 * 60 hist_max_time = 10 * 60
hist_ts = [] hist_ts = []
hist_flag = True hist_flag = True
uptime = -time.time() uptime = -time.time()
@@ -49,7 +49,7 @@ def fetch_page(url):
return (html, response.headers) return (html, response.headers)
except IOError as e: except IOError as e:
logger('warn', 'failed: ' + e.errno) logger('warn', 'failed: ' + e.errno)
return (None, None) return (None, None)
def extract_title(url): def extract_title(url):
@@ -65,12 +65,12 @@ def extract_title(url):
if 'text/' != headers['content-type'][:len('text/')]: if 'text/' != headers['content-type'][:len('text/')]:
return (1, headers['content-type']) return (1, headers['content-type'])
result = re.match(r'.*?<title.*?>(.*?)</title>.*?', html, re.S|re.M|re.IGNORECASE) result = re.match(r'.*?<title.*?>(.*?)</title>.*?', html, re.S | re.M | re.IGNORECASE)
if result: if result:
return (0, result.groups()[0]) return (0, result.groups()[0])
else: else:
return (2, 'no title') return (2, 'no title')
return (-1, 'error') return (-1, 'error')
def chat_write(message, prefix='/say '): def chat_write(message, prefix='/say '):
@@ -147,7 +147,7 @@ def mental_ill(data):
c = 0 c = 0
if (min_ill <= c): if (min_ill <= c):
return True return True
return False return False
def parse_other(data): def parse_other(data):
@@ -224,7 +224,7 @@ def parse_delete(filepath):
os.remove(filepath) # probably better crash here os.remove(filepath) # probably better crash here
def print_version_git(): def print_version_git():
import subprocess, sys import subprocess
cmd = ['git', 'log', '-n', '1', '--oneline', '--abbrev-commit'] cmd = ['git', 'log', '-n', '1', '--oneline', '--abbrev-commit']
@@ -236,9 +236,9 @@ def print_version_git():
else: else:
print sys.argv[0] + " (unknown version)" print sys.argv[0] + " (unknown version)"
#print_version_git() if '__main__' == __name__:
print_version_git()
if __name__ == '__main__':
while 1: while 1:
try: try:
for f in os.listdir(event_files_dir): for f in os.listdir(event_files_dir):