From 7fd9ddac6335bb48821d0c8d37850eaf72c36102 Mon Sep 17 00:00:00 2001 From: VineFeeder Date: Tue, 26 Aug 2025 10:52:24 +0100 Subject: [PATCH] initial commit --- README.md | 13 +++++++++---- .../vinefeeder/src/vinefeeder/base_loader.py | 17 ++++++----------- packages/vinefeeder/src/vinefeeder/config.yaml | 3 +-- .../vinefeeder/src/vinefeeder/requirements.txt | 9 --------- 4 files changed, 16 insertions(+), 26 deletions(-) delete mode 100644 packages/vinefeeder/src/vinefeeder/requirements.txt diff --git a/README.md b/README.md index c267de1..341d43b 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ **TwinVine** -**Beta in testing** . +**Beta** . ![TwinVine GUI](https://github.com/vinefeeder/TwinVine/blob/main/images/vinefeederA.png) @@ -27,7 +27,7 @@ uv run vinfeeder - to open the interactive GUI for search, browse, etc. Uv is the package manager and loads both VineFeeder and Envied together. Envied runs independenly or may be called by Vinefeeder. -If you do not alrealy have uv as a python package intall it first using pip +If you do not alrealy have uv as a python package install it first, using pip - ``` pip install uv @@ -36,7 +36,7 @@ or python3 -m pip install uv ``` -Then install TwinVine the following installs the latest version directly from the GitHub repository: +Then install TwinVine; the following installs the latest version directly from the GitHub repository: ```shell git clone https://github.com/vinefeeder/TwinVine.git @@ -55,7 +55,12 @@ cp packages/envied/src/envied/envied-working-example.yaml packages/envied/src/en ``` This ensures you have your own working copy of envied.yaml. It may be edited and will not be over-written during any updates. -That's it; uv run vinfeeder to get started! +That's it; uv run vinfeeder to get started! + +**Linux** + +Linux systems are known to screen freeze after envied has finished a download. +The top level vinfeeder config file at TwinVine/packages/vinefeeder/src/vinefeeder/config.yaml should have TERMINAL_RESET: True set. **Services** diff --git a/packages/vinefeeder/src/vinefeeder/base_loader.py b/packages/vinefeeder/src/vinefeeder/base_loader.py index 88ba021..e6dc8db 100644 --- a/packages/vinefeeder/src/vinefeeder/base_loader.py +++ b/packages/vinefeeder/src/vinefeeder/base_loader.py @@ -40,12 +40,11 @@ class BaseLoader: myconfig, _ = load_config_with_fallback() self.BATCH_DOWNLOAD = myconfig['BATCH_DOWNLOAD'] - #self.DOWNLOAD_ORCHESTRATOR = myconfig['DOWNLOAD_ORCHESTRATOR'] self.TERMINAL_RESET = myconfig['TERMINAL_RESET'] - + def reset_terminal(self): - if self.DOWNLOAD_ORCHESTRATOR == "envied" and not self.BATCH_DOWNLOAD: + if not self.BATCH_DOWNLOAD: if os.name == 'nt': # Windows os.system('cls') # Optionally, reinitialize ANSI or console buffer here if needed @@ -406,16 +405,12 @@ class BaseLoader: def clean_terminal(self): # clear for next use time.sleep(1) + if self.TERMINAL_RESET: + console.print(f"[{catppuccin_mocha['text2']}]Preparing to reset Terminal[/]") + time.sleep(5) self.reset_terminal() - '''if os.name == "posix": - # os.system('clear') - print("Ready!") - return - else: - reset_terminal() - print("Ready!") - return''' + console.print(f"[{catppuccin_mocha['pink']}]Ready![/]") def runsubprocess(self, command): diff --git a/packages/vinefeeder/src/vinefeeder/config.yaml b/packages/vinefeeder/src/vinefeeder/config.yaml index 1324023..cc8d449 100644 --- a/packages/vinefeeder/src/vinefeeder/config.yaml +++ b/packages/vinefeeder/src/vinefeeder/config.yaml @@ -1,6 +1,5 @@ BATCH_DOWNLOAD: False -DOWNLOAD_ORCHESTRATOR: envied # Set to True if up/down cursor arrows stop working in the -# Terminal window after unschackle has downloaded. +# Terminal window after envied has downloaded. TERMINAL_RESET: False diff --git a/packages/vinefeeder/src/vinefeeder/requirements.txt b/packages/vinefeeder/src/vinefeeder/requirements.txt deleted file mode 100644 index b7d43bd..0000000 --- a/packages/vinefeeder/src/vinefeeder/requirements.txt +++ /dev/null @@ -1,9 +0,0 @@ -beaupy -click -httpx -jmespath -PyQt6 -PyQt6_sip -PyYAML -rich -Scrapy