clean code after payload url change

Author: deckbsd

glouton/commands/download/payloadDownloadCommand.py glouton/commands/download/archiveDownloadCommand.py

@@ -6,7 +6,7 @@
 import requests
 
 
-class PayloadDownloadCommand(DownloadObservationCommand):
+class ArchiveDownloadCommand(DownloadObservationCommand):
     def __init__(self, params, observation, modules_commands):
         DownloadObservationCommand.__init__(self, params, observation, modules_commands)
         self.__json_id = "archive_url"
@@ -26,7 +26,7 @@ def download(self):
 
         r = self.client.get(url)
         if r.status_code == 200:
-            logger.Info('downloading...' + file_name)
+            logger.Info('downloading archive...' + file_name)
             with open(full_path_file, "wb") as file:
                 file.write(r.content)
             self.runModulesAfterDownload(file_name)

glouton/config.json

@@ -7,7 +7,7 @@
         "HTTP_PROXY": ""
     },
     "MODULES": {
-        "PAYLOAD": [],
+        "ARCHIVE": [],
         "WATERFALL": [],
         "DEMODDATA": [],
         "FRAME": [],

glouton/domain/payload/payload.py glouton/domain/archive/payload.py

@@ -1,3 +1,3 @@
-class Payload:
+class Archive:
     def __init__(self, url=None):
         self.url = url

glouton/domain/observation/observation.py

@@ -1,6 +1,6 @@
 class Observation:
-    def __init__(self, id=None, start_date=None, waterfall=None, payload=None):
+    def __init__(self, id=None, start_date=None, waterfall=None, archive=None):
         self.id = id
         self.start_date = start_date
         self.waterfall = waterfall
-        self.payload = payload
+        self.archive = archive

glouton/domain/parameters/programCmd.py

@@ -6,10 +6,10 @@ def __init__(self,
                  end_date,
                  observation_status,
                  working_dir,
-                 payloads,
+                 archives,
                  waterfalls,
                  demoddata,
-                 payload_modules,
+                 archive_modules,
                  demoddata_modules,
                  waterfall_modules,
                  user,
@@ -25,10 +25,10 @@ def __init__(self,
         self.start_date = start_date
         self.end_date = end_date
         self.working_dir = working_dir
-        self.payloads = payloads
+        self.archives = archives
         self.waterfalls = waterfalls
         self.demoddata = demoddata
-        self.payload_modules = payload_modules
+        self.archive_modules = archive_modules
         self.demoddata_modules = demoddata_modules
         self.waterfall_modules = waterfall_modules
         self.observation_status = observation_status

glouton/repositories/payload/__init__.py glouton/repositories/archive/__init__.py

@@ -1,37 +1,37 @@
 from queue import Queue
 from threading import Thread
 from glouton.commands.download.downloadCommandParams import DownloadCommandParams
-from glouton.commands.download.payloadDownloadCommand import PayloadDownloadCommand
+from glouton.commands.download.archiveDownloadCommand import ArchiveDownloadCommand
 from glouton.workers.downloadWorker import DownloadWorker
 from glouton.workers.moduleWorker import ModuleWorker
 from glouton.domain.interfaces.downloadable import Downloadable
 from glouton.shared import threadHelper
 from threading import Event
 
 
-class PayloadRepo(Downloadable):
+class ArchiveRepo(Downloadable):
     def __init__(self, working_dir, modules):
         self.__working_dir = working_dir
-        self.__payload_commands = Queue()
-        self.__payload_modules_commands = Queue()
+        self.__archive_commands = Queue()
+        self.__archive_modules_commands = Queue()
         self.__modules = modules
         self.__download_status = Event()
 
     def register_command(self, observation, start_date, end_date):
         cmd_parameters = DownloadCommandParams(
             self.__working_dir, self.__create_dir_name('archive', start_date, end_date), self.__modules)
-        waterfallDownloadCommand = PayloadDownloadCommand(
-            cmd_parameters, observation, self.__payload_modules_commands)
-        self.__payload_commands.put(waterfallDownloadCommand)
+        waterfallDownloadCommand = ArchiveDownloadCommand(
+            cmd_parameters, observation, self.__archive_modules_commands)
+        self.__archive_commands.put(waterfallDownloadCommand)
 
     def create_worker(self):
         threads = []
         downloadWorker = DownloadWorker(
-            self.__payload_commands, self.__download_status)
+            self.__archive_commands, self.__download_status)
         threads.append(threadHelper.create_thread(downloadWorker.execute))
         if self.__modules is not None:
             moduleWorker = ModuleWorker(
-                self.__payload_modules_commands, self.__download_status)
+                self.__archive_modules_commands, self.__download_status)
             threads.append(threadHelper.create_thread(moduleWorker.execute))
 
         return threads

glouton/repositories/payload/payloadRepo.py glouton/repositories/archive/archiveRepo.py

@@ -1 +1 @@
-requests==2.21.0
+requests==2.24.0

glouton/requirements.txt

@@ -17,14 +17,14 @@ def loadDemoddataModules(self):
 
         return self.__loadModule(self.__cmd.demoddata_modules)
 
-    def loadPayloadModules(self):
+    def loadArchiveModules(self):
         logger.Info('Archive module(s) loading :')
-        self.__cmd.payload_modules = self.__getModulesFromConfig(
-            self.__cmd.payload_modules, 'PAYLOAD')
-        self.__cmd.payload_modules = self.__getModulesFromConfig(
-            self.__cmd.payload_modules, 'FOR_ALL_OBSERVATION')
+        self.__cmd.archive_modules = self.__getModulesFromConfig(
+            self.__cmd.archive_modules, 'ARCHIVE')
+        self.__cmd.archive_modules = self.__getModulesFromConfig(
+            self.__cmd.archive_modules, 'FOR_ALL_OBSERVATION')
 
-        return self.__loadModule(self.__cmd.payload_modules)
+        return self.__loadModule(self.__cmd.archive_modules)
 
     def loadWaterfallModules(self):
         logger.Info('Waterfall module(s) loading :')

glouton/services/module/moduleService.py

@@ -1,6 +1,6 @@
 from glouton.services.module.moduleService import ModuleService
 from glouton.repositories.demoddata.demoddataRepo import DemoddataRepo
-from glouton.repositories.payload.payloadRepo import PayloadRepo
+from glouton.repositories.archive.archiveRepo import ArchiveRepo
 from glouton.repositories.waterfall.waterfallRepo import WaterfallRepo
 from glouton.repositories.observation.observationsRepo import ObservationRepo
 
@@ -14,10 +14,10 @@ def __init__(self, cmd):
 
     def filter_repositories(self):
         downloadable_data_repos = []
-        all = not self.__cmd.payloads and not self.__cmd.waterfalls and not self.__cmd.demoddata
-        if all or self.__cmd.payloads:
-            downloadable_data_repos.append(PayloadRepo(
-                self.__cmd.working_dir, self.__module_service.loadPayloadModules()))
+        all = not self.__cmd.archives and not self.__cmd.waterfalls and not self.__cmd.demoddata
+        if all or self.__cmd.archives:
+            downloadable_data_repos.append(ArchiveRepo(
+                self.__cmd.working_dir, self.__module_service.loadArchiveModules()))
         if all == True or self.__cmd.waterfalls:
             downloadable_data_repos.append(WaterfallRepo(
                 self.__cmd.working_dir, self.__module_service.loadWaterfallModules()))

glouton/services/observation/observationsService.py

@@ -14,7 +14,7 @@ def read():
             "HTTP_PROXY": ""
         },
         "MODULES": {
-            "PAYLOAD": [],
+            "ARCHIVE": [],
             "WATERFALL": [],
             "DEMODDATA": [],
             "FRAME": [],

glouton/shared/config.py

@@ -13,7 +13,7 @@
     long_description = f.read()
 
 setup(
-    version="0.7.1",
+    version="0.8.0",
     name="glouton",
     description="`Glouton is a cli program which helps you downloading satnogs data`",
     url="https://github.com/deckbsd/glouton-satnogs-data-downloader.git",
@@ -25,7 +25,7 @@
     packages=find_packages(exclude=["tests", "docs"]),
     data_files=[('glouton', ['glouton/config.json'])],
     scripts=['bin/glouton'],
-    keywords="satnogs, telemetry, satellite, payload, data, db, download",
+    keywords="satnogs, telemetry, satellite, archive, data, db, download",
     classifiers=[
         "Development Status :: 3 - Alpha", "Intended Audience :: Developers",
         "Programming Language :: Python :: 3",

setup.py

@@ -10,7 +10,7 @@
                     "HTTP_PROXY": ""
                 },
                 "MODULES": {
-                    "PAYLOAD": [],
+                    "ARCHIVE": [],
                     "WATERFALL": [],
                     "DEMODDATA": [],
                     "FRAME": [],

test/test_configuration.py

@@ -1,5 +1,5 @@
 from glouton.services.observation.observationsService import ObservationsService
-from glouton.repositories.payload.payloadRepo import PayloadRepo
+from glouton.repositories.archive.archiveRepo import ArchiveRepo
 from glouton.repositories.waterfall.waterfallRepo import WaterfallRepo
 from glouton.repositories.demoddata.demoddataRepo import DemoddataRepo
 from glouton.domain.parameters.programCmd import ProgramCmd
@@ -27,12 +27,12 @@ def test_loading_all_repository_types():
     service = ObservationsService(params)
     repos = service.filter_repositories()
     assert len(repos) == 3
-    assert isinstance(repos[0], PayloadRepo)
+    assert isinstance(repos[0], ArchiveRepo)
     assert isinstance(repos[1], WaterfallRepo)
     assert isinstance(repos[2], DemoddataRepo)
 
 
-def test_loading_only_payload_repository_types():
+def test_loading_only_archive_repository_types():
     params = ProgramCmd(None, None, None, None, None,
                         None,
                         True,
@@ -54,7 +54,7 @@ def test_loading_only_payload_repository_types():
     service = ObservationsService(params)
     repos = service.filter_repositories()
     assert len(repos) == 1
-    assert isinstance(repos[0], PayloadRepo)
+    assert isinstance(repos[0], ArchiveRepo)
 
 
 def test_loading_only_waterfall_repository_types():
@@ -82,7 +82,7 @@ def test_loading_only_waterfall_repository_types():
     assert isinstance(repos[0], WaterfallRepo)
 
 
-def test_loading_only_Demoddata_repository_types():
+def test_loading_only_demoddata_repository_types():
     params = ProgramCmd(None, None, None, None, None,
                         None,
                         False,
@@ -107,7 +107,7 @@ def test_loading_only_Demoddata_repository_types():
     assert isinstance(repos[0], DemoddataRepo)
 
 
-def test_loading_only_Payload_Demoddata_repository_types():
+def test_loading_only_archive_demoddata_repository_types():
     params = ProgramCmd(None, None, None, None, None,
                         None,
                         True,
@@ -129,11 +129,11 @@ def test_loading_only_Payload_Demoddata_repository_types():
     service = ObservationsService(params)
     repos = service.filter_repositories()
     assert len(repos) == 2
-    assert isinstance(repos[0], PayloadRepo)
+    assert isinstance(repos[0], ArchiveRepo)
     assert isinstance(repos[1], DemoddataRepo)
 
 
-def test_loading_only_Waterfall_Demoddata_repository_types():
+def test_loading_only_waterfall_demoddata_repository_types():
     params = ProgramCmd(None, None, None, None, None,
                         None,
                         False,
@@ -181,6 +181,6 @@ def test_default_loading_repository():
     service = ObservationsService(params)
     repos = service.filter_repositories()
     assert len(repos) == 3
-    assert isinstance(repos[0], PayloadRepo)
+    assert isinstance(repos[0], ArchiveRepo)
     assert isinstance(repos[1], WaterfallRepo)
     assert isinstance(repos[2], DemoddataRepo)