Optimize _get_changelog_common

Author: SanmerDev

Diff for: sync/core/Pull.py

@@ -1,4 +1,5 @@
 import shutil
+from pathlib import Path
 
 from .Config import Config
 from ..error import Result
@@ -52,8 +53,13 @@ def _get_file_url(self, module_id, file):
             return url
 
     def _get_changelog_common(self, module_id, changelog):
-        if not isinstance(changelog, str) or changelog == "":
+        is_file = False
+
+        if isinstance(changelog, str) and changelog == "":
             return None
+        elif isinstance(changelog, Path):
+            changelog = changelog.name
+            is_file = True
 
         if changelog.startswith("http"):
             changelog_file = self._modules_folder.joinpath(module_id, f"{module_id}.md")
@@ -62,13 +68,18 @@ def _get_changelog_common(self, module_id, changelog):
                 msg = Log.get_msg(result.error)
                 self._log.e(f"_get_changelog_common: [{module_id}] -> {msg}")
                 changelog_file = None
-        else:
+
+        elif is_file:
             changelog_file = self._local_folder.joinpath(changelog)
             if not changelog_file.exists():
                 msg = f"{changelog} is not in {self._local_folder}"
                 self._log.d(f"_get_changelog_common: [{module_id}] -> {msg}")
                 changelog_file = None
 
+        else:
+            self._log.w(f"_get_changelog_common: [{module_id}] -> unsupported type [{changelog}]")
+            changelog_file = None
+
         if changelog_file is not None:
             if not self._check_changelog(module_id, changelog_file):
                 changelog_file.unlink()
@@ -210,7 +221,7 @@ def from_zip(self, track):
             self._log.i(f"from_zip: [{track.id}] -> {msg}")
             return None, 0.0
 
-        changelog = self._get_changelog_common(track.id, track.changelog)
+        changelog = self._get_changelog_common(track.id, Path(track.changelog))
         online_module = self._from_zip_common(track.id, zip_file, changelog, delete_tmp=False)
         return online_module, last_modified
 

Diff for: sync/core/Pull.pyi

@@ -1,5 +1,5 @@
 from pathlib import Path
-from typing import Optional, Tuple
+from typing import Optional, Tuple, Union
 
 from ..error import Result
 from ..model import (
@@ -27,7 +27,7 @@ class Pull:
     def _download(url: str, out: Path) -> Result: ...
     def _check_changelog(self, module_id: str, file: Path) -> bool: ...
     def _get_file_url(self, module_id: str, file: Path) -> str: ...
-    def _get_changelog_common(self, module_id: str, changelog: str) -> Optional[Path]: ...
+    def _get_changelog_common(self, module_id: str, changelog: Union[str, Path]) -> Optional[Path]: ...
     def _from_zip_common(
         self,
         module_id: str,