Skip to content

refactor _get_best_save_path #55

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

Merged
mtwebster merged 1 commit into from
Mar 21, 2023
Merged

refactor _get_best_save_path #55

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 6 additions & 9 deletions usr/lib/python3/dist-packages/mintcommon/installer/cache.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
from ._flatpak import FlatpakRemoteInfo
from .pkgInfo import FlatpakPkgInfo, AptPkgInfo
from .misc import print_timing, debug, warn
from typing import Optional

SYS_CACHE_PATH = "/var/cache/mintinstall/pkginfo.json"
USER_CACHE_PATH = os.path.join(GLib.get_user_cache_dir(), "mintinstall", "pkginfo.json")
Expand Down Expand Up @@ -208,27 +209,23 @@ def _load_cache(self):

return cache, sections, flatpak_remote_infos

def _get_best_save_path(self):
def _get_best_save_path(self) -> Optional[Path]:
if self.custom_cache_path is not None:
return self.custom_cache_path

best_path = None
return self.custom_cache_path

# Prefer the system location, as all users can access it
try:
path = Path(SYS_CACHE_PATH)
path.parent.mkdir(parents=True, exist_ok=True)
path.touch(exist_ok=True)
return path
except PermissionError:
try:
path = Path(USER_CACHE_PATH)
path.parent.mkdir(parents=True, exist_ok=True)
return path
except Exception:
path = None
finally:
best_path = path

return best_path
return None

def _save_cache(self, to_be_json):
path = self._get_best_save_path()
Expand Down