X-Git-Url: https://plomlompom.com/repos/?p=plomlombot-irc.git;a=blobdiff_plain;f=plomlombot.py;h=412ae2117aeb9fc73df1a105ed70014094e992f7;hp=741b01c65beb60b8c3a0ab0221bf781eae5989fa;hb=ee64c72b59346940c29cf068dd7b1cb9425f332e;hpb=f765b2b0cc73a27d98802f5e7ecb64a65b83ba4c diff --git a/plomlombot.py b/plomlombot.py index 741b01c..412ae21 100755 --- a/plomlombot.py +++ b/plomlombot.py @@ -136,12 +136,12 @@ def handle_command(command, argument, notice, target, session): quotesfile = open(session.quotesfile, "r") lines = quotesfile.readlines() quotesfile.close() - notice("ADDED QUOTE #" + str(len(lines) - 1)) + notice("added quote #" + str(len(lines) - 1)) def quote(): def help(): - notice("SYNTAX: !quote [int] OR !quote search QUERY") + notice("syntax: !quote [int] OR !quote search QUERY") notice("QUERY may be a boolean grouping of quoted or unquoted " + "search terms, examples:") notice("!quote search foo") @@ -159,7 +159,7 @@ def handle_command(command, argument, notice, target, session): help() return if not os.access(session.quotesfile, os.F_OK): - notice("NO QUOTES AVAILABLE") + notice("no quotes available") return quotesfile = open(session.quotesfile, "r") lines = quotesfile.readlines() @@ -168,7 +168,7 @@ def handle_command(command, argument, notice, target, session): if len(tokens) == 1: i = int(tokens[0]) if i == 0 or i > len(lines): - notice("THERE'S NO QUOTE OF THAT INDEX") + notice("there's no quote of that index") return i = i - 1 elif len(tokens) > 1: @@ -176,25 +176,25 @@ def handle_command(command, argument, notice, target, session): try: results = plomsearch.search(query, lines) except plomsearch.LogicParserError as err: - notice("FAILED QUERY PARSING: " + str(err)) + notice("failed query parsing: " + str(err)) return if len(results) == 0: - notice("NO QUOTES MATCHING QUERY") + notice("no quotes matching query") else: if len(results) > 3: - notice("SHOWING 3 OF " + str(len(results)) + " QUOTES") + notice("showing 3 of " + str(len(results)) + " quotes") for result in results[:3]: - notice("QUOTE #" + str(result[0] + 1) + ": " + notice("quote #" + str(result[0] + 1) + ": " + result[1][:-1]) return else: i = random.randrange(len(lines)) - notice("QUOTE #" + str(i + 1) + ": " + lines[i][:-1]) + notice("quote #" + str(i + 1) + ": " + lines[i][:-1]) def markov(): - from random import choice, shuffle - select_length = 2 - selections = [] + + def help(): + notice("syntax: !markov [integer from 1 to infinite]") def markov(snippet): usable_selections = [] @@ -215,8 +215,26 @@ def handle_command(command, argument, notice, target, session): selection = choice(usable_selections) return selection[select_length] + if "" == argument: + tokens = [] + else: + tokens = argument.split(" ") + if (len(tokens) > 1 or (len(tokens) == 1 and not tokens[0].isdigit())): + help() + return + + from random import choice, shuffle + select_length = 2 + if len(tokens) == 1: + n = int(tokens[0]) + if n > 0: + select_length = n + else: + notice("bad value, using default: " + str(select_length)) + selections = [] + if not os.access(session.markovfile, os.F_OK): - notice("NOT ENOUGH TEXT TO MARKOV.") + notice("not enough text to markov for selection length") return # Lowercase incoming lines, ensure they end in a sentence end mark. @@ -230,8 +248,8 @@ def handle_command(command, argument, notice, target, session): if line[-1] not in sentence_end_markers: line += "." tokens += line.split() - if len(tokens) <= select_length: - notice("NOT ENOUGH TEXT TO MARKOV.") + if len(tokens) - 1 <= select_length: + notice("not enough text to markov") return # Replace URLs with escape string for now, so that the Markov selector @@ -266,8 +284,8 @@ def handle_command(command, argument, notice, target, session): shuffle(selections) for i in range(len(selections)): if selections[i][0][-1] in sentence_end_markers: - for i in range(select_length): - snippet[i] = selections[i][i + 1] + for j in range(select_length): + snippet[j] = selections[j][j + 1] break msg = "" malkovich = "malkovich" @@ -299,7 +317,7 @@ def handle_command(command, argument, notice, target, session): try: twtfile = open(session.twtfile, mode) except (PermissionError, FileNotFoundError) as err: - notice("CAN'T ACCESS OR CREATE TWT FILE: " + str(err)) + notice("can't access or create twt file: " + str(err)) return None return twtfile @@ -314,7 +332,7 @@ def handle_command(command, argument, notice, target, session): return twtfile.write(datetime.utcnow().isoformat() + "\t" + argument + "\n") twtfile.close() - notice("WROTE TWT.") + notice("wrote twt.") if "addquote" == command: addquote() @@ -348,7 +366,7 @@ def handle_url(url, notice, show_url=False): signal.signal(signal.SIGALRM, timeout_handler) signal.alarm(15) try: - r = requests.get(url, stream=True) + r = requests.get(url, headers = {'User-Agent': 'plomlombot'}, stream=True) r.raw.decode_content = True text = r.raw.read(10000000+1) if len(text) > 10000000: @@ -361,19 +379,19 @@ def handle_url(url, notice, show_url=False): ValueError, requests.exceptions.InvalidSchema) as error: signal.alarm(0) - notice("TROUBLE FOLLOWING URL: " + str(error)) + notice("trouble following url: " + str(error)) return False signal.alarm(0) if mobile_twitter_hack(url): return True title = bs4.BeautifulSoup(text, "html5lib").title if title and title.string: - prefix = "PAGE TITLE: " + prefix = "page title: " if show_url: - prefix = "PAGE TITLE FOR <" + url + ">: " + prefix = "page title for <" + url + ">: " notice(prefix + title.string.strip()) else: - notice("PAGE HAS NO TITLE TAG") + notice("page has no title tag") return True @@ -434,8 +452,8 @@ class Session: if handle_url(matches[i], notice): url_count += 1 if url_count == 3: - notice("MAXIMUM NUMBER OF URLs TO PARSE PER MESSAGE " - "REACHED") + notice("maximum number of urls to parse per message " + "reached") break if "!" == msg[0]: tokens = msg[1:].split()