robojerk/flatpost
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix issue with mismatch of app.id when installing/removing apps

Browse source
This commit is contained in:
GloriousEggroll 2025-04-17 00:28:01 -06:00
parent cbc0fb0353
commit fb073a5eae
1 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/fp_turbo.py
View file

@ -891,7 +891,7 @@ def install_flatpak(app: AppStreamPackage, repo_name=None, system=False) -> tupl
available_apps = installation.list_remote_refs_sync(repo_name) available_apps = installation.list_remote_refs_sync(repo_name)
match_found = None match_found = None
for available_app in available_apps: for available_app in available_apps:
if app.id == available_app.get_name(): if available_app.get_name() in app.id:
match_found = 1 match_found = 1
# Add the install operation # Add the install operation
transaction.add_install(repo_name, available_app.format_ref(), None) transaction.add_install(repo_name, available_app.format_ref(), None)
@ -959,8 +959,9 @@ def remove_flatpak(app: AppStreamPackage, system=False) -> tuple[bool, str]:
transaction = Flatpak.Transaction.new_for_installation(installation) transaction = Flatpak.Transaction.new_for_installation(installation)
match_found = None match_found = None
for installed_ref in installed: for installed_ref in installed:
if app.id in installed_ref.get_name(): if installed_ref.get_name() in app.id:
match_found = 1 match_found = 1
# Add the install operation
transaction.add_uninstall(installed_ref.format_ref()) transaction.add_uninstall(installed_ref.format_ref())
if not match_found: if not match_found:
@ -990,10 +991,12 @@ def update_flatpak(app: AppStreamPackage, system=False) -> tuple[bool, str]:
transaction = Flatpak.Transaction.new_for_installation(installation) transaction = Flatpak.Transaction.new_for_installation(installation)
match_found = None match_found = None
for update in updates: for update in updates:
if app.id == update.get_name(): if update.get_name() in app.id:
match_found = 1 match_found = 1
# Add the install operation
transaction.add_update(update.format_ref()) transaction.add_update(update.format_ref())
if not match_found: if not match_found:
return False, f"No updateable package named {app.id} found." return False, f"No updateable package named {app.id} found."
# Run the transaction # Run the transaction
@ -1128,6 +1131,11 @@ def repoadd(repofile, system=False):
if title.casefold() in existing_titles: if title.casefold() in existing_titles:
return False, "A repository with this title already exists." return False, "A repository with this title already exists."
if title == "flathub":
title = "Flatpak Official Flathub"
if title == "flathub-beta":
title = "Flatpak Official Flathub (Beta)"
# Read the repository file # Read the repository file
try: try:
with open(repofile, 'rb') as f: with open(repofile, 'rb') as f: