Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Better PackageItem Classes #1462

Merged
merged 15 commits into from
Oct 7, 2023
Merged

Better PackageItem Classes #1462

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
bb08d0a
Fix scoop hash check skip not working (fix #1445 )
marticliment Oct 5, 2023
df9d135
Merge branch 'main' of https://github.com/marticliment/WingetUI
marticliment Oct 5, 2023
6cb10fd
remove deprecated function, add a new icon cacher
marticliment Oct 7, 2023
0c42478
Add more functions to Package class
marticliment Oct 7, 2023
6b1b48e
Added *PackageItem classes
marticliment Oct 7, 2023
ddfed0e
remove redundant code simplified by new classes
marticliment Oct 7, 2023
31c3f29
restore original checkbox behaviour
marticliment Oct 7, 2023
a80d7c5
Upgraded packages will have its icon updated on the Discover Packages…
marticliment Oct 7, 2023
b4a8ddc
fix updatePackageNumber not working as expected (fix #1420)
marticliment Oct 7, 2023
c2dfff2
Update PackageClasses.py
marticliment Oct 7, 2023
77adde0
optimize functions to not do useless research
marticliment Oct 7, 2023
53ff3ac
optimize package find functions
marticliment Oct 7, 2023
f2cbf83
Use class attributes instead of functions to access data (optimized a…
marticliment Oct 7, 2023
e6193f6
Update SpecificWidgets.py
marticliment Oct 7, 2023
b45291a
Merge branch 'main' into Better-PackageItem-API
marticliment Oct 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
70 changes: 23 additions & 47 deletions wingetui/Interface/CustomWidgets/InstallerWidgets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ def finish(self, returncode: int, output: str = "") -> None:
self.liveOutputButton.setText(_("Restart your PC to finish installation"))
globals.tray_is_needs_restart = True
update_tray_icon()
if type(self) == PackageInstallerWidget:
if type(self) is PackageInstallerWidget:
self.Package.PackageItem.setCheckState(0, Qt.CheckState.Unchecked)
self.Package.PackageItem.setIcon(1, getMaskedIcon("installed_masked"))
self.Package.PackageItem.setToolTip(1, _("This package is already installed") + " - " + self.Package.Name)
Expand Down Expand Up @@ -473,21 +473,19 @@ def finish(self, returncode: int, output: str = "") -> None:
self.progressbar.setValue(1000)
if self.progressbar.invertedAppearance():
self.progressbar.setInvertedAppearance(False)
if self.Package.Version in (_("Unknown"), "Unknown"):
IgnorePackageUpdates_SpecificVersion(self.Package.Id, self.Package.NewVersion, self.Package.Source)
if returncode == RETURNCODE_NO_APPLICABLE_UPDATE_FOUND and not self.canceled:
IgnorePackageUpdates_SpecificVersion(self.Package.Id, self.Package.NewVersion, self.Package.Source)

if self.Package.Version in (_("Unknown"), "Unknown") or (returncode == RETURNCODE_NO_APPLICABLE_UPDATE_FOUND and not self.canceled):
self.Package.ignoreUpdatesForVersion()

if returncode in LIST_RETURNCODES_OPERATION_SUCCEEDED and not self.canceled:
UPDATES_SECTION: SoftwareSection = globals.updates
try:
self.Package.PackageItem.setHidden(True)
self.Package.PackageItem.treeWidget().takeTopLevelItem(self.Package.PackageItem.treeWidget().indexOfTopLevelItem(self.Package.PackageItem))
UPDATES_SECTION.packageItems.remove(self.Package.PackageItem)
if self.Package.PackageItem in UPDATES_SECTION.showableItems:
UPDATES_SECTION.showableItems.remove(self.Package.PackageItem)
except Exception as e:
report(e)
UPDATES_SECTION.updatePackageNumber()
self.Package.PackageItem.removeFromList()
InstalledItem = self.Package.PackageItem.getInstalledPackageItem()
if InstalledItem:
InstalledItem.setTag(InstalledItem.Tag.Default)
AvailablePackage = self.Package.PackageItem.getDiscoverPackageItem()
if AvailablePackage:
AvailablePackage.setTag(InstalledItem.Tag.Installed)

super().finish(returncode, output)

def close(self):
Expand Down Expand Up @@ -590,38 +588,16 @@ def finish(self, returncode: int, output: str = "") -> None:
if self.progressbar.invertedAppearance():
self.progressbar.setInvertedAppearance(False)
if returncode in LIST_RETURNCODES_OPERATION_SUCCEEDED and not self.canceled:
UPDATES_SECTION: SoftwareSection = globals.updates
UNINSTALL_SECTION: SoftwareSection = globals.uninstall
try:
print(self.Package.PackageItem, UNINSTALL_SECTION.packageList.indexOfTopLevelItem(self.Package.PackageItem))
self.Package.PackageItem.setHidden(True)
i = UNINSTALL_SECTION.packageList.takeTopLevelItem(UNINSTALL_SECTION.packageList.indexOfTopLevelItem(self.Package.PackageItem))
UNINSTALL_SECTION.packageItems.remove(self.Package.PackageItem)
if self.Package.PackageItem in UNINSTALL_SECTION.showableItems:
UNINSTALL_SECTION.showableItems.remove(self.Package.PackageItem)
del i
DISCOVER = globals.discover
if self.Package.Id in DISCOVER.IdPackageReference.keys():
discoverablePackage: UpgradablePackage = DISCOVER.IdPackageReference[self.Package.Id]
discoverableItem = discoverablePackage.PackageItem
if discoverableItem in DISCOVER.packageItems:
discoverableItem.setIcon(1, DISCOVER.installIcon)
discoverableItem.setToolTip(1, self.Package.Name)
except Exception as e:
report(e)
UNINSTALL_SECTION.updatePackageNumber()
if self.Package.Id in UPDATES_SECTION.IdPackageReference:
packageItem = UPDATES_SECTION.PackageItemReference[UPDATES_SECTION.IdPackageReference[self.Package.Id]]
packageItem.setHidden(True)
i = UPDATES_SECTION.packageList.takeTopLevelItem(UPDATES_SECTION.packageList.indexOfTopLevelItem(packageItem))
try:
UPDATES_SECTION.packageItems.remove(packageItem)
if i in UPDATES_SECTION.showableItems:
UPDATES_SECTION.showableItems.remove(packageItem)
del i
except Exception as e:
report(e)
UPDATES_SECTION.updatePackageNumber()

self.Package.PackageItem.removeFromList()
AvailableItem = self.Package.PackageItem.getDiscoverPackageItem()
if AvailableItem:
AvailableItem.setTag(AvailableItem.Tag.Default)

UpgradableItem = self.Package.PackageItem.getUpdatesPackageItem()
if UpgradableItem:
UpgradableItem.removeFromList()

self.finishedInstallation = True
self.cancelButton.setEnabled(True)
removeProgram(self.installId)
Expand Down