kindred/create
1
1
Fork 0
Code Issues 53 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Addon Manager: Linter cleanup

Browse Source
This commit is contained in:
Chris Hennes
2024-07-12 09:38:15 -05:00
parent 5a202ce2d0
commit 238cab3643
2 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Mod/AddonManager/addonmanager_workers_installation.py
View File

@@ -207,10 +207,9 @@ class UpdateMetadataCacheWorker(QtCore.QThread):
def _ensure_string(self, arbitrary_data, addon_name, file_name) -> str:
if isinstance(arbitrary_data, str):
return arbitrary_data
elif isinstance(arbitrary_data, QtCore.QByteArray):
if isinstance(arbitrary_data, QtCore.QByteArray):
return self._decode_data(arbitrary_data.data(), addon_name, file_name)
else:
return self._decode_data(arbitrary_data, addon_name, file_name)
return self._decode_data(arbitrary_data, addon_name, file_name)
def _decode_data(self, byte_data, addon_name, file_name) -> str:
"""UTF-8 decode data, and print an error message if that fails"""

17
src/Mod/AddonManager/addonmanager_workers_startup.py
View File

@@ -23,7 +23,6 @@
# ***************************************************************************
""" Worker thread classes for Addon Manager startup """
import datetime
import hashlib
import json
import os
@@ -45,7 +44,6 @@ from AddonStats import AddonStats
import NetworkManager
from addonmanager_git import initialize_git, GitFailed
from addonmanager_metadata import MetadataReader, get_branch_from_metadata
import addonmanager_freecad_interface as fci
translate = FreeCAD.Qt.translate
@@ -455,7 +453,7 @@ class LoadPackagesFromCacheWorker(QtCore.QThread):
if os.path.isfile(repo_metadata_cache_path):
try:
repo.load_metadata_file(repo_metadata_cache_path)
except Exception as e:
except RuntimeError as e:
FreeCAD.Console.PrintLog(f"Failed loading {repo_metadata_cache_path}\n")
FreeCAD.Console.PrintLog(str(e) + "\n")
self.addon_repo.emit(repo)
@@ -578,7 +576,7 @@ class UpdateChecker:
with wb.git_lock:
try:
status = self.git_manager.status(clonedir)
if "(no branch)" in self.git_manager.status(clonedir):
if "(no branch)" in status:
# By definition, in a detached-head state we cannot
# update, so don't even bother checking.
wb.set_status(Addon.Status.NO_UPDATE_AVAILABLE)
@@ -619,7 +617,7 @@ class UpdateChecker:
remote_default_branch = get_branch_from_metadata(package.metadata)
if installed_default_branch != remote_default_branch:
return True
except Exception:
except RuntimeError:
return False
return False
@@ -664,7 +662,7 @@ class UpdateChecker:
package.set_status(Addon.Status.UPDATE_AVAILABLE)
else:
package.set_status(Addon.Status.NO_UPDATE_AVAILABLE)
except Exception:
except RuntimeError:
FreeCAD.Console.PrintWarning(
translate(
"AddonsInstaller",
@@ -687,7 +685,7 @@ class UpdateChecker:
mac = mac.replace("+", "%2B")
url = "https://wiki.freecad.org/Macro_" + mac
macro_wrapper.macro.fill_details_from_wiki(url)
except Exception:
except RuntimeError:
FreeCAD.Console.PrintWarning(
translate(
"AddonsInstaller",
@@ -936,7 +934,8 @@ class GetBasicAddonStatsWorker(QtCore.QThread):
FreeCAD.Console.PrintError(
translate(
"AddonsInstaller",
"Failed to get Addon statistics from {} -- only sorting alphabetically will be accurate\n",
"Failed to get Addon statistics from {} -- only sorting alphabetically will"
" be accurate\n",
).format(self.url)
)
return
@@ -995,5 +994,5 @@ class GetAddonScoreWorker(QtCore.QThread):
self.update_addon_score.emit(addon)
except (ValueError, OverflowError):
FreeCAD.Console.PrintLog(
f"Failed to convert score value '{score}' to an integer for addon {addon.name}"
f"Failed to convert score value '{score}' to an integer for {addon.name}"
)