From 7dca597a2aba5f2a6aaf346f9237fae2e5d5b514 Mon Sep 17 00:00:00 2001 From: iou1name Date: Fri, 16 Mar 2018 12:08:02 -0400 Subject: [PATCH] last commit --- README.md | 2 + bot.py | 3 +- loader.py | 341 ++++++++++++++++++++++---------------------- modules/announce.py | 9 +- modules/grog.py | 1 - modules/iot.py | 3 +- modules/remind.py | 5 - modules/search.py | 14 +- modules/watcher.py | 8 +- 9 files changed, 188 insertions(+), 198 deletions(-) diff --git a/README.md b/README.md index 4ab6824..eca7871 100644 --- a/README.md +++ b/README.md @@ -2,3 +2,5 @@ NIGGER DICKS NIGGER DICKS NIGGER DICKS NIGGER DICKS + +Now deprecated in favor of https://git.steelbea.me/iou1name/fulvia diff --git a/bot.py b/bot.py index 0577c53..ac72090 100755 --- a/bot.py +++ b/bot.py @@ -1,5 +1,4 @@ -#! /usr/bin/env python3 -# -*- coding: utf-8 -*- +#!/usr/bin/env python3 """ The core bot class. Say good bye to PYthon 2. """ diff --git a/loader.py b/loader.py index 5e00ae8..fdd1caa 100755 --- a/loader.py +++ b/loader.py @@ -9,220 +9,217 @@ import sys from tools import itervalues, get_command_regexp -if sys.version_info.major >= 3: - basestring = (str, bytes) - # Can be implementation-dependent _regex_type = type(re.compile('')) def get_module_description(path): - good_file = (os.path.isfile(path) and path.endswith('.py') - and not path.startswith('_')) - good_dir = (os.path.isdir(path) and - os.path.isfile(os.path.join(path, '__init__.py'))) - if good_file: - name = os.path.basename(path)[:-3] - return (name, path, imp.PY_SOURCE) - elif good_dir: - name = os.path.basename(path) - return (name, path, imp.PKG_DIRECTORY) - else: - return None + good_file = (os.path.isfile(path) and path.endswith('.py') + and not path.startswith('_')) + good_dir = (os.path.isdir(path) and + os.path.isfile(os.path.join(path, '__init__.py'))) + if good_file: + name = os.path.basename(path)[:-3] + return (name, path, imp.PY_SOURCE) + elif good_dir: + name = os.path.basename(path) + return (name, path, imp.PKG_DIRECTORY) + else: + return None def _update_modules_from_dir(modules, directory): - # Note that this modifies modules in place - for path in os.listdir(directory): - path = os.path.join(directory, path) - result = get_module_description(path) - if result: - modules[result[0]] = result[1:] + # Note that this modifies modules in place + for path in os.listdir(directory): + path = os.path.join(directory, path) + result = get_module_description(path) + if result: + modules[result[0]] = result[1:] def enumerate_modules(config, show_all=False): - """Map the names of modules to the location of their file. + """Map the names of modules to the location of their file. - Return a dict mapping the names of modules to a tuple of the module name, - the pathname and either `imp.PY_SOURCE` or `imp.PKG_DIRECTORY`. This - searches the regular modules directory and all directories specified in the - `core.extra` attribute of the `config` object. If two modules have the same - name, the last one to be found will be returned and the rest will be - ignored. Modules are found starting in the regular directory, followed by - `~/.sopel/modules`, and then through the extra directories in the order - that the are specified. + Return a dict mapping the names of modules to a tuple of the module name, + the pathname and either `imp.PY_SOURCE` or `imp.PKG_DIRECTORY`. This + searches the regular modules directory and all directories specified in the + `core.extra` attribute of the `config` object. If two modules have the same + name, the last one to be found will be returned and the rest will be + ignored. Modules are found starting in the regular directory, followed by + `~/.sopel/modules`, and then through the extra directories in the order + that the are specified. - If `show_all` is given as `True`, the `enable` and `exclude` - configuration options will be ignored, and all modules will be shown - (though duplicates will still be ignored as above). - """ - modules = {} + If `show_all` is given as `True`, the `enable` and `exclude` + configuration options will be ignored, and all modules will be shown + (though duplicates will still be ignored as above). + """ + modules = {} - # First, add modules from the regular modules directory - main_dir = os.path.dirname(os.path.abspath(__file__)) - modules_dir = os.path.join(main_dir, 'modules') - _update_modules_from_dir(modules, modules_dir) - for path in os.listdir(modules_dir): - break + # First, add modules from the regular modules directory + main_dir = os.path.dirname(os.path.abspath(__file__)) + modules_dir = os.path.join(main_dir, 'modules') + _update_modules_from_dir(modules, modules_dir) + for path in os.listdir(modules_dir): + break - # Then, find PyPI installed modules - # TODO does this work with all possible install mechanisms? - try: - import sopel_modules - except: - pass - else: - for directory in sopel_modules.__path__: - _update_modules_from_dir(modules, directory) + # Then, find PyPI installed modules + # TODO does this work with all possible install mechanisms? + try: + import sopel_modules + except: + pass + else: + for directory in sopel_modules.__path__: + _update_modules_from_dir(modules, directory) - # Next, look in ~/.sopel/modules - home_modules_dir = os.path.join(config.homedir, 'modules') - if not os.path.isdir(home_modules_dir): - os.makedirs(home_modules_dir) - _update_modules_from_dir(modules, home_modules_dir) + # Next, look in ~/.sopel/modules + home_modules_dir = os.path.join(config.homedir, 'modules') + if not os.path.isdir(home_modules_dir): + os.makedirs(home_modules_dir) + _update_modules_from_dir(modules, home_modules_dir) - # Last, look at all the extra directories. - for directory in config.core.extra: - _update_modules_from_dir(modules, directory) + # Last, look at all the extra directories. + for directory in config.core.extra: + _update_modules_from_dir(modules, directory) - # Coretasks is special. No custom user coretasks. - ct_path = os.path.join(main_dir, 'coretasks.py') - modules['coretasks'] = (ct_path, imp.PY_SOURCE) + # Coretasks is special. No custom user coretasks. + ct_path = os.path.join(main_dir, 'coretasks.py') + modules['coretasks'] = (ct_path, imp.PY_SOURCE) - # If caller wants all of them, don't apply white and blacklists - if show_all: - return modules + # If caller wants all of them, don't apply white and blacklists + if show_all: + return modules - # Apply whitelist, if present - enable = config.core.enable - if enable: - enabled_modules = {'coretasks': modules['coretasks']} - for module in enable: - if module in modules: - enabled_modules[module] = modules[module] - modules = enabled_modules + # Apply whitelist, if present + enable = config.core.enable + if enable: + enabled_modules = {'coretasks': modules['coretasks']} + for module in enable: + if module in modules: + enabled_modules[module] = modules[module] + modules = enabled_modules - # Apply blacklist, if present - exclude = config.core.exclude - for module in exclude: - if module in modules: - del modules[module] + # Apply blacklist, if present + exclude = config.core.exclude + for module in exclude: + if module in modules: + del modules[module] - return modules + return modules def compile_rule(nick, pattern): - # Not sure why this happens on reloads, but it shouldn't cause problems… - if isinstance(pattern, _regex_type): - return pattern + # Not sure why this happens on reloads, but it shouldn't cause problems… + if isinstance(pattern, _regex_type): + return pattern - nick = re.escape(nick) - pattern = pattern.replace('$nickname', nick) - pattern = pattern.replace('$nick', r'{}[,:]\s+'.format(nick)) - flags = re.IGNORECASE - if '\n' in pattern: - flags |= re.VERBOSE - return re.compile(pattern, flags) + nick = re.escape(nick) + pattern = pattern.replace('$nickname', nick) + pattern = pattern.replace('$nick', r'{}[,:]\s+'.format(nick)) + flags = re.IGNORECASE + if '\n' in pattern: + flags |= re.VERBOSE + return re.compile(pattern, flags) def trim_docstring(doc): - """Get the docstring as a series of lines that can be sent""" - if not doc: - return [] - lines = doc.expandtabs().splitlines() - indent = sys.maxsize - for line in lines[1:]: - stripped = line.lstrip() - if stripped: - indent = min(indent, len(line) - len(stripped)) - trimmed = [lines[0].strip()] - if indent < sys.maxsize: - for line in lines[1:]: - trimmed.append(line[:].rstrip()) - while trimmed and not trimmed[-1]: - trimmed.pop() - while trimmed and not trimmed[0]: - trimmed.pop(0) - return trimmed + """Get the docstring as a series of lines that can be sent""" + if not doc: + return [] + lines = doc.expandtabs().splitlines() + indent = sys.maxsize + for line in lines[1:]: + stripped = line.lstrip() + if stripped: + indent = min(indent, len(line) - len(stripped)) + trimmed = [lines[0].strip()] + if indent < sys.maxsize: + for line in lines[1:]: + trimmed.append(line[:].rstrip()) + while trimmed and not trimmed[-1]: + trimmed.pop() + while trimmed and not trimmed[0]: + trimmed.pop(0) + return trimmed def clean_callable(func, config): - """Compiles the regexes, moves commands into func.rule, fixes up docs and - puts them in func._docs, and sets defaults""" - nick = config.core.nick - prefix = config.core.prefix - help_prefix = config.core.help_prefix - func._docs = {} - doc = trim_docstring(func.__doc__) - example = None + """Compiles the regexes, moves commands into func.rule, fixes up docs and + puts them in func._docs, and sets defaults""" + nick = config.core.nick + prefix = config.core.prefix + help_prefix = config.core.help_prefix + func._docs = {} + doc = trim_docstring(func.__doc__) + example = None - func.unblockable = getattr(func, 'unblockable', False) - func.priority = getattr(func, 'priority', 'medium') - func.thread = getattr(func, 'thread', True) - func.rate = getattr(func, 'rate', 0) - func.channel_rate = getattr(func, 'channel_rate', 0) - func.global_rate = getattr(func, 'global_rate', 0) + func.unblockable = getattr(func, 'unblockable', False) + func.priority = getattr(func, 'priority', 'medium') + func.thread = getattr(func, 'thread', True) + func.rate = getattr(func, 'rate', 0) + func.channel_rate = getattr(func, 'channel_rate', 0) + func.global_rate = getattr(func, 'global_rate', 0) - if not hasattr(func, 'event'): - func.event = ['PRIVMSG'] - else: - if isinstance(func.event, basestring): - func.event = [func.event.upper()] - else: - func.event = [event.upper() for event in func.event] + if not hasattr(func, 'event'): + func.event = ['PRIVMSG'] + else: + if isinstance(func.event, (str, bytes)): + func.event = [func.event.upper()] + else: + func.event = [event.upper() for event in func.event] - if hasattr(func, 'rule'): - if isinstance(func.rule, basestring): - func.rule = [func.rule] - func.rule = [compile_rule(nick, rule) for rule in func.rule] + if hasattr(func, 'rule'): + if isinstance(func.rule, (str, bytes)): + func.rule = [func.rule] + func.rule = [compile_rule(nick, rule) for rule in func.rule] - if hasattr(func, 'commands'): - func.rule = getattr(func, 'rule', []) - for command in func.commands: - regexp = get_command_regexp(prefix, command) - func.rule.append(regexp) - if hasattr(func, 'example'): - example = func.example[0]["example"] - example = example.replace('$nickname', nick) - if example[0] != help_prefix and not example.startswith(nick): - example = help_prefix + example[len(help_prefix):] - if doc or example: - for command in func.commands: - func._docs[command] = (doc, example) + if hasattr(func, 'commands'): + func.rule = getattr(func, 'rule', []) + for command in func.commands: + regexp = get_command_regexp(prefix, command) + func.rule.append(regexp) + if hasattr(func, 'example'): + example = func.example[0]["example"] + example = example.replace('$nickname', nick) + if example[0] != help_prefix and not example.startswith(nick): + example = help_prefix + example[len(help_prefix):] + if doc or example: + for command in func.commands: + func._docs[command] = (doc, example) def load_module(name, path, type_): - """Load a module, and sort out the callables and shutdowns""" - if type_ == imp.PY_SOURCE: - with open(path) as mod: - module = imp.load_module(name, mod, path, ('.py', 'U', type_)) - elif type_ == imp.PKG_DIRECTORY: - module = imp.load_module(name, None, path, ('', '', type_)) - else: - raise TypeError('Unsupported module type') - return module, os.path.getmtime(path) + """Load a module, and sort out the callables and shutdowns""" + if type_ == imp.PY_SOURCE: + with open(path) as mod: + module = imp.load_module(name, mod, path, ('.py', 'U', type_)) + elif type_ == imp.PKG_DIRECTORY: + module = imp.load_module(name, None, path, ('', '', type_)) + else: + raise TypeError('Unsupported module type') + return module, os.path.getmtime(path) def is_triggerable(obj): - return any(hasattr(obj, attr) for attr in ('rule', 'rule', 'intent', - 'commands')) + return any(hasattr(obj, attr) for attr in ('rule', 'rule', 'intent', + 'commands')) def clean_module(module, config): - callables = [] - shutdowns = [] - jobs = [] - urls = [] - for obj in itervalues(vars(module)): - if callable(obj): - if getattr(obj, '__name__', None) == 'shutdown': - shutdowns.append(obj) - elif is_triggerable(obj): - clean_callable(obj, config) - callables.append(obj) - elif hasattr(obj, 'interval'): - clean_callable(obj, config) - jobs.append(obj) - elif hasattr(obj, 'url_regex'): - urls.append(obj) - return callables, jobs, shutdowns, urls + callables = [] + shutdowns = [] + jobs = [] + urls = [] + for key, obj in dict.items(vars(module)): + if callable(obj): + if getattr(obj, '__name__', None) == 'shutdown': + shutdowns.append(obj) + elif is_triggerable(obj): + clean_callable(obj, config) + callables.append(obj) + elif hasattr(obj, 'interval'): + clean_callable(obj, config) + jobs.append(obj) + elif hasattr(obj, 'url_regex'): + urls.append(obj) + return callables, jobs, shutdowns, urls diff --git a/modules/announce.py b/modules/announce.py index 212612c..3fa88ce 100755 --- a/modules/announce.py +++ b/modules/announce.py @@ -1,9 +1,6 @@ -# coding=utf-8 +#!/usr/bin/env python3 """ -announce.py - Send a message to all channels -Copyright © 2013, Elad Alfassa, -Licensed under the Eiffel Forum License 2. - +Sends a message to all channels the bot is currently in. """ from module import commands, example @@ -12,7 +9,7 @@ from module import commands, example @example('.announce Some important message here') def announce(bot, trigger): """ - Send an announcement to all channels the bot is in + Send an announcement to all channels the bot is in. """ if not trigger.admin: bot.reply('Sorry, I can\'t let you do that') diff --git a/modules/grog.py b/modules/grog.py index f0431bc..fc756c8 100755 --- a/modules/grog.py +++ b/modules/grog.py @@ -9,7 +9,6 @@ import random from module import commands, example @commands("grog") -@example(".grog") def grog(bot, trigger): """ Picks a random status effect from Grog of Substantial Whimsy effect. diff --git a/modules/iot.py b/modules/iot.py index 0842796..8d8defb 100755 --- a/modules/iot.py +++ b/modules/iot.py @@ -36,7 +36,8 @@ def roomTemp(bot, trigger): """ try: res = requests.get("http://192.168.1.25/", timeout=10) - time.sleep(0.5) + del res + time.sleep(1.5) res = requests.get("http://192.168.1.25/", timeout=10) except requests.exceptions.ReadTimeout: return bot.say("Connection error. Timeout reached.") diff --git a/modules/remind.py b/modules/remind.py index af11ad0..c13c7c4 100755 --- a/modules/remind.py +++ b/modules/remind.py @@ -15,11 +15,6 @@ import pytz from module import commands, example, NOLIMIT from tools.time import get_timezone, format_time -def filename(self): - name = self.nick + '-' + self.config.core.host + '.reminders.db' - return os.path.join(self.config.core.homedir, name) - - def init_database(bot): """ Initializes the 'remind' table in the bot's database. Does nothing if diff --git a/modules/search.py b/modules/search.py index ab620a1..5a822be 100755 --- a/modules/search.py +++ b/modules/search.py @@ -28,8 +28,8 @@ r_bing = re.compile(r'