WIP: Move application_args to MadGlobals

Map-A-Droid · Jun 25, 2023 · ddf44bb · ddf44bb
1 parent b1d7f1d
commit ddf44bb
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 11 deletions.
diff --git a/alembic/versions/288e656b3be6_fix_settings_device_softbar_enabled_.py b/alembic/versions/288e656b3be6_fix_settings_device_softbar_enabled_.py
@@ -5,9 +5,9 @@
 Create Date: 2021-11-03 19:10:40.587355
 
 """
+from sqlalchemy import text
+
 from alembic import op
-from sqlalchemy import (Column, Float, ForeignKey, Index,
-                        String, Table, text)
 
 # revision identifiers, used by Alembic.
 revision = '288e656b3be6'

diff --git a/mapadroid/mitm_receiver/data_processing/ProcessMitmDataProcessingManager.py b/mapadroid/mitm_receiver/data_processing/ProcessMitmDataProcessingManager.py
@@ -39,7 +39,6 @@ async def launch_processors(self):
 
             data_processor: InProcessMitmDataProcessorManager = InProcessMitmDataProcessorManager(
                 queue_of_task,
-                MadGlobals.application_args,
                 self._mitm_mapper,
                 self._db_wrapper,
                 self._quest_gen,

diff --git a/mapadroid/utils/redisReport.py b/mapadroid/utils/redisReport.py
@@ -1,10 +1,13 @@
 import asyncio
 
+from redis.asyncio.client import Redis
+
 from mapadroid.utils.logging import LoggerEnums, get_logger
 from mapadroid.utils.madGlobals import MadGlobals, terminate_mad
 
 logger = get_logger(LoggerEnums.system)
 
+
 async def report_queue_size(__db_wrapper, __queueObject):
     __cache_key = MadGlobals.application_args.redis_report_queue_key
     __sleep_time = MadGlobals.application_args.redis_report_queue_interval

diff --git a/scripts/remove_all_spawns_within_geofence.py b/scripts/remove_all_spawns_within_geofence.py
@@ -4,11 +4,12 @@
 import os
 import re
 import sys
+from typing import List
 
 import mysql.connector
 
 from mapadroid.geofence.geofenceHelper import GeofenceHelper
-from mapadroid.utils.logging import initLogging, logger
+from mapadroid.utils.logging import init_logging, logger
 
 sys.path.append("..")
 
@@ -44,7 +45,7 @@ def get_value_for(regex_string, force_exit=True):
 
 def main():
     args = Args()
-    initLogging(args)
+    init_logging(args)
 
     if len(sys.argv) != 2:
         logger.error("usage: remove_all_spawns_within_geofence.py GEOFENCE_FILENAME")

diff --git a/start.py b/start.py
@@ -139,26 +139,26 @@ async def start():
                                  mitm_data_processor_manager.get_queue(),
                                  account_handler=account_handler)
     mitm_receiver_task: web.AppRunner = await mitm_receiver.start()
-    logger.info('Starting websocket server on port {}'.format(str(application_args.ws_port)))
-    ws_server = WebsocketServer(args=application_args,
+    logger.info('Starting websocket server on port {}'.format(str(MadGlobals.application_args.ws_port)))
+    ws_server = WebsocketServer(args=MadGlobals.application_args,
                                 mitm_mapper=mitm_mapper,
                                 stats_handler=stats_handler,
                                 db_wrapper=db_wrapper,
                                 mapping_manager=mapping_manager,
                                 pogo_window_manager=pogo_win_manager,
                                 event=event,
                                 account_handler=account_handler,
-                                enable_configmode=application_args.config_mode)
+                                enable_configmode=MadGlobals.application_args.config_mode)
     # TODO: module/service?
     await ws_server.start_server()
 
     device_updater = DeviceUpdater(ws_server, db_wrapper, storage_elem)
     await device_updater.start_updater()
     if not MadGlobals.application_args.config_mode:
         if MadGlobals.application_args.webhook:
-            rarity = Rarity(application_args, db_wrapper)
+            rarity = Rarity(MadGlobals.application_args, db_wrapper)
             await rarity.start_dynamic_rarity()
-            webhook_worker = WebhookWorker(application_args, db_wrapper, mapping_manager, rarity, quest_gen)
+            webhook_worker = WebhookWorker(MadGlobals.application_args, db_wrapper, mapping_manager, rarity, quest_gen)
             webhook_task: Task = await webhook_worker.start()
             # TODO: Stop webhook_task properly
 
@@ -189,7 +189,7 @@ async def start():
     # MADmin needs to be started after sub-applications (plugins) have been added
 
     if not MadGlobals.application_args.disable_madmin or MadGlobals.application_args.config_mode:
-        logger.info("Starting Madmin on port {}", str(application_args.madmin_port))
+        logger.info("Starting Madmin on port {}", str(MadGlobals.application_args.madmin_port))
         madmin_app_runner = await madmin.madmin_start()
 
     if MadGlobals.application_args.statistic: