buildtool migration

Author: IDNatte

.github/dependabot.yml

@@ -6,11 +6,11 @@
 version: 2
 updates:
   - package-ecosystem: "npm" # See documentation for possible values
-    directory: "/" # Location of package manifests
+    directory: "/nyanga" # Location of package manifests
     schedule:
       interval: "weekly"
 
   - package-ecosystem: "pip"
-    directory: "/scripts/requirements" # Location of package manifests
+    directory: "/" # Location of package manifests
     schedule:
       interval: "weekly"

.github/workflows/build.yml

@@ -2,7 +2,7 @@ name: Build
 on:
   push:
     tags:
-      - 'v*'
+      - "v*"
 
 jobs:
   createrelease:
@@ -36,16 +36,22 @@ jobs:
         include:
           - os: ubuntu-latest
             TARGET: ubuntu
+            # CMD_BUILD: |
+            #   yarn install
+            #   yarn run svelte:build
+            #   python3 -m venv .venv --upgrade-deps
+            #   source .venv/bin/activate
+            #   mkdir -p log
+            #   touch log/app.log
+            #   python -m pip install --upgrade pip
+            #   pip install -r scripts/requirements/requirements-linux.txt
+            #   pyinstaller --noconfirm --distpath nyanga scripts/specfile/Nyanga-Read-linux.spec
             CMD_BUILD: |
-              yarn install
-              yarn run svelte:build
-              python3 -m venv .venv --upgrade-deps
-              source .venv/bin/activate
+              poetry install --with dev
+              poetry run build_ui
               mkdir -p log
               touch log/app.log
-              python -m pip install --upgrade pip
-              pip install -r scripts/requirements/requirements-linux.txt
-              pyinstaller --noconfirm --distpath nyanga scripts/specfile/Nyanga-Read-linux.spec
+              poetry run build_linux
             OUT_FILE_NAME: Nyanga-Read-bin
             ASSET_MIME: application/octet-stream
           # - os: windows-latest
@@ -75,6 +81,8 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y curl libgirepository1.0-dev gcc libcairo2-dev pkg-config python3-dev gir1.2-gtk-4.0 nodejs python3-venv glib-networking
           curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.38.0/install.sh | bash
+          curl -sSL https://install.python-poetry.org | python3 -
+          export PATH="$PATH:$HOME/.local/bin"
           export NVM_DIR="$HOME/.nvm"
           source "$NVM_DIR/nvm.sh"
           nvm install 18.19.0

.gitignore

@@ -1,21 +1,3 @@
-.DS_Store
-node_modules
-/build
-/.svelte-kit
-/package
-.env
-.env.*
-!.env.example
-.vercel
-.output
-vite.config.js.timestamp-*
-vite.config.ts.timestamp-*
-
-
-# yarn
-.yarn
-
-
 # python
 __pycache__
 .build
@@ -26,7 +8,7 @@ build
 layout
 *.log
 
-nyanga*
+nyanga/__pycache__
 
 *test*
 

.yarnrc.yml

@@ -32,87 +32,113 @@ Manga Reader for desktop powered by sveltekit, mangadex, and pywebview.
 - ✅ Transalated manga based on what language you choose
 - ✅ Local bookmark save
 <p align="center">
-  <img src="./docs/images/main.png" />
+  <img src="./nyanga/docs/images/main.png" />
 </p>
 <p align="center"><i>Main Page preview</i></p>
 
 <p align="center">
-  <img src="./docs/images/my-bookmarks.png" />
+  <img src="./nyanga/docs/images/my-bookmarks.png" />
 </p>
 <p align="center"><i>bookmark list and local bookmark support</i></p>
 
 <p align="center">
-  <img src="./docs/images/my-bookmark-page.png" />
+  <img src="./nyanga/docs/images/my-bookmark-page.png" />
 </p>
 <p align="center"><i>bookmark page lists</i></p>
 
 <p align="center">
-  <img src="./docs/images/search-page.png" />
+  <img src="./nyanga/docs/images/search-page.png" />
 </p>
 <p align="center"><i>search page</i></p>
 
 <p align="center">
-  <img src="./docs/images/daily-page.png" />
+  <img src="./nyanga/docs/images/daily-page.png" />
 </p>
 <p align="center"><i>list all of random daily page</i></p>
 
 <p align="center">
-  <img src="./docs/images/detail-page.png" />
+  <img src="./nyanga/docs/images/detail-page.png" />
 </p>
 <p align="center"><i>volume and chapter selection</i></p>
 
 <p align="center">
-  <img src="./docs/images/read-image.png" />
+  <img src="./nyanga/docs/images/read-image.png" />
 </p>
 <p align="center"><i>Full HD image quality provided by <a href="https://mangadex.org">mangadex</a></i></p>
 
 <p align="center">
-  <img src="./docs/images/settings.png" />
+  <img src="./nyanga/docs/images/settings.png" />
 </p>
 <p align="center"><i>demographic and language selection</i></p>
 
 ## Help me transalating application
 
-test
 currently this application available only in 2 language, _english_ and _Bahasa Indonesia_, if you feel you can help me transalating this application by transalating you can follow step below
 
-- Before you transalating application please check available manga transalated language from [mangadex source](https://api.mangadex.org/docs/static-data/)
-- Fork this repo
+Before you transalating application please check available manga transalated language from [mangadex source](https://api.mangadex.org/docs/static-data/)
+
+## Developing new features / adding transalation
+
 - requirements and installation
 
-  - requirements :
+  - Requirements
     - node version `18.12.1` or higher (need to be compatilbe with yarn version 3.2.1) or equivalent version
-    - yarn version `3.3.1` or equivalent package manager tools,
-    - python 3.8 or newer (needed for windowing system)
+    - yarn version `4.2.2` or equivalent package manager tools,
+    - python `3.11.2` or newer (needed for windowing system)
+    - poetry `1.8.3` or newer for build tool
   - setting up development
 
-    - python
+    - Python environment
 
-      - inside root folder create python virtual environment with typing `python3 -m venv .venv --upgrade-deps`
-      - use the newly created python virtual env by running `source ./venv/bin/activate` if you using linux, or `.\.venv\Script\Activate.ps1` if you using windows
-      - then install the required package by running `pip install -r requirements-(win / linux).txt`
+      - make sure you already installing python poetry (used for package management in python, although i'm still not sure if pyinstaller still bundling pyinstaller in binary, it is still convenient for automating build in github workflow.) refer to [this](https://python-poetry.org/docs/#installing-with-the-official-installer) page how to set up your python with poetry.
+      - install package by using poetry with `poetry install --with dev`
 
-    - node environment
+    - Node environment
 
       - run `yarn install` from root folder
       - yarn run `svelte:dev`
+      - **Optional** if you have already run `poetry install --with dev` and have yarnpkg installed, then you can install ui dependencies with running command `poetry run install_ui_dep`
+
+    - Testing
+
+      - **Testing flag / Environment variable**
+
+        in building / editing / testing you maybe want to know some env. variable flag that used during testing UI, and preview or used by python system itself. below is the env. variable flag this application needed
+
+        - **`APP_ENV=dev`** used for testing when developing UI, adding new features, and if you generally want to modify UI without losing it autoreload from nodejs.
+        - **`APP_ENV=preview`** usually used for previewing any UI that have been build. or in case you need to supply front-end some [pywebview token](https://pywebview.flowrl.com/guide/api.html#webview-token)
+
+      - UI development
+
+        - open up new terminal, then run command `poetry run start_ui`
+        - in another terminal you need to use flag / env. variable `APP_ENV=dev`
+        - then run command `poetry run dev`.
 
-    - testing
+      - Window / Ipc testing
 
-      - UI Testing
+        for testing window / ipc testing you need to build your UI because some component such as storage in the ipc end-point is protected by pywebview token for security.
 
-        - first you need to start the UI server with command `yarn run svelte:dev`
-        - then run `yarn run python:(win / linux):ui:dev`
+        in this step stdout is redirected to `(root folder)/nyanga/log/app.log` file to keep your stdout in terminal clean, some exception is still can escape to stdout in terminal, so when you have any issue when developing feature that related to windowing, ipc, and storage you want keep your eyes in this file.
 
-      - window and ipc testing
+        below is the step to how do you build your UI first, then running the ipc / window testing step.
 
-        - first you need to start the UI server with command `yarn run svelte:dev`
-        - then run `yarn run python:(win /linux):start` to test your ipc or window changes
+        - build your ui by using poetry
 
-      - building
-        - first run the UI build command `yarn run svelte:build`
-        - then run in new console start your's python virtual environment
-        - then run `pyinstaller --noconfirm ./Nyanga-read-(windows / linux).spec`
+          - in root folder you can typing `poetry run build_ui`, this is automatically installing your front-end dependencies if it not available, and then build your UI front-end.
+
+        - build your ui without using poetry (using yarn, or any node package manager that you already have).
+
+          - if not you need to install development dependencies first by running command `yarn install` inside folder `(root folder)/nyanga`.
+          - then you can run command `yarn run svelte:build`.
+
+        - for testing your code in testing / preview mode you can run `export APP_ENV=preview` then run command `poetry run dev` again.
+
+      - Building locally
+
+        for building this project locally (altought i'm not recommending it because it will make the binary file size fat, and don't know why), you can follow step bellow.
+
+        - in root folder, build your UI first by running `poetry run buld_ui`.
+        - then you can run `poetry build_(linux / window)` for building in your os.
 
   - Transalating
 
@@ -124,6 +150,10 @@ currently this application available only in 2 language, _english_ and _Bahasa I
 
   - Submit your transalation by sending me _gitlab pull request_, i'll review it before merging it to main branch.
 
+## Supported OS
+
+from version 3.0.4 to 3.0.10, currently still being build for linux specifically for debian based distro. for version 3.15.0 build tools and workflow will be able to build for windows again, because i didn't feel like i want to configuring buildtools and the gh-workflow.
+
 ## Note
 
 this application not including _manhua_ or _manhwa_ by default because i just want to read some JP manga, but you can request to add it to application, and i did not include tag _Boys Love_ because i mean come on 😕, and no i will not add this tag to application.

README.md

@@ -11,3 +11,7 @@ node_modules
 pnpm-lock.yaml
 package-lock.json
 yarn.lock
+
+__pycache__
+*.py
+layout

.eslintignore nyanga/.eslintignore

@@ -0,0 +1,19 @@
+.DS_Store
+node_modules
+/build
+/.svelte-kit
+/package
+.env
+.env.*
+!.env.example
+.vercel
+.output
+vite.config.js.timestamp-*
+vite.config.ts.timestamp-*
+
+
+# yarn
+.yarn
+
+# build output binary
+nyanga

.eslintrc.cjs nyanga/.eslintrc.cjs

@@ -11,3 +11,7 @@ node_modules
 pnpm-lock.yaml
 package-lock.json
 yarn.lock
+
+__pycache__
+*.py
+layout

nyanga/.gitignore

@@ -4,6 +4,5 @@
 	"trailingComma": "none",
 	"printWidth": 100,
 	"plugins": ["prettier-plugin-svelte"],
-	"pluginSearchDirs": ["."],
 	"overrides": [{ "files": "*.svelte", "options": { "parser": "svelte" } }]
 }

.npmrc nyanga/.npmrc

@@ -0,0 +1 @@
+nodeLinker: node-modules

.prettierignore nyanga/.prettierignore

@@ -0,0 +1,50 @@
+import subprocess
+from pathlib import Path
+
+import PyInstaller.__main__
+
+
+def start_ui():
+    try:
+        subprocess.run(
+            ["yarn", "run", "svelte:dev"], cwd=Path(__file__).parent.absolute()
+        )
+    except KeyboardInterrupt:
+        pass
+
+
+def install_ui_dep():
+    try:
+        subprocess.run(["yarn", "install"], cwd=Path(__file__).parent.absolute())
+    except KeyboardInterrupt:
+        pass
+
+
+def build_ui():
+    try:
+        subprocess.run(["yarn", "install"], cwd=Path(__file__).parent.absolute())
+        subprocess.run(
+            ["yarn", "run", "svelte:build"], cwd=Path(__file__).parent.absolute()
+        )
+    except KeyboardInterrupt:
+        pass
+
+
+def build_linux():
+    PyInstaller.__main__.run(
+        [
+            f"{Path(__file__).parent.absolute()}/buildtools/specfile/Nyanga-Read-linux.spec",
+            "--distpath",
+            "nyanga",
+        ]
+    )
+
+
+def build_windows():
+    PyInstaller.__main__.run(
+        [
+            f"{Path(__file__).parent.absolute()}/buildtools/specfile/Nyanga-Read-linux.spec",
+            "--distpath",
+            "nyanga",
+        ]
+    )

.prettierrc nyanga/.prettierrc

@@ -5,7 +5,7 @@ block_cipher = None
 
 
 a = Analysis(
-    ['../../window/app.py'],
+    ['../../main.py'],
     pathex=[],
     binaries=[],
     datas=[

nyanga/.yarnrc.yml

@@ -5,7 +5,7 @@ block_cipher = None
 
 
 a = Analysis(
-    ['..\\..\\window\\app.py'],
+    ['..\\..\\main.py'],
     pathex=[],
     binaries=[],
     datas=[

window/server/__init__.py nyanga/__init__.py

@@ -0,0 +1,8 @@
+from nyanga.window.window import Nyanga
+
+def app():
+    app = Nyanga()
+    app.run()
+
+if __name__ == "__main__":
+    app()