From c9e689b3f3d043933ea953448832c8cc718cd28f Mon Sep 17 00:00:00 2001 From: nico wellpott Date: Sun, 28 Mar 2021 16:39:58 +0200 Subject: packaging: various smaller fixes and corrections - remove placeholder print statements * replace wildcard import with a direct one * rename main class to blimp * optimized imports --- src/blimp/main.py | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) (limited to 'src/blimp/main.py') diff --git a/src/blimp/main.py b/src/blimp/main.py index 5d4c3ac..4189bbc 100644 --- a/src/blimp/main.py +++ b/src/blimp/main.py @@ -1,16 +1,14 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -import argparse - import requests -from appdirs import * +from appdirs import user_cache_dir from .bl_process import ProcessBlocklist from .misc import * -class BlacklistImporter: +class Blimp: def __init__(self, args): self.outfile = args.outfile self.dryrun = args.dry_run @@ -89,9 +87,10 @@ class BlacklistImporter: self.start_request() # blacklist processing - ProcessBlocklist().process(self.blacklist, self.outfile, self.dryrun) + ProcessBlocklist.process(self.blacklist, self.outfile, self.dryrun) - """# reload config if changes have been applied + """ + # reload config if changes have been applied if self.change: # catch ejabberdctl missing if Path("/usr/sbin/ejabberdctl").is_file(): @@ -102,14 +101,9 @@ class BlacklistImporter: print("/usr/sbin/ejabberdctl was not found", file=sys.stderr) print("blacklist changes have been applied\nejabberd config was not reloaded", file=sys.stderr) sys.exit(1) -""" + """ if __name__ == "__main__": - parser = argparse.ArgumentParser() - parser.add_argument("-out", "--outfile", help="set path to output file", action="store", default=None) - parser.add_argument("-dr", "--dry-run", help="perform a dry run", action="store_true", default=False) - args = parser.parse_args() - - # run - BlacklistImporter(args).main() + from .cli import cli + cli() -- cgit v1.2.3-54-g00ecf