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

Addon Manager: Black reformat

Browse Source
This commit is contained in:
Chris Hennes
2022-02-18 08:38:57 -06:00
parent f28278dca5
commit d357d59c02
5 changed files with 30 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Mod/AddonManager/AddonManager.py
View File

@@ -392,7 +392,9 @@ class CommandAddonManager:
self.dialog.buttonClose.clicked.connect(self.dialog.reject)
self.dialog.buttonUpdateCache.clicked.connect(self.on_buttonUpdateCache_clicked)
self.dialog.buttonPauseUpdate.clicked.connect(self.stop_update)
self.dialog.buttonCheckForUpdates.clicked.connect(lambda: self.force_check_updates(standalone=True))
self.dialog.buttonCheckForUpdates.clicked.connect(
lambda: self.force_check_updates(standalone=True)
)
self.packageList.itemSelected.connect(self.table_row_activated)
self.packageList.setEnabled(False)
self.packageDetails.execute.connect(self.executemacro)
@@ -755,24 +757,24 @@ class CommandAddonManager:
self.do_next_startup_phase()
return
if not self.packages_with_updates:
self.force_check_updates(standalone = False)
self.force_check_updates(standalone=False)
else:
self.do_next_startup_phase()
def force_check_updates(self, standalone = False) -> None:
def force_check_updates(self, standalone=False) -> None:
if hasattr(self, "check_worker"):
thread = self.check_worker
if thread:
if not thread.isFinished():
self.do_next_startup_phase()
return
self.dialog.buttonUpdateAll.setText(
translate("AddonsInstaller", "Checking for updates...")
)
self.dialog.buttonUpdateAll.show()
self.dialog.buttonCheckForUpdates.setDisabled(True)
self.check_worker = CheckWorkbenchesForUpdatesWorker(self.item_model.repos)
self.check_worker = CheckWorkbenchesForUpdatesWorker(self.item_model.repos)
self.check_worker.finished.connect(self.do_next_startup_phase)
self.check_worker.finished.connect(self.update_check_complete)
self.check_worker.progress_made.connect(self.update_progress_bar)

19
src/Mod/AddonManager/NetworkManager.py
View File

@@ -178,7 +178,13 @@ if HAVE_QTNETWORK:
# are indepdendent booleans, rather than an enumeration:
count = [noProxyCheck, systemProxyCheck, userProxyCheck].count(True)
if count != 1:
FreeCAD.Console.PrintWarning(translate("AddonsInstaller","Parameter error: mutually exclusive proxy options set. Resetting to default.") + "\n")
FreeCAD.Console.PrintWarning(
translate(
"AddonsInstaller",
"Parameter error: mutually exclusive proxy options set. Resetting to default.",
)
+ "\n"
)
noProxyCheck = True
systemProxyCheck = False
userProxyCheck = False
@@ -186,8 +192,14 @@ if HAVE_QTNETWORK:
pref.SetBool("SystemProxyCheck", systemProxyCheck)
pref.SetBool("UserProxyCheck", userProxyCheck)
if userProxyCheck and not proxy_string:
FreeCAD.Console.PrintWarning(translate("AddonsInstaller","Parameter error: user proxy indicated, but no proxy provided. Resetting to default.") + "\n")
if userProxyCheck and not proxy_string:
FreeCAD.Console.PrintWarning(
translate(
"AddonsInstaller",
"Parameter error: user proxy indicated, but no proxy provided. Resetting to default.",
)
+ "\n"
)
noProxyCheck = True
userProxyCheck = False
pref.SetBool("NoProxyCheck", noProxyCheck)
@@ -211,7 +223,6 @@ if HAVE_QTNETWORK:
else:
print(f"Got {result}, expected 1, 2, or 3.")
app.quit()
if noProxyCheck:
pass

2
src/Mod/AddonManager/addonmanager_workers.py
View File

@@ -231,7 +231,7 @@ class UpdateWorker(QtCore.QThread):
if addon and addon["url"]:
if addon["url"][-1] == "/":
addon["url"] = addon["url"][0:-1] # Strip trailing slash
addon["url"] = addon["url"].split(".git")[0] # Remove .git
addon["url"] = addon["url"].split(".git")[0] # Remove .git
name = addon["url"].split("/")[-1]
if name in package_names:
# We already have something with this name, skip this one

6
src/Mod/AddonManager/package_details.py
View File

@@ -231,7 +231,7 @@ class PackageDetails(QWidget):
if have_git and repo.repo_type != AddonManagerRepo.RepoType.MACRO:
basedir = FreeCAD.getUserAppDataDir()
moddir = os.path.join(basedir, "Mod", repo.name)
if os.path.exists(os.path.join(moddir,".git")):
if os.path.exists(os.path.join(moddir, ".git")):
gitrepo = git.Repo(moddir)
branch = gitrepo.head.ref.name
detached_head = gitrepo.head.is_detached
@@ -467,7 +467,9 @@ class PackageDetails(QWidget):
self.ui.webView.load(QUrl(self.repo.macro.url))
self.ui.urlBar.setText(self.repo.macro.url)
else:
readme_data = NetworkManager.AM_NETWORK_MANAGER.blocking_get(self.repo.macro.url)
readme_data = NetworkManager.AM_NETWORK_MANAGER.blocking_get(
self.repo.macro.url
)
text = readme_data.data().decode("utf8")
self.ui.textBrowserReadMe.setHtml(text)

4
src/Mod/AddonManager/package_list.py
View File

@@ -102,7 +102,9 @@ class PackageList(QWidget):
self.item_filter.setHidePy2(pref.GetBool("HidePy2", True))
self.item_filter.setHideObsolete(pref.GetBool("HideObsolete", True))
self.item_filter.setHideNewerFreeCADRequired(pref.GetBool("HideNewerFreeCADRequired", True))
self.item_filter.setHideNewerFreeCADRequired(
pref.GetBool("HideNewerFreeCADRequired", True)
)
def on_listPackages_clicked(self, index: QModelIndex):
source_selection = self.item_filter.mapToSource(index)