quick fix migrate payload to archive downloading

Author: deckbsd

README.md

@@ -61,9 +61,9 @@ simple command example for downloading :
 ```
 python ./bin/glouton -s 2018-01-20T00:51:54 -e 2018-01-21T00:51:54 -n 28654
 ```
-command example if you just want the payload files :
+command example if you just want the archive files :
 ```
-python ./bin/glouton -s 2018-01-20T00:51:54 -e 2018-01-21T00:51:54 -n 28654 --payload
+python ./bin/glouton -s 2018-01-20T00:51:54 -e 2018-01-21T00:51:54 -n 28654 --archive
 ```
 command example if you want all data type from specific transmitter type, mode and uuid and apply module processing on waterfall :
 ```
@@ -81,7 +81,7 @@ Actual features :
 -------
     * download data from satnogs db
     * waterfall downloading
-    * payload downloading
+    * archive downloading (formerly payload downloading)
     * filters :
         * satnogs network
             * norad id

bin/glouton

@@ -56,16 +56,16 @@ if __name__ == "__main__":
                             help='the working directory')
         parser.add_argument('--auto', '-a', dest='auto',
                             help='download new sat data automatically (not implemented yet!)')
-        parser.add_argument('--payload', '-p', dest='download_payload', default=False, action="store_true",
-                            help='download payload data')
+        parser.add_argument('--archive', '-p', dest='download_archive', default=False, action="store_true",
+                            help='download archive data')
         parser.add_argument('--waterfall', '-f', dest='download_waterfall', default=False, action="store_true",
                             help='download waterfall data')
         parser.add_argument('--demoddata', '-d', dest='download_demoddata', default=False, action="store_true",
                             help='download demod data')
         parser.add_argument('--demod-module', dest='demoddata_modules', default=None,
                             help='list of the modules to use while downloading demoddata(s) separated by a ,')
-        parser.add_argument('--payload-module', dest='payload_modules', default=None,
-                            help='list of the modules to use while downloading payload(s) separated by a ,')
+        parser.add_argument('--archive-module', dest='archive_modules', default=None,
+                            help='list of the modules to use while downloading archive(s) separated by a ,')
         parser.add_argument('--waterfall-module', dest='waterfall_modules', default=None,
                             help='list of the modules to use while downloading waterfall(s) separated by a ,')
         parser.add_argument('--last', dest='last', action='store_true',
@@ -97,12 +97,12 @@ if __name__ == "__main__":
                 end_date = datetime.strptime(
                     args.end_date, '%Y-%m-%dT%H:%M:%S')
 
-            payload_modules = None
+            archive_modules = None
             demoddata_modules = None
             waterfall_modules = None
             frame_modules = None
-            if args.payload_modules is not None:
-                payload_modules = args.payload_modules.split(',')
+            if args.archive_modules is not None:
+                archive_modules = args.archive_modules.split(',')
             if args.demoddata_modules is not None:
                 demoddata_modules = args.demoddata_modules.split(',')
             if args.waterfall_modules is not None:
@@ -115,10 +115,10 @@ if __name__ == "__main__":
                              end_date,
                              args.status,
                              args.working_dir,
-                             args.download_payload,
+                             args.download_archive,
                              args.download_waterfall,
                              args.download_demoddata,
-                             payload_modules,
+                             archive_modules,
                              demoddata_modules,
                              waterfall_modules,
                              args.user_id,

glouton/commands/download/payloadDownloadCommand.py

@@ -9,12 +9,12 @@
 class PayloadDownloadCommand(DownloadObservationCommand):
     def __init__(self, params, observation, modules_commands):
         DownloadObservationCommand.__init__(self, params, observation, modules_commands)
-        self.__json_id = "payload"
+        self.__json_id = "archive_url"
 
     def download(self):
         url = self.observation[self.__json_id]
         if not url:
-            logger.Info('no payload found for the observation ' + str(self.observation['id']) + ' of ' + self.observation['start'])
+            logger.Info('no archive found for the observation ' + str(self.observation['id']) + ' of ' + self.observation['start'])
             return
 
         fileHelper.create_dir_if_not_exist(self.full_path)

glouton/repositories/payload/payloadRepo.py

@@ -19,7 +19,7 @@ def __init__(self, working_dir, modules):
 
     def register_command(self, observation, start_date, end_date):
         cmd_parameters = DownloadCommandParams(
-            self.__working_dir, self.__create_dir_name('payload', start_date, end_date), self.__modules)
+            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)

glouton/services/module/moduleService.py

@@ -18,7 +18,7 @@ def loadDemoddataModules(self):
         return self.__loadModule(self.__cmd.demoddata_modules)
 
     def loadPayloadModules(self):
-        logger.Info('Payload module(s) loading :')
+        logger.Info('Archive module(s) loading :')
         self.__cmd.payload_modules = self.__getModulesFromConfig(
             self.__cmd.payload_modules, 'PAYLOAD')
         self.__cmd.payload_modules = self.__getModulesFromConfig(