diff --git a/.gitignore b/.gitignore index fc04db3e..71e75b3c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,226 @@ +# Byte-compiled / optimized / DLL files +__pycache__/ +*.py[codz] +*$py.class + +# C extensions +*.so + +# Distribution / packaging +.Python +build/ +develop-eggs/ +dist/ +downloads/ +eggs/ +.eggs/ +lib/ +lib64/ +parts/ +sdist/ +var/ +wheels/ +share/python-wheels/ +*.egg-info/ +.installed.cfg +*.egg +MANIFEST + +# PyInstaller +# Usually these files are written by a python script from a template +# before PyInstaller builds the exe, so as to inject date/other infos into it. +*.manifest +*.spec + +# Installer logs +pip-log.txt +pip-delete-this-directory.txt + +# Unit test / coverage reports +htmlcov/ +.tox/ +.nox/ +.coverage +.coverage.* +.cache +nosetests.xml +coverage.xml +*.cover +*.py.cover +*.lcov +.hypothesis/ +.pytest_cache/ +cover/ + +# Translations +*.mo +*.pot + +# Django stuff: +*.log +local_settings.py +db.sqlite3 +db.sqlite3-journal + +# Flask stuff: +instance/ +.webassets-cache + +# Scrapy stuff: +.scrapy + +# Sphinx documentation +docs/_build/ + +# PyBuilder +.pybuilder/ +target/ + +# Jupyter Notebook +.ipynb_checkpoints + +# IPython +profile_default/ +ipython_config.py + +# pyenv +# For a library or package, you might want to ignore these files since the code is +# intended to run in multiple environments; otherwise, check them in: +# .python-version + +# pipenv +# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control. +# However, in case of collaboration, if having platform-specific dependencies or dependencies +# having no cross-platform support, pipenv may install dependencies that don't work, or not +# install all needed dependencies. +# Pipfile.lock + +# UV +# Similar to Pipfile.lock, it is generally recommended to include uv.lock in version control. +# This is especially recommended for binary packages to ensure reproducibility, and is more +# commonly ignored for libraries. +# uv.lock + +# poetry +# Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control. +# This is especially recommended for binary packages to ensure reproducibility, and is more +# commonly ignored for libraries. +# https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control +# poetry.lock +# poetry.toml + +# pdm +# Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control. +# pdm recommends including project-wide configuration in pdm.toml, but excluding .pdm-python. +# https://pdm-project.org/en/latest/usage/project/#working-with-version-control +# pdm.lock +# pdm.toml +.pdm-python +.pdm-build/ + +# pixi +# Similar to Pipfile.lock, it is generally recommended to include pixi.lock in version control. +# pixi.lock +# Pixi creates a virtual environment in the .pixi directory, just like venv module creates one +# in the .venv directory. It is recommended not to include this directory in version control. +.pixi/* +!.pixi/config.toml + +# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm +__pypackages__/ + +# Celery stuff +celerybeat-schedule* +celerybeat.pid + +# Redis +*.rdb +*.aof +*.pid + +# RabbitMQ +mnesia/ +rabbitmq/ +rabbitmq-data/ + +# ActiveMQ +activemq-data/ + +# SageMath parsed files +*.sage.py + +# Environments +.env +.envrc +.venv +env/ +venv/ +ENV/ +env.bak/ +venv.bak/ + +# Spyder project settings +.spyderproject +.spyproject + +# Rope project settings +.ropeproject + +# mkdocs documentation +/site + +# mypy +.mypy_cache/ +.dmypy.json +dmypy.json + +# Pyre type checker +.pyre/ + +# pytype static type analyzer +.pytype/ + +# Cython debug symbols +cython_debug/ + +# PyCharm +# JetBrains specific template is maintained in a separate JetBrains.gitignore that can +# be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore +# and can be added to the global gitignore or merged into this file. For a more nuclear +# option (not recommended) you can uncomment the following to ignore the entire idea folder. +# .idea/ + +# Abstra +# Abstra is an AI-powered process automation framework. +# Ignore directories containing user credentials, local state, and settings. +# Learn more at https://abstra.io/docs +.abstra/ + +# Visual Studio Code +# Visual Studio Code specific template is maintained in a separate VisualStudioCode.gitignore +# that can be found at https://github.com/github/gitignore/blob/main/Global/VisualStudioCode.gitignore +# and can be added to the global gitignore or merged into this file. However, if you prefer, +# you could uncomment the following to ignore the entire vscode folder +# .vscode/ +# Temporary file for partial code execution +tempCodeRunnerFile.py + +# Ruff stuff: +.ruff_cache/ + +# PyPI configuration file +.pypirc + +# Marimo +marimo/_static/ +marimo/_lsp/ +__marimo__/ + +# Streamlit +.streamlit/secrets.toml + + + /subprojects/blueprint-compiler .DS_Store .flatpak diff --git a/src/host_info.py b/src/host_info.py index a5b8611d..55ed2311 100644 --- a/src/host_info.py +++ b/src/host_info.py @@ -49,7 +49,7 @@ def on_done(*arg): def trash_data(self, callback=None): try: - subprocess.run(["gio", "trash", self.data_path], capture_output=True, text=True, check=True) + subprocess.run(["flatpak-spawn", "--host", "gio", "trash", self.data_path], capture_output=True, text=True, check=True) except subprocess.CalledProcessError as cpe: raise cpe except Exception as e: diff --git a/src/packages_page/packages_page.py b/src/packages_page/packages_page.py index 2dac202e..db16e20e 100644 --- a/src/packages_page/packages_page.py +++ b/src/packages_page/packages_page.py @@ -301,7 +301,7 @@ def thread(*args): if should_trash and len(to_trash) > 0: try: - subprocess.run(["gio", "trash"] + to_trash, check=True, text=True, capture_output=True) + subprocess.run(["flatpak-spawn", "--host", "gio", "trash"] + to_trash, check=True, text=True, capture_output=True) except subprocess.CalledProcessError as cpe: error.append(cpe) diff --git a/src/snapshot_page/snapshot_box.py b/src/snapshot_page/snapshot_box.py index 1c27adef..a07eb8ff 100644 --- a/src/snapshot_page/snapshot_box.py +++ b/src/snapshot_page/snapshot_box.py @@ -91,7 +91,7 @@ def on_trash(self, button): def thread(*args): try: - subprocess.run(["gio", "trash", path], capture_output=True, text=True, check=True) + subprocess.run(["flatpak-spawn", "--host", "gio", "trash", path], capture_output=True, text=True, check=True) except subprocess.CalledProcessError as cpe: error[0] = cpe.stderr except Exception as e: diff --git a/src/snapshot_page/snapshot_page.py b/src/snapshot_page/snapshot_page.py index e292c15d..f6229bff 100644 --- a/src/snapshot_page/snapshot_page.py +++ b/src/snapshot_page/snapshot_page.py @@ -129,7 +129,7 @@ def sort_snapshots(self, *args): for folder in bad_folders: try: - subprocess.run(["gio", "trash", f"{HostInfo.snapshots_path}{folder}"]) + subprocess.run(["flatpak-spawn", "--host", "gio", "trash", f"{HostInfo.snapshots_path}{folder}"]) except Exception: pass @@ -510,7 +510,7 @@ def on_response(dialog, response): to_trash.append(f"{HostInfo.snapshots_path}{row.folder}") try: - subprocess.run(["gio", "trash"] + to_trash, check=True, text=True, capture_output=True) + subprocess.run(["flatpak-spawn", "--host", "gio", "trash"] + to_trash, check=True, text=True, capture_output=True) self.start_loading() self.end_loading() self.toast_overlay.add_toast(Adw.Toast(title=_("Trashed snapshots"))) diff --git a/src/snapshot_page/tar_worker.py b/src/snapshot_page/tar_worker.py index ef26225e..f8b25107 100644 --- a/src/snapshot_page/tar_worker.py +++ b/src/snapshot_page/tar_worker.py @@ -42,7 +42,7 @@ def extract_thread(self, *args): try: if os.path.exists(self.new_path): subprocess.run( - ["gio", "trash", self.new_path], capture_output=True, check=True + ["flatpak-spawn", "--host", "gio", "trash", self.new_path], capture_output=True, check=True ) # trash the current user data, because new data will go in its place os.makedirs(self.new_path) # create the new user data path @@ -72,7 +72,7 @@ def do_cancel(self, error_str): self.process.wait() if len(self.files_to_trash_on_cancel) > 0: try: - subprocess.run(["gio", "trash"] + self.files_to_trash_on_cancel, capture_output=True, check=True) + subprocess.run(["flatpak-spawn", "--host", "gio", "trash"] + self.files_to_trash_on_cancel, capture_output=True, check=True) except Exception: pass diff --git a/src/user_data_page/data_box.py b/src/user_data_page/data_box.py index f64b1ab7..335f9031 100644 --- a/src/user_data_page/data_box.py +++ b/src/user_data_page/data_box.py @@ -83,7 +83,7 @@ def trash_handler(self, *args): def thread(*args): try: - subprocess.run(["gio", "trash", self.data_path], check=True, text=True, capture_output=True) + subprocess.run(["flatpak-spawn", "--host", "gio", "trash", self.data_path], check=True, text=True, capture_output=True) properties_page = HostInfo.main_window.pages[HostInfo.main_window.packages_row].properties_page properties_package = properties_page.package if not properties_package is None: diff --git a/src/user_data_page/user_data_page.py b/src/user_data_page/user_data_page.py index 345c2054..a44c132c 100644 --- a/src/user_data_page/user_data_page.py +++ b/src/user_data_page/user_data_page.py @@ -162,7 +162,7 @@ def selection_trash_handler(self, *args): child = self.stack.get_visible_child() def thread(path): - cmd = ["gio", "trash"] + path + cmd = ["flatpak-spawn", "--host", "gio", "trash"] + path try: subprocess.run(cmd, check=True, capture_output=True, text=True) properties_page = HostInfo.main_window.pages[HostInfo.main_window.packages_row].properties_page