Continued:

[fba.git] / fba / boot.py

diff --git a/fba/boot.py b/fba/boot.py
index c25466fb96f689a2ec65b30443bc60b10a22586e..2ffdf16a4b44e2a4f0dfd72f4dce0382d5ab9a99 100644 (file)
--- a/fba/boot.py
+++ b/fba/boot.py
@@ -40,7 +40,13 @@ def init_parser():
     )
 
     # Generic:
-    _PARSER.add_argument("--debug", action="store_const", dest="log_level", const=logging.DEBUG, help="Full debug output")
+    _PARSER.add_argument(
+        "--debug",
+        action="store_const",
+        dest="log_level",
+        const=logging.DEBUG,
+        help="Full debug output"
+    )
 
     # Commands:
     subparser_command = _PARSER.add_subparsers(
@@ -83,6 +89,7 @@ def init_parser():
     parser.set_defaults(command=commands.fetch_blocks)
     parser.add_argument("--domain", help="Instance name (aka. domain)")
     parser.add_argument("--software", help="Name of software, e.g. 'lemmy'")
+    parser.add_argument("--only-none", action="store_true", help="Checks only entries which has never been checked.")
     parser.add_argument("--force", action="store_true", help="Forces update of data, no matter what.")
 
     ### Fetch blocks from chaos.social ###
@@ -118,11 +125,19 @@ def init_parser():
     ### Fetch blocks from oliphant's GIT repository ###
     parser = subparser_command.add_parser(
         "fetch_oliphant",
-        help="Fetches CSV files (block recommendations) for more possible instances to disover",
+        help="Fetches CSV files from GIT generated by Oliphant 'member instances'.",
     )
     parser.set_defaults(command=commands.fetch_oliphant)
     parser.add_argument("--domain", help="Instance name (aka. domain) to check")
 
+    ### Fetch blocks from other CSV files
+    parser = subparser_command.add_parser(
+        "fetch_csv",
+        help="Fetches CSV files (block recommendations) for more possible instances to disover",
+    )
+    parser.set_defaults(command=commands.fetch_csv)
+    parser.add_argument("--domain", help="Instance name (aka. domain) to check")
+
     ### Fetch instances from given initial instance ###
     parser = subparser_command.add_parser(
         "fetch_instances",
@@ -140,11 +155,11 @@ def init_parser():
     parser.set_defaults(command=commands.fetch_txt)
 
     ### Fetch blocks from joinfediverse.wiki ###
-    parser = subparser_command.add_parser(
-        "fetch_joinfediverse",
-        help="Fetches FediBlock page from joinfediverse.wiki",
-    )
-    parser.set_defaults(command=commands.fetch_joinfediverse)
+    #parser = subparser_command.add_parser(
+    #    "fetch_joinfediverse",
+    #    help="Fetches FediBlock page from joinfediverse.wiki",
+    #)
+    #parser.set_defaults(command=commands.fetch_joinfediverse)
 
     ### Fetch instances JSON from instances.joinmobilizon.org
     parser = subparser_command.add_parser(
@@ -206,8 +221,12 @@ def init_parser():
     parser.set_defaults(command=commands.update_nodeinfo)
     parser.add_argument("--domain", help="Instance name (aka. domain)")
     parser.add_argument("--software", help="Name of software, e.g. 'lemmy'")
+    parser.add_argument("--mode", help="Name of detection mode, e.g. 'auto_discovery'")
     parser.add_argument("--force", action="store_true", help="Forces update of data, no matter what.")
     parser.add_argument("--no-software", action="store_true", help="Checks only entries with no software type detected.")
+    parser.add_argument("--no-auto", action="store_true", help="Checks only entries with other than AUTO_DISCOVERY as detection mode.")
+    parser.add_argument("--no-detection", action="store_true", help="Checks only entries with no detection mode set.")
+    parser.add_argument("--with-software", action="store_true", help="Checks only entries with any software type detected.")
 
     ### Fetch instances from instances.social ###
     parser = subparser_command.add_parser(
@@ -230,8 +249,16 @@ def init_parser():
     )
     parser.set_defaults(command=commands.fetch_relays)
     parser.add_argument("--domain", help="Instance name (aka. 'relay')")
+    parser.add_argument("--software", help="Name of software, e.g. 'lemmy'")
     parser.add_argument("--force", action="store_true", help="Forces update of data, no matter what.")
 
+    ### Fetches relay list from relaylist.com
+    parser = subparser_command.add_parser(
+        "fetch_relaylist",
+        help="Fetches relay list from relaylist.com",
+    )
+    parser.set_defaults(command=commands.fetch_relaylist)
+
     ### Remove invalid domains ###
     parser = subparser_command.add_parser(
         "remove_invalid",