reorganize project directories

.github/workflows/pytest.yml

@@ -5,12 +5,14 @@ on:
     branches:
       - main
     paths:
-      - cli/**
+      - ytmusic_deleter/**
+      - tests/**
   pull_request:
     branches:
       - main
     paths:
-      - cli/**
+      - ytmusic_deleter/**
+      - tests/**
   workflow_dispatch:
   schedule:
     - cron: '0 10 * * *'
@@ -30,18 +32,18 @@ jobs:
       uses: jsdaniell/[email protected]
       with:
         name: "oauth.json"
-        dir: "cli/tests/resources"
+        dir: "tests/resources"
         json: ${{ secrets.OAUTH_JSON }}
     - name: Install dependencies
-      run: pdm install -dG test,pytest
+      run: pdm install -dG test
     - name: Generate coverage report
       env:
         HEADERS_AUTH: ${{ secrets.BROWSER_JSON }}
         TEST_CFG: ${{ secrets.TEST_CFG }}
       run: |
-        curl -o cli/tests/resources/test.mp3 https://www.kozco.com/tech/piano2-CoolEdit.mp3
-        cat <<< "$HEADERS_AUTH" > cli/tests/resources/browser.json
-        cat <<< "$TEST_CFG" > cli/tests/resources/test.cfg
+        curl -o tests/resources/test.mp3 https://www.kozco.com/tech/piano2-CoolEdit.mp3
+        cat <<< "$HEADERS_AUTH" > tests/resources/browser.json
+        cat <<< "$TEST_CFG" > tests/resources/test.cfg
         (echo "===== tests attempt: 1 ====" && pdm run pytest) || \
         (echo "===== tests attempt: 2 ====" && pdm run pytest)
         pdm run coverage xml

.gitignore

@@ -21,6 +21,7 @@ __pycache__/
 .Python
 develop-eggs/
 dist/
+/build/
 downloads/
 eggs/
 .eggs/
@@ -144,4 +145,4 @@ cython_debug/
 
 .vscode
 .pdm-python
-.pdm-build/
+.pdm-build/

.pre-commit-config.yaml

@@ -1,4 +1,4 @@
-exclude: ^app/src/main/python/generated/
+exclude: ^gui/src/main/python/generated/
 repos:
   - repo: https://github.com/asottile/pyupgrade
     rev: v3.15.1

bump_versions.sh

@@ -14,7 +14,7 @@ fi
 # Array of files with version numbers
 files=(
   "pyproject.toml"
-  "app/src/build/settings/base.json"
+  "gui/src/build/settings/base.json"
 )
 
 # Function to bump version

fbs.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
-# Change directory to the app package
-cd "$PDM_PROJECT_ROOT/app" || exit 1
+# Change directory to the gui package
+cd "$PDM_PROJECT_ROOT/gui" || exit 1
 
 # Forward all arguments passed to the script (after the script name)
 # to the fbs command

app/src/freeze/linux/_internal/ytmusicapi/locales/README.rst → gui/src/freeze/linux/_internal/ytmusicapi/locales/README.rst

@@ -37,4 +37,4 @@ Finalize translation
 ---------------------
 To generate mo files, run
 
-``cd locales && sh update_mo.sh``
+``cd locales && sh update_mo.sh``

app/src/freeze/windows/_internal/ytmusicapi/locales/update_mo.sh → gui/src/freeze/linux/_internal/ytmusicapi/locales/update_mo.sh

@@ -5,4 +5,4 @@ do
   then
     msgfmt -o ${dir}/LC_MESSAGES/base.mo ${dir}/LC_MESSAGES/base
   fi
-done
+done

app/src/freeze/linux/_internal/ytmusicapi/locales/update_po.sh → gui/src/freeze/linux/_internal/ytmusicapi/locales/update_po.sh

@@ -5,4 +5,4 @@ do
   then
     msgmerge --update ${dir}/LC_MESSAGES/base.po base.pot --no-fuzzy-matching
   fi
-done
+done

app/src/freeze/windows/_internal/ytmusicapi/locales/README.rst → gui/src/freeze/windows/_internal/ytmusicapi/locales/README.rst

@@ -37,4 +37,4 @@ Finalize translation
 ---------------------
 To generate mo files, run
 
-``cd locales && sh update_mo.sh``
+``cd locales && sh update_mo.sh``

app/src/freeze/linux/_internal/ytmusicapi/locales/update_mo.sh → gui/src/freeze/windows/_internal/ytmusicapi/locales/update_mo.sh

@@ -5,4 +5,4 @@ do
   then
     msgfmt -o ${dir}/LC_MESSAGES/base.mo ${dir}/LC_MESSAGES/base
   fi
-done
+done

app/src/freeze/windows/_internal/ytmusicapi/locales/update_po.sh → gui/src/freeze/windows/_internal/ytmusicapi/locales/update_po.sh

@@ -5,4 +5,4 @@ do
   then
     msgmerge --update ${dir}/LC_MESSAGES/base.po base.pot --no-fuzzy-matching
   fi
-done
+done

app/src/main/icons/README.md → gui/src/main/icons/README.md

@@ -8,4 +8,4 @@ they contain a ~5% transparent margin. This is because otherwise they look too
 big (eg. in the Dock or in the app switcher).
 
 You can create Icon.ico from the .png files with
-[an online tool](http://icoconvert.com/Multi_Image_to_one_icon/).
+[an online tool](http://icoconvert.com/Multi_Image_to_one_icon/).