Merge pull request #74 from Dineshkarthik/73-update-failed_ids-per-batch

Update `ids_to_retry` for every batch of processed messages

Author: Dineshkarthik

media_downloader.py

@@ -31,6 +31,7 @@ def update_config(config: dict):
     config: dict
         Configuraiton to be written into config file.
     """
+    config["ids_to_retry"] = list(set(config["ids_to_retry"] + FAILED_IDS))
     with open("config.yaml", "w") as yaml_file:
         yaml.dump(config, yaml_file, default_flow_style=False)
     logger.info("Updated last read message_id to config file")
@@ -345,14 +346,11 @@ def main():
     updated_config = asyncio.get_event_loop().run_until_complete(
         begin_import(config, pagination_limit=100)
     )
-    updated_config["ids_to_retry"] = list(
-        set(updated_config["ids_to_retry"] + FAILED_IDS)
-    )
     if FAILED_IDS:
         logger.info(
             "Downloading of %d files failed. "
-            "Failed message ids are to config file.\n"
-            "Functionality to download failed downloads will be added "
+            "Failed message ids are added to config file.\n"
+            "Functionality to re-download failed downloads will be added "
             "in the next version of `Telegram-media-downloader`",
             len(set(FAILED_IDS)),
         )

tests/test_media_downloader.py

@@ -29,6 +29,7 @@
     "api_hash": "hasw5Tgawsuj67",
     "last_read_message_id": 0,
     "chat_id": 8654123,
+    "ids_to_retry": [],
     "media_types": ["audio", "voice"],
     "file_formats": {"audio": ["all"], "voice": ["all"]},
 }
@@ -100,7 +101,7 @@ def __init__(self):
         pass
 
     def run_until_complete(self, *args, **kwargs):
-        return {"api_id": 1, "api_hash": "asdf", "ids_to_retry": [1]}
+        return {"api_id": 1, "api_hash": "asdf", "ids_to_retry": [1, 2, 3]}
 
 
 class MockAsync:
@@ -474,16 +475,21 @@ def test_download_media(self, mock_logger, patched_time_sleep):
     @mock.patch("__main__.__builtins__.open", new_callable=mock.mock_open)
     @mock.patch("media_downloader.yaml", autospec=True)
     def test_update_config(self, mock_yaml, mock_open):
-        conf = {"api_id": 123, "api_hash": "hasw5Tgawsuj67"}
+        conf = {
+            "api_id": 123,
+            "api_hash": "hasw5Tgawsuj67",
+            "ids_to_retry": [],
+        }
         update_config(conf)
         mock_open.assert_called_with("config.yaml", "w")
         mock_yaml.dump.assert_called_with(
             conf, mock.ANY, default_flow_style=False
         )
 
+    @mock.patch("media_downloader.update_config")
     @mock.patch("media_downloader.pyrogram.Client", new=MockClient)
     @mock.patch("media_downloader.process_messages", new=mock_process_message)
-    def test_begin_import(self):
+    def test_begin_import(self, mock_update_config):
         result = self.loop.run_until_complete(async_begin_import(MOCK_CONF, 3))
         conf = copy.deepcopy(MOCK_CONF)
         conf["last_read_message_id"] = 5

utils/__init__.py

@@ -1,6 +1,6 @@
 """Init namespace"""
 
-__version__ = "0.3.0"
+__version__ = "0.3.1"
 __license__ = "MIT License"
 __copyright__ = (
     "Copyright (C) 2019 Dineshkarthik <https://github.com/Dineshkarthik>"