From 7e9e08941fdfd0d105743b8a21c64dd4b1032823 Mon Sep 17 00:00:00 2001 From: jesopo Date: Fri, 11 Oct 2019 17:01:59 +0100 Subject: 'start.py' -> 'bitbotd' --- bitbotd | 158 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ start.py | 158 --------------------------------------------------------------- 2 files changed, 158 insertions(+), 158 deletions(-) create mode 100755 bitbotd delete mode 100755 start.py diff --git a/bitbotd b/bitbotd new file mode 100755 index 00000000..4c1ef68d --- /dev/null +++ b/bitbotd @@ -0,0 +1,158 @@ +#!/usr/bin/env python3 + +import sys + +if sys.version_info < (3, 6): + sys.stderr.write("BitBot requires python 3.6.0 or later\n") + sys.exit(1) + +import atexit, argparse, faulthandler, os, platform, time +from src import Cache, Config, Control, Database, EventManager, Exports, IRCBot +from src import LockFile, Logging, ModuleManager, Timers, utils + +faulthandler.enable() + +directory = os.path.dirname(os.path.realpath(__file__)) + +arg_parser = argparse.ArgumentParser( + description="Python3 event-driven modular IRC bot") + +arg_parser.add_argument("--version", "-v", action="store_true") + +arg_parser.add_argument("--config", "-c", + help="Location of the JSON config file", + default=os.path.join(directory, "bot.conf")) + +arg_parser.add_argument("--database", "-d", + help="Location of the sqlite3 database file", + default=os.path.join(directory, "databases", "bot.db")) + +arg_parser.add_argument("--log-dir", "-l", + help="Location of the log directory", + default=os.path.join(directory, "logs")) + +arg_parser.add_argument("--add-server", "-a", + help="Add a new server", action="store_true") + +arg_parser.add_argument("--verbose", "-V", action="store_true") +arg_parser.add_argument("--log-level", "-L") +arg_parser.add_argument("--no-logging", "-N", action="store_true") + +arg_parser.add_argument("--module", "-m", + help="Execute an action against a specific module") +arg_parser.add_argument("--module-args", "-M", + help="Arguments to give in action against a specific module") +arg_parser.add_argument("--external", "-e", help="External modules directory") + +arg_parser.add_argument("--startup-disconnects", "-D", + help="Tolerate failed connections on startup", action="store_true") + +arg_parser.add_argument("--remove-server", "-R", + help="Remove a server by it's alias") + +args = arg_parser.parse_args() + +if args.version: + print("BitBot %s" % IRCBot.VERSION) + sys.exit(0) + +log_level = args.log_level +if not log_level: + log_level = "debug" if args.verbose else "warn" + +log = Logging.Log(not args.no_logging, log_level, args.log_dir) + +log.info("Starting BitBot %s (Python v%s)", + [IRCBot.VERSION, platform.python_version()]) + +lock_file = LockFile.LockFile(args.database) +if not lock_file.available(): + log.critical("Database is locked. Is BitBot already running?") + sys.exit(1) + +atexit.register(lock_file.unlock) +lock_file.lock() + +database = Database.Database(log, args.database) + +if args.remove_server: + alias = args.remove_server + id = database.servers.by_alias(alias) + if not id == None: + database.servers.delete(id) + print("Deleted server '%s'" % alias) + else: + sys.stderr.write("Unknown server '%s'\n" % alias) + sys.exit(0) + +if args.add_server: + print("Adding a new server") + utils.cli.add_server(database) + sys.exit(0) + +cache = Cache.Cache() +config = Config.Config(args.config) +events = EventManager.EventRoot(log).wrap() +exports = Exports.Exports() +timers = Timers.Timers(database, events, log) + +module_directories = [os.path.join(directory, "modules")] +if args.external: + module_directories.append(os.path.abspath(args.external)) +if "external-modules" in config: + module_directories.append(os.path.abspath(config["external-modules"])) + +modules = ModuleManager.ModuleManager(events, exports, timers, config, log, + module_directories) + +bot = IRCBot.Bot(directory, args, cache, config, database, events, + exports, log, modules, timers) +bot.add_poll_hook(cache) +bot.add_poll_hook(lock_file) +bot.add_poll_hook(timers) + +control = Control.Control(bot, args.database) +control.bind() +bot.add_poll_source(control) + +if args.module: + definition = modules.find_module(args.module) + module = modules.load_module(bot, definition) + module.module.command_line(args.module_args) + sys.exit(0) + + +server_configs = bot.database.servers.get_all() + +if len(server_configs): + bot.load_modules() + + servers = [] + for server_id, alias in server_configs: + server = bot.add_server(server_id, connect=False) + if not server == None and server.get_setting("connect", True): + server.from_init = True + servers.append(server) + + bot._events.on("boot.done").call() + + timers.setup(bot.find_settings(prefix="timer-")) + + for server in servers: + if not bot.connect(server): + log.error("Failed to connect to '%s'" % str(server)) + if not args.startup_disconnects: + sys.exit(1) + + try: + bot.run() + except Exception as e: + log.critical("Unhandled exception: %s", [str(e)], exc_info=True) + sys.exit(1) +else: + try: + if utils.cli.bool_input("no servers found, add one?"): + utils.cli.add_server(database) + except KeyboardInterrupt: + print() + pass diff --git a/start.py b/start.py deleted file mode 100755 index 4c1ef68d..00000000 --- a/start.py +++ /dev/null @@ -1,158 +0,0 @@ -#!/usr/bin/env python3 - -import sys - -if sys.version_info < (3, 6): - sys.stderr.write("BitBot requires python 3.6.0 or later\n") - sys.exit(1) - -import atexit, argparse, faulthandler, os, platform, time -from src import Cache, Config, Control, Database, EventManager, Exports, IRCBot -from src import LockFile, Logging, ModuleManager, Timers, utils - -faulthandler.enable() - -directory = os.path.dirname(os.path.realpath(__file__)) - -arg_parser = argparse.ArgumentParser( - description="Python3 event-driven modular IRC bot") - -arg_parser.add_argument("--version", "-v", action="store_true") - -arg_parser.add_argument("--config", "-c", - help="Location of the JSON config file", - default=os.path.join(directory, "bot.conf")) - -arg_parser.add_argument("--database", "-d", - help="Location of the sqlite3 database file", - default=os.path.join(directory, "databases", "bot.db")) - -arg_parser.add_argument("--log-dir", "-l", - help="Location of the log directory", - default=os.path.join(directory, "logs")) - -arg_parser.add_argument("--add-server", "-a", - help="Add a new server", action="store_true") - -arg_parser.add_argument("--verbose", "-V", action="store_true") -arg_parser.add_argument("--log-level", "-L") -arg_parser.add_argument("--no-logging", "-N", action="store_true") - -arg_parser.add_argument("--module", "-m", - help="Execute an action against a specific module") -arg_parser.add_argument("--module-args", "-M", - help="Arguments to give in action against a specific module") -arg_parser.add_argument("--external", "-e", help="External modules directory") - -arg_parser.add_argument("--startup-disconnects", "-D", - help="Tolerate failed connections on startup", action="store_true") - -arg_parser.add_argument("--remove-server", "-R", - help="Remove a server by it's alias") - -args = arg_parser.parse_args() - -if args.version: - print("BitBot %s" % IRCBot.VERSION) - sys.exit(0) - -log_level = args.log_level -if not log_level: - log_level = "debug" if args.verbose else "warn" - -log = Logging.Log(not args.no_logging, log_level, args.log_dir) - -log.info("Starting BitBot %s (Python v%s)", - [IRCBot.VERSION, platform.python_version()]) - -lock_file = LockFile.LockFile(args.database) -if not lock_file.available(): - log.critical("Database is locked. Is BitBot already running?") - sys.exit(1) - -atexit.register(lock_file.unlock) -lock_file.lock() - -database = Database.Database(log, args.database) - -if args.remove_server: - alias = args.remove_server - id = database.servers.by_alias(alias) - if not id == None: - database.servers.delete(id) - print("Deleted server '%s'" % alias) - else: - sys.stderr.write("Unknown server '%s'\n" % alias) - sys.exit(0) - -if args.add_server: - print("Adding a new server") - utils.cli.add_server(database) - sys.exit(0) - -cache = Cache.Cache() -config = Config.Config(args.config) -events = EventManager.EventRoot(log).wrap() -exports = Exports.Exports() -timers = Timers.Timers(database, events, log) - -module_directories = [os.path.join(directory, "modules")] -if args.external: - module_directories.append(os.path.abspath(args.external)) -if "external-modules" in config: - module_directories.append(os.path.abspath(config["external-modules"])) - -modules = ModuleManager.ModuleManager(events, exports, timers, config, log, - module_directories) - -bot = IRCBot.Bot(directory, args, cache, config, database, events, - exports, log, modules, timers) -bot.add_poll_hook(cache) -bot.add_poll_hook(lock_file) -bot.add_poll_hook(timers) - -control = Control.Control(bot, args.database) -control.bind() -bot.add_poll_source(control) - -if args.module: - definition = modules.find_module(args.module) - module = modules.load_module(bot, definition) - module.module.command_line(args.module_args) - sys.exit(0) - - -server_configs = bot.database.servers.get_all() - -if len(server_configs): - bot.load_modules() - - servers = [] - for server_id, alias in server_configs: - server = bot.add_server(server_id, connect=False) - if not server == None and server.get_setting("connect", True): - server.from_init = True - servers.append(server) - - bot._events.on("boot.done").call() - - timers.setup(bot.find_settings(prefix="timer-")) - - for server in servers: - if not bot.connect(server): - log.error("Failed to connect to '%s'" % str(server)) - if not args.startup_disconnects: - sys.exit(1) - - try: - bot.run() - except Exception as e: - log.critical("Unhandled exception: %s", [str(e)], exc_info=True) - sys.exit(1) -else: - try: - if utils.cli.bool_input("no servers found, add one?"): - utils.cli.add_server(database) - except KeyboardInterrupt: - print() - pass -- cgit v1.3.1-10-gc9f91