Skip to content

Add manager capabilities #1041

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
May 19, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions wingetui/PackageManagers/PackageClasses.py
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,15 @@ def __str__(self) -> str:
str += f"RemoveDataOnUninstall={self.RemoveDataOnUninstall}>"
return str

class PackageManagerCapabilities():
CanRunAsAdmin: bool = False
CanSkipIntegrityChecks: bool = False
CanRunInteractively: bool = False
CanRemoveDataOnUninstall: bool = False
SupportsCustomVersions: bool = False
SupportsCustomArchitectures: bool = False
SupportsCustomScopes: bool = False

class InstallationWidgetType(QWidget):
finishInstallation: Signal
addInfoLine: Signal
Expand All @@ -132,6 +141,7 @@ def __init__(self) -> None:

class PackageManagerModule():
NAME: str
Capabilities: PackageManagerCapabilities
def __init__(self):
pass

Expand Down
9 changes: 9 additions & 0 deletions wingetui/PackageManagers/choco.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,15 @@ class ChocoPackageManager(SamplePackageManager):
BLACKLISTED_PACKAGE_IDS = ["Did", "Features?", "Validation", "-", "being", "It", "Error", "L'accs", "Maximum", "This", "Output is package name ", "operable"]
BLACKLISTED_PACKAGE_VERSIONS = ["Did", "Features?", "Validation", "-", "being", "It", "Error", "L'accs", "Maximum", "This", "packages", "current version", "installed version", "is", "program", "validations"]

Capabilities = PackageManagerCapabilities()
Capabilities.CanRunAsAdmin = True
Capabilities.CanSkipIntegrityChecks = True
Capabilities.CanRunInteractively = True
Capabilities.CanRemoveDataOnUninstall = False
Capabilities.SupportsCustomVersions = True
Capabilities.SupportsCustomArchitectures = True
Capabilities.SupportsCustomScopes = False

if not os.path.exists(CACHE_FILE_PATH):
os.makedirs(CACHE_FILE_PATH)

Expand Down
13 changes: 11 additions & 2 deletions wingetui/PackageManagers/npm.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,16 @@ class NPMPackageManager(DynamicLoadPackageManager):
BLACKLISTED_PACKAGE_NAMES = []
BLACKLISTED_PACKAGE_IDS = []
BLACKLISTED_PACKAGE_VERSIONS = []


Capabilities = PackageManagerCapabilities()
Capabilities.CanRunAsAdmin = True
Capabilities.CanSkipIntegrityChecks = False
Capabilities.CanRunInteractively = False
Capabilities.CanRemoveDataOnUninstall = False
Capabilities.SupportsCustomVersions = False # TODO: add version listing
Capabilities.SupportsCustomArchitectures = False
Capabilities.SupportsCustomScopes = True

icon = None

if not os.path.exists(CACHE_FILE_PATH):
Expand Down Expand Up @@ -160,7 +169,7 @@ def getPackageDetails(self, package: Package) -> PackageDetails:
elif lineNo == 3:
details.Description = line.strip()
elif line == 4:
details.HomepageURL = line.strip()
details.HomepageURL = line.strip() # TODO: Fix homepage not showing
elif line.startswith(".tarball"):
details.InstallerURL = line.replace(".tarball: ", "").strip()
try:
Expand Down
9 changes: 9 additions & 0 deletions wingetui/PackageManagers/pip.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,15 @@ class PipPackageManager(DynamicLoadPackageManager):
BLACKLISTED_PACKAGE_IDS = ["WARNING:", "[notice]", "Package"]
BLACKLISTED_PACKAGE_VERSIONS = ["Ignoring", "invalie"]

Capabilities = PackageManagerCapabilities()
Capabilities.CanRunAsAdmin = True
Capabilities.CanSkipIntegrityChecks = False
Capabilities.CanRunInteractively = False
Capabilities.CanRemoveDataOnUninstall = False
Capabilities.SupportsCustomVersions = False # TODO: implement version listing
Capabilities.SupportsCustomArchitectures = False
Capabilities.SupportsCustomScopes = False # TODO: implement --user custom scope

icon = None

if not os.path.exists(CACHE_FILE_PATH):
Expand Down
11 changes: 9 additions & 2 deletions wingetui/PackageManagers/sampleHelper.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,15 @@ class SamplePackageManager(PackageManagerModule):
BLACKLISTED_PACKAGE_NAMES = []
BLACKLISTED_PACKAGE_IDS = []
BLACKLISTED_PACKAGE_VERSIONS = []

self = sys.modules[__name__]

Capabilities = PackageManagerCapabilities()
Capabilities.CanRunAsAdmin = True
Capabilities.CanSkipIntegrityChecks = True
Capabilities.CanRunInteractively = False
Capabilities.CanRemoveDataOnUninstall = False
Capabilities.SupportsCustomVersions = True
Capabilities.SupportsCustomArchitectures = False
Capabilities.SupportsCustomScopes = False

if not os.path.exists(CAHCE_FILE_PATH):
os.makedirs(CAHCE_FILE_PATH)
Expand Down
9 changes: 9 additions & 0 deletions wingetui/PackageManagers/scoop.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,15 @@ class ScoopPackageManager(SamplePackageManager):
BLACKLISTED_PACKAGE_NAMES = []
BLACKLISTED_PACKAGE_IDS = []
BLACKLISTED_PACKAGE_VERSIONS = []

Capabilities = PackageManagerCapabilities()
Capabilities.CanRunAsAdmin = True
Capabilities.CanSkipIntegrityChecks = True
Capabilities.CanRunInteractively = False
Capabilities.CanRemoveDataOnUninstall = True
Capabilities.SupportsCustomVersions = False
Capabilities.SupportsCustomArchitectures = True
Capabilities.SupportsCustomScopes = True

icon = None

Expand Down
10 changes: 9 additions & 1 deletion wingetui/PackageManagers/winget.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,15 @@ class WingetPackageManager(SamplePackageManager):
BLACKLISTED_PACKAGE_NAMES = [""]
BLACKLISTED_PACKAGE_IDS = [""]
BLACKLISTED_PACKAGE_VERSIONS = []


Capabilities = PackageManagerCapabilities()
Capabilities.CanRunAsAdmin = True
Capabilities.CanSkipIntegrityChecks = True
Capabilities.CanRunInteractively = True
Capabilities.CanRemoveDataOnUninstall = False
Capabilities.SupportsCustomVersions = True
Capabilities.SupportsCustomArchitectures = True
Capabilities.SupportsCustomScopes = True

wingetIcon = None
localIcon = None
Expand Down
4 changes: 4 additions & 0 deletions wingetui/storeEngine.py
Original file line number Diff line number Diff line change
Expand Up @@ -118,24 +118,28 @@ def __init__(self, package: Package, options: InstallationOptions):
self.leftSlow.setStartValue(0)
self.leftSlow.setEndValue(1000)
self.leftSlow.setDuration(700)
self.leftSlow.valueChanged.connect(self.update)
self.leftSlow.finished.connect(lambda: (self.rightSlow.start(), self.changeBarOrientation.emit()))

self.rightSlow = QPropertyAnimation(self.progressbar, b"value")
self.rightSlow.setStartValue(1000)
self.rightSlow.setEndValue(0)
self.rightSlow.setDuration(700)
self.rightSlow.valueChanged.connect(self.update)
self.rightSlow.finished.connect(lambda: (self.leftFast.start(), self.changeBarOrientation.emit()))

self.leftFast = QPropertyAnimation(self.progressbar, b"value")
self.leftFast.setStartValue(0)
self.leftFast.setEndValue(1000)
self.leftFast.setDuration(300)
self.leftFast.valueChanged.connect(self.update)
self.leftFast.finished.connect(lambda: (self.rightFast.start(), self.changeBarOrientation.emit()))

self.rightFast = QPropertyAnimation(self.progressbar, b"value")
self.rightFast.setStartValue(1000)
self.rightFast.setEndValue(0)
self.rightFast.setDuration(300)
self.rightFast.valueChanged.connect(self.update)
self.rightFast.finished.connect(lambda: (self.leftSlow.start(), self.changeBarOrientation.emit()))

self.waitThread = KillableThread(target=self.startInstallation, daemon=True)
Expand Down
65 changes: 49 additions & 16 deletions wingetui/uiSections.py
Original file line number Diff line number Diff line change
Expand Up @@ -101,10 +101,15 @@ def showContextMenu(self, pos: QPoint) -> None:
if self.packageList.currentItem().isHidden():
return
ApplyMenuBlur(self.contextMenu.winId().__int__(), self.contextMenu)
if self.ItemPackageReference[self.packageList.currentItem()].PackageManager != Scoop:
self.InteractiveAction.setVisible(True)
else:
self.InteractiveAction.setVisible(False)

try:
Capabilities: PackageManagerCapabilities = self.ItemPackageReference[self.packageList.currentItem()].PackageManager.Capabilities
self.AdminAction.setVisible(Capabilities.CanRunAsAdmin)
self.SkipHashAction.setVisible(Capabilities.CanSkipIntegrityChecks)
self.InteractiveAction.setVisible(Capabilities.CanRunInteractively)
except Exception as e:
report(e)

pos.setY(pos.y()+35)
self.contextMenu.exec(self.packageList.mapToGlobal(pos))

Expand Down Expand Up @@ -431,10 +436,15 @@ def showContextMenu(self, pos: QPoint) -> None:
return
if self.packageList.currentItem().isHidden():
return
if self.ItemPackageReference[self.packageList.currentItem()].PackageManager != Scoop:
self.InteractiveAction.setVisible(True)
else:
self.InteractiveAction.setVisible(False)

try:
Capabilities: PackageManagerCapabilities = self.ItemPackageReference[self.packageList.currentItem()].PackageManager.Capabilities
self.AdminAction.setVisible(Capabilities.CanRunAsAdmin)
self.SkipHashAction.setVisible(Capabilities.CanSkipIntegrityChecks)
self.InteractiveAction.setVisible(Capabilities.CanRunInteractively)
except Exception as e:
report(e)

pos.setY(pos.y()+35)
ApplyMenuBlur(self.contextMenu.winId().__int__(), self.contextMenu)

Expand Down Expand Up @@ -881,9 +891,14 @@ def showContextMenu(self, pos: QPoint) -> None:
return
ApplyMenuBlur(self.contextMenu.winId().__int__(), self.contextMenu)

self.RemoveDataAction.setVisible(self.ItemPackageReference[self.packageList.currentItem()].PackageManager == Scoop)
self.InteractiveAction.setVisible(self.ItemPackageReference[self.packageList.currentItem()].PackageManager != Scoop)

try:
Capabilities: PackageManagerCapabilities = self.ItemPackageReference[self.packageList.currentItem()].PackageManager.Capabilities
self.AdminAction.setVisible(Capabilities.CanRunAsAdmin)
self.RemoveDataAction.setVisible(Capabilities.CanRemoveDataOnUninstall)
self.InteractiveAction.setVisible(Capabilities.CanRunInteractively)
except Exception as e:
report(e)

if self.ItemPackageReference[self.packageList.currentItem()].Source not in ((_("Local PC"), "Microsoft Store", "Steam", "GOG", "Ubisoft Connect", _("Android Subsystem"))):
self.IgnoreUpdatesAction.setVisible(True)
self.ShareAction.setVisible(True)
Expand Down Expand Up @@ -2326,7 +2341,18 @@ def resetLayoutWidget():
for l in self.imagesCarrousel:
l.setPixmap(p, index=0)
Thread(target=self.loadPackageScreenshots, args=(package,)).start()


Capabilities = package.PackageManager.Capabilities
self.adminCheckbox.setEnabled(Capabilities.CanRunAsAdmin)
self.hashCheckBox.setEnabled(Capabilities.CanSkipIntegrityChecks)
self.interactiveCheckbox.setEnabled(Capabilities.CanRunInteractively)
self.versionCombo.setEnabled(Capabilities.SupportsCustomVersions)
self.versionLabel.setEnabled(Capabilities.SupportsCustomVersions)
self.architectureCombo.setEnabled(Capabilities.SupportsCustomArchitectures)
self.architectureLabel.setEnabled(Capabilities.SupportsCustomArchitectures)
self.scopeCombo.setEnabled(Capabilities.SupportsCustomScopes)
self.scopeLabel.setEnabled(Capabilities.SupportsCustomScopes)

self.callInMain.emit(lambda: resetLayoutWidget())
self.callInMain.emit(lambda: self.appIcon.setPixmap(QIcon(getMedia("install")).pixmap(64, 64)))
Thread(target=self.loadPackageIcon, args=(package,)).start()
Expand All @@ -2349,10 +2375,6 @@ def printData(self, details: PackageDetails) -> None:
self.loadingProgressBar.hide()
self.installButton.setEnabled(True)
self.adminCheckbox.setEnabled(True)
self.hashCheckBox.setEnabled(not self.isAnUninstall)
self.versionCombo.setEnabled(not self.isAnUninstall and not self.isAnUpdate)
self.architectureCombo.setEnabled(not self.isAnUninstall)
self.scopeCombo.setEnabled(not self.isAnUninstall)
if self.isAnUpdate:
self.installButton.setText(_("Update"))
elif self.isAnUninstall:
Expand Down Expand Up @@ -2401,6 +2423,17 @@ def printData(self, details: PackageDetails) -> None:
label.setStyleSheet(f"padding: 5px;padding-bottom: 2px;padding-top: 2px;background-color: {blueColor if isDark() else f'rgb({getColors()[0]})'}; color: black; border-radius: 10px;")
label.setFixedHeight(20)
self.tagsWidget.layout().addWidget(label)

Capabilities = package.PackageManager.Capabilities
self.adminCheckbox.setEnabled(Capabilities.CanRunAsAdmin)
self.hashCheckBox.setEnabled(Capabilities.CanSkipIntegrityChecks)
self.interactiveCheckbox.setEnabled(Capabilities.CanRunInteractively)
self.versionCombo.setEnabled(Capabilities.SupportsCustomVersions)
self.versionLabel.setEnabled(Capabilities.SupportsCustomVersions)
self.architectureCombo.setEnabled(Capabilities.SupportsCustomArchitectures)
self.architectureLabel.setEnabled(Capabilities.SupportsCustomArchitectures)
self.scopeCombo.setEnabled(Capabilities.SupportsCustomScopes)
self.scopeLabel.setEnabled(Capabilities.SupportsCustomScopes)

self.loadPackageCommandLine()

Expand Down