Move main code to __main__.py
This commit is contained in:
parent
e588c30044
commit
806ff1d4a0
126
bin/nemubot
126
bin/nemubot
@ -17,129 +17,9 @@
|
|||||||
# You should have received a copy of the GNU Affero General Public License
|
# You should have received a copy of the GNU Affero General Public License
|
||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
import os
|
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
|
from nemubot.__main__ import main
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
# Parse command line arguments
|
main()
|
||||||
import argparse
|
|
||||||
parser = argparse.ArgumentParser()
|
|
||||||
|
|
||||||
parser.add_argument("-a", "--no-connect", action="store_true",
|
|
||||||
help="disable auto-connect to servers at startup")
|
|
||||||
|
|
||||||
parser.add_argument("-v", "--verbose", action="count",
|
|
||||||
default=0,
|
|
||||||
help="verbosity level")
|
|
||||||
|
|
||||||
parser.add_argument("-V", "--version", action="store_true",
|
|
||||||
help="display nemubot version and exit")
|
|
||||||
|
|
||||||
parser.add_argument("-M", "--modules-path", nargs='*',
|
|
||||||
default=["./modules/"],
|
|
||||||
help="directory to use as modules store")
|
|
||||||
|
|
||||||
parser.add_argument("-m", "--module", nargs='*',
|
|
||||||
help="load given modules")
|
|
||||||
|
|
||||||
parser.add_argument("-D", "--data-path", default="./datas/",
|
|
||||||
help="path to use to save bot data")
|
|
||||||
|
|
||||||
parser.add_argument('files', metavar='FILE', nargs='*',
|
|
||||||
help="configuration files to load")
|
|
||||||
|
|
||||||
args = parser.parse_args()
|
|
||||||
|
|
||||||
import nemubot
|
|
||||||
|
|
||||||
if args.version:
|
|
||||||
print(nemubot.__version__)
|
|
||||||
sys.exit(0)
|
|
||||||
|
|
||||||
# Setup loggin interface
|
|
||||||
import logging
|
|
||||||
logger = logging.getLogger("nemubot")
|
|
||||||
|
|
||||||
formatter = logging.Formatter(
|
|
||||||
'%(asctime)s %(name)s %(levelname)s %(message)s')
|
|
||||||
|
|
||||||
ch = logging.StreamHandler()
|
|
||||||
ch.setFormatter(formatter)
|
|
||||||
if args.verbose > 1:
|
|
||||||
ch.setLevel(logging.DEBUG)
|
|
||||||
else:
|
|
||||||
ch.setLevel(logging.INFO)
|
|
||||||
logger.addHandler(ch)
|
|
||||||
|
|
||||||
fh = logging.FileHandler('./nemubot.log')
|
|
||||||
fh.setFormatter(formatter)
|
|
||||||
fh.setLevel(logging.DEBUG)
|
|
||||||
logger.addHandler(fh)
|
|
||||||
|
|
||||||
# Add modules dir paths
|
|
||||||
modules_paths = list()
|
|
||||||
for path in args.modules_path:
|
|
||||||
if os.path.isdir(path):
|
|
||||||
modules_paths.append(
|
|
||||||
os.path.realpath(os.path.abspath(path)))
|
|
||||||
else:
|
|
||||||
logger.error("%s is not a directory", path)
|
|
||||||
|
|
||||||
# Create bot context
|
|
||||||
from nemubot import datastore
|
|
||||||
context = nemubot.Bot(modules_paths=modules_paths, data_store=datastore.XML(args.data_path),
|
|
||||||
verbosity=args.verbose)
|
|
||||||
|
|
||||||
if args.no_connect:
|
|
||||||
context.noautoconnect = True
|
|
||||||
|
|
||||||
# Load the prompt
|
|
||||||
import nemubot.prompt
|
|
||||||
prmpt = nemubot.prompt.Prompt()
|
|
||||||
|
|
||||||
# Register the hook for futur import
|
|
||||||
from nemubot.importer import ModuleFinder
|
|
||||||
sys.meta_path.append(ModuleFinder(context.modules_paths, context.add_module))
|
|
||||||
|
|
||||||
# Load requested configuration files
|
|
||||||
for path in args.files:
|
|
||||||
if os.path.isfile(path):
|
|
||||||
from nemubot.prompt.builtins import load_file
|
|
||||||
load_file(path, context)
|
|
||||||
else:
|
|
||||||
logger.error("%s is not a readable file", path)
|
|
||||||
|
|
||||||
if args.module:
|
|
||||||
for module in args.module:
|
|
||||||
__import__(module)
|
|
||||||
|
|
||||||
print ("Nemubot v%s ready, my PID is %i!" % (nemubot.__version__,
|
|
||||||
os.getpid()))
|
|
||||||
from nemubot.prompt.reset import PromptReset
|
|
||||||
while True:
|
|
||||||
try:
|
|
||||||
context.start()
|
|
||||||
if prmpt.run(context):
|
|
||||||
break
|
|
||||||
except PromptReset as e:
|
|
||||||
if e.type == "quit":
|
|
||||||
break
|
|
||||||
|
|
||||||
try:
|
|
||||||
import imp
|
|
||||||
# Reload all other modules
|
|
||||||
imp.reload(nemubot)
|
|
||||||
imp.reload(nemubot.prompt)
|
|
||||||
nemubot.reload()
|
|
||||||
context = nemubot.hotswap(context)
|
|
||||||
prmpt = nemubot.prompt.hotswap(prmpt)
|
|
||||||
print("\033[1;32mContext reloaded\033[0m, now in Nemubot %s" %
|
|
||||||
nemubot.__version__)
|
|
||||||
except:
|
|
||||||
logger.exception("\033[1;31mUnable to reload the prompt due to "
|
|
||||||
"errors.\033[0m Fix them before trying to reload "
|
|
||||||
"the prompt.")
|
|
||||||
|
|
||||||
context.quit()
|
|
||||||
print("\nWaiting for other threads shuts down...")
|
|
||||||
sys.exit(0)
|
|
||||||
|
|||||||
@ -16,7 +16,7 @@
|
|||||||
# You should have received a copy of the GNU Affero General Public License
|
# You should have received a copy of the GNU Affero General Public License
|
||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
__version__ = '4.0.dev1'
|
__version__ = '4.0.dev2'
|
||||||
__author__ = 'nemunaire'
|
__author__ = 'nemunaire'
|
||||||
|
|
||||||
from nemubot.modulecontext import ModuleContext
|
from nemubot.modulecontext import ModuleContext
|
||||||
|
|||||||
149
nemubot/__main__.py
Normal file
149
nemubot/__main__.py
Normal file
@ -0,0 +1,149 @@
|
|||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
|
||||||
|
# Nemubot is a smart and modulable IM bot.
|
||||||
|
# Copyright (C) 2012-2015 Mercier Pierre-Olivier
|
||||||
|
#
|
||||||
|
# This program is free software: you can redistribute it and/or modify
|
||||||
|
# it under the terms of the GNU Affero General Public License as published by
|
||||||
|
# the Free Software Foundation, either version 3 of the License, or
|
||||||
|
# (at your option) any later version.
|
||||||
|
#
|
||||||
|
# This program is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
# GNU Affero General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU Affero General Public License
|
||||||
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
def main():
|
||||||
|
import os
|
||||||
|
import sys
|
||||||
|
|
||||||
|
# Parse command line arguments
|
||||||
|
import argparse
|
||||||
|
parser = argparse.ArgumentParser()
|
||||||
|
|
||||||
|
parser.add_argument("-a", "--no-connect", action="store_true",
|
||||||
|
help="disable auto-connect to servers at startup")
|
||||||
|
|
||||||
|
parser.add_argument("-v", "--verbose", action="count",
|
||||||
|
default=0,
|
||||||
|
help="verbosity level")
|
||||||
|
|
||||||
|
parser.add_argument("-V", "--version", action="store_true",
|
||||||
|
help="display nemubot version and exit")
|
||||||
|
|
||||||
|
parser.add_argument("-M", "--modules-path", nargs='*',
|
||||||
|
default=["./modules/"],
|
||||||
|
help="directory to use as modules store")
|
||||||
|
|
||||||
|
parser.add_argument("-m", "--module", nargs='*',
|
||||||
|
help="load given modules")
|
||||||
|
|
||||||
|
parser.add_argument("-D", "--data-path", default="./datas/",
|
||||||
|
help="path to use to save bot data")
|
||||||
|
|
||||||
|
parser.add_argument('files', metavar='FILE', nargs='*',
|
||||||
|
help="configuration files to load")
|
||||||
|
|
||||||
|
args = parser.parse_args()
|
||||||
|
|
||||||
|
import nemubot
|
||||||
|
|
||||||
|
if args.version:
|
||||||
|
print(nemubot.__version__)
|
||||||
|
sys.exit(0)
|
||||||
|
|
||||||
|
# Setup loggin interface
|
||||||
|
import logging
|
||||||
|
logger = logging.getLogger("nemubot")
|
||||||
|
|
||||||
|
formatter = logging.Formatter(
|
||||||
|
'%(asctime)s %(name)s %(levelname)s %(message)s')
|
||||||
|
|
||||||
|
ch = logging.StreamHandler()
|
||||||
|
ch.setFormatter(formatter)
|
||||||
|
if args.verbose > 1:
|
||||||
|
ch.setLevel(logging.DEBUG)
|
||||||
|
else:
|
||||||
|
ch.setLevel(logging.INFO)
|
||||||
|
logger.addHandler(ch)
|
||||||
|
|
||||||
|
fh = logging.FileHandler('./nemubot.log')
|
||||||
|
fh.setFormatter(formatter)
|
||||||
|
fh.setLevel(logging.DEBUG)
|
||||||
|
logger.addHandler(fh)
|
||||||
|
|
||||||
|
# Add modules dir paths
|
||||||
|
modules_paths = list()
|
||||||
|
for path in args.modules_path:
|
||||||
|
if os.path.isdir(path):
|
||||||
|
modules_paths.append(
|
||||||
|
os.path.realpath(os.path.abspath(path)))
|
||||||
|
else:
|
||||||
|
logger.error("%s is not a directory", path)
|
||||||
|
|
||||||
|
# Create bot context
|
||||||
|
from nemubot import datastore
|
||||||
|
from nemubot.bot import Bot
|
||||||
|
context = Bot(modules_paths=modules_paths, data_store=datastore.XML(args.data_path),
|
||||||
|
verbosity=args.verbose)
|
||||||
|
|
||||||
|
if args.no_connect:
|
||||||
|
context.noautoconnect = True
|
||||||
|
|
||||||
|
# Load the prompt
|
||||||
|
import nemubot.prompt
|
||||||
|
prmpt = nemubot.prompt.Prompt()
|
||||||
|
|
||||||
|
# Register the hook for futur import
|
||||||
|
from nemubot.importer import ModuleFinder
|
||||||
|
sys.meta_path.append(ModuleFinder(context.modules_paths, context.add_module))
|
||||||
|
|
||||||
|
# Load requested configuration files
|
||||||
|
for path in args.files:
|
||||||
|
if os.path.isfile(path):
|
||||||
|
from nemubot.tools.config import load_file
|
||||||
|
load_file(path, context)
|
||||||
|
else:
|
||||||
|
logger.error("%s is not a readable file", path)
|
||||||
|
|
||||||
|
if args.module:
|
||||||
|
for module in args.module:
|
||||||
|
__import__(module)
|
||||||
|
|
||||||
|
print ("Nemubot v%s ready, my PID is %i!" % (nemubot.__version__,
|
||||||
|
os.getpid()))
|
||||||
|
while True:
|
||||||
|
from nemubot.prompt.reset import PromptReset
|
||||||
|
try:
|
||||||
|
context.start()
|
||||||
|
if prmpt.run(context):
|
||||||
|
break
|
||||||
|
except PromptReset as e:
|
||||||
|
if e.type == "quit":
|
||||||
|
break
|
||||||
|
|
||||||
|
try:
|
||||||
|
import imp
|
||||||
|
# Reload all other modules
|
||||||
|
imp.reload(nemubot)
|
||||||
|
imp.reload(nemubot.prompt)
|
||||||
|
nemubot.reload()
|
||||||
|
import nemubot.bot
|
||||||
|
context = nemubot.bot.hotswap(context)
|
||||||
|
prmpt = nemubot.prompt.hotswap(prmpt)
|
||||||
|
print("\033[1;32mContext reloaded\033[0m, now in Nemubot %s" %
|
||||||
|
nemubot.__version__)
|
||||||
|
except:
|
||||||
|
logger.exception("\033[1;31mUnable to reload the prompt due to "
|
||||||
|
"errors.\033[0m Fix them before trying to reload "
|
||||||
|
"the prompt.")
|
||||||
|
|
||||||
|
context.quit()
|
||||||
|
print("\nWaiting for other threads shuts down...")
|
||||||
|
sys.exit(0)
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
main()
|
||||||
Loading…
x
Reference in New Issue
Block a user