From 914bcbb474f6f186c212b2da0d9d864b5e75d8e4 Mon Sep 17 00:00:00 2001 From: RaindropsSys Date: Sat, 29 Jun 2024 20:59:16 +0200 Subject: Rename to Faunerie --- .fleet/settings.json | 3 - .gitignore | 1 - .idea/faunerie.iml | 18 ++ .idea/modules.xml | 2 +- .idea/prisbeam.iml | 18 -- README.md | 6 +- build.sh | 42 +---- buildversion.js | 15 -- dom/index.html | 6 +- e621/match.js | 2 +- e621/update.js | 2 +- main.js | 2 +- package-lock.json | 46 +++-- package.json | 4 +- src/FaunerieAI.ts | 224 +++++++++++++++++++++++ src/FaunerieActions.ts | 13 ++ src/FaunerieApp.ts | 129 +++++++++++++ src/FaunerieAppDisplay.ts | 455 ++++++++++++++++++++++++++++++++++++++++++++++ src/FaunerieDataStore.ts | 47 +++++ src/FaunerieDerpibooru.ts | 293 +++++++++++++++++++++++++++++ src/FaunerieLoader.ts | 261 ++++++++++++++++++++++++++ src/FaunerieSearch.ts | 136 ++++++++++++++ src/FaunerieSettings.ts | 290 +++++++++++++++++++++++++++++ src/FaunerieUtilities.ts | 75 ++++++++ src/PrisbeamAI.ts | 224 ----------------------- src/PrisbeamActions.ts | 13 -- src/PrisbeamApp.ts | 129 ------------- src/PrisbeamAppDisplay.ts | 455 ---------------------------------------------- src/PrisbeamDataStore.ts | 47 ----- src/PrisbeamDerpibooru.ts | 293 ----------------------------- src/PrisbeamLoader.ts | 261 -------------------------- src/PrisbeamSearch.ts | 136 -------------- src/PrisbeamSettings.ts | 290 ----------------------------- src/PrisbeamUtilities.ts | 75 -------- src/index.ts | 4 +- updater/main.js | 18 +- updater/package-lock.json | 25 ++- updater/package.json | 2 +- 38 files changed, 2018 insertions(+), 2044 deletions(-) delete mode 100755 .fleet/settings.json create mode 100755 .idea/faunerie.iml delete mode 100755 .idea/prisbeam.iml delete mode 100755 buildversion.js create mode 100755 src/FaunerieAI.ts create mode 100755 src/FaunerieActions.ts create mode 100755 src/FaunerieApp.ts create mode 100755 src/FaunerieAppDisplay.ts create mode 100755 src/FaunerieDataStore.ts create mode 100755 src/FaunerieDerpibooru.ts create mode 100755 src/FaunerieLoader.ts create mode 100755 src/FaunerieSearch.ts create mode 100755 src/FaunerieSettings.ts create mode 100755 src/FaunerieUtilities.ts delete mode 100755 src/PrisbeamAI.ts delete mode 100755 src/PrisbeamActions.ts delete mode 100755 src/PrisbeamApp.ts delete mode 100755 src/PrisbeamAppDisplay.ts delete mode 100755 src/PrisbeamDataStore.ts delete mode 100755 src/PrisbeamDerpibooru.ts delete mode 100755 src/PrisbeamLoader.ts delete mode 100755 src/PrisbeamSearch.ts delete mode 100755 src/PrisbeamSettings.ts delete mode 100755 src/PrisbeamUtilities.ts diff --git a/.fleet/settings.json b/.fleet/settings.json deleted file mode 100755 index 7266b6b..0000000 --- a/.fleet/settings.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "nodejs.typescript.rebuildOnChanges": true -} \ No newline at end of file diff --git a/.gitignore b/.gitignore index 432d2ca..aa803ba 100755 --- a/.gitignore +++ b/.gitignore @@ -16,5 +16,4 @@ e621/tag_aliases.json e621/parsed_tags.json e621/node_modules e621/credentials.json -libprisbeam intimate/build diff --git a/.idea/faunerie.iml b/.idea/faunerie.iml new file mode 100755 index 0000000..41eb966 --- /dev/null +++ b/.idea/faunerie.iml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml index 58ece80..468ea56 100755 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,7 +2,7 @@ - + \ No newline at end of file diff --git a/.idea/prisbeam.iml b/.idea/prisbeam.iml deleted file mode 100755 index 41eb966..0000000 --- a/.idea/prisbeam.iml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/README.md b/README.md index d3dba1e..67b5128 100755 --- a/README.md +++ b/README.md @@ -1,12 +1,12 @@ -# Prisbeam -A browser and search engine for local copies of various image boards (Derpibooru, Furbooru, e621, ...) +# Faunerie +A browser and search engine for local copies of various image boards (e621, Derpibooru, Furbooru, ...) ## Development Assuming you are using macOS or Linux. Other POSIX systems won't work as Electron does not have binaries for these. ### Cloning ``` -git clone https://source.equestria.dev/equestria.dev/prisbeam +git clone https://github.com/equestria-dev/faunerie ``` ### Setup diff --git a/build.sh b/build.sh index 83bdd6b..affdb98 100755 --- a/build.sh +++ b/build.sh @@ -3,44 +3,14 @@ rm -rf ./build # Build the app JS -cd src +cd src || exit tsc -cd .. +cd .. || exit # Build main app -v1=$(node buildversion.js) -v2=$(node buildversion.js 1) - -npx electron-packager . Prisbeam --ignore sql/win --ignore sql/preprocessed.db --ignore updater --ignore intimate --ignore sql/preprocessed.db --ignore sql/preprocessed2.db --ignore e621 --overwrite --platform=darwin --arch=arm64 --icon=./logo/logo.icns --out=./build -npx electron-packager . Prisbeam --ignore sql/mac --ignore sql/preprocessed.db --ignore updater --ignore intimate --ignore sql/preprocessed.db --ignore sql/preprocessed2.db --ignore e621 --overwrite --platform=win32 --arch=x64 --icon=./logo/logo-round.ico --out=./build -/Library/Atomic/SDK/convert_darwin_arm64.sh ./build/Prisbeam-darwin-arm64/Prisbeam.app - -cd ./build/Prisbeam-darwin-arm64 || exit -zip -r ../../build/Prisbeam-Mac-ARM64.zip ./Prisbeam.app -cd ../.. -curl -v --header "PRIVATE-TOKEN: $(cat ~/.deploy.txt)" --header "Content-Type: multipart/form-data" --upload-file ./build/Prisbeam-Mac-ARM64.zip https://source.equestria.dev/api/v4/projects/168/packages/generic/prisbeam/$v1/Prisbeam-Mac-ARM64.zip - -cd ./build/Prisbeam-win32-x64 || exit -zip -r ../../build/Prisbeam-Win32-x64.zip ./* -cd ../.. -curl -v --header "PRIVATE-TOKEN: $(cat ~/.deploy.txt)" --header "Content-Type: multipart/form-data" --upload-file ./build/Prisbeam-Win32-x64.zip https://source.equestria.dev/api/v4/projects/168/packages/generic/prisbeam/$v1/Prisbeam-Win32-x64.zip +npx electron-packager . Faunerie --ignore sql/win --ignore sql/preprocessed.db --ignore updater --ignore intimate --ignore sql/preprocessed.db --ignore sql/preprocessed2.db --ignore e621 --overwrite --platform=darwin --arch=arm64 --icon=./logo/logo.icns --out=./build +npx electron-packager . Faunerie --ignore sql/mac --ignore sql/preprocessed.db --ignore updater --ignore intimate --ignore sql/preprocessed.db --ignore sql/preprocessed2.db --ignore e621 --overwrite --platform=win32 --arch=x64 --icon=./logo/logo-round.ico --out=./build # Build updater -npx electron-packager ./updater "Prisbeam Updater" --ignore sql/win --ignore sql/preprocessed.db --ignore sql/preprocessed2.db --overwrite --platform=darwin --arch=arm64 --icon=./logo/logo-updater.icns --out=./build -npx electron-packager ./updater "Prisbeam Updater" --ignore sql/mac --ignore sql/preprocessed.db --ignore sql/preprocessed2.db --overwrite --platform=win32 --arch=x64 --icon=./logo/logo-updater-round.ico --out=./build -/Library/Atomic/SDK/convert_darwin_arm64.sh ./build/Prisbeam\ Updater-darwin-arm64/Prisbeam\ Updater.app - -cd ./build/Prisbeam\ Updater-darwin-arm64 || exit -zip -r ../../build/Prisbeam-Updater-Mac-ARM64.zip ./Prisbeam\ Updater.app -cd ../.. -curl -v --header "PRIVATE-TOKEN: $(cat ~/.deploy.txt)" --header "Content-Type: multipart/form-data" --upload-file ./build/Prisbeam-Updater-Mac-ARM64.zip https://source.equestria.dev/api/v4/projects/168/packages/generic/prisbeam-updater/$v2/Prisbeam-Updater-Mac-ARM64.zip - -cd ./build/Prisbeam\ Updater-win32-x64 || exit -zip -r ../../build/Prisbeam-Updater-Win32-x64.zip ./* -cd ../.. -curl -v --header "PRIVATE-TOKEN: $(cat ~/.deploy.txt)" --header "Content-Type: multipart/form-data" --upload-file ./build/Prisbeam-Updater-Win32-x64.zip https://source.equestria.dev/api/v4/projects/168/packages/generic/prisbeam-updater/$v2/Prisbeam-Updater-Win32-x64.zip - -# Remove uploaded files -rm -rf ./build -rm -rf ./build -rm -rf ./build +npx electron-packager ./updater "Faunerie Updater" --ignore sql/win --ignore sql/preprocessed.db --ignore sql/preprocessed2.db --overwrite --platform=darwin --arch=arm64 --icon=./logo/logo-updater.icns --out=./build +npx electron-packager ./updater "Faunerie Updater" --ignore sql/mac --ignore sql/preprocessed.db --ignore sql/preprocessed2.db --overwrite --platform=win32 --arch=x64 --icon=./logo/logo-updater-round.ico --out=./build diff --git a/buildversion.js b/buildversion.js deleted file mode 100755 index 72b2d9d..0000000 --- a/buildversion.js +++ /dev/null @@ -1,15 +0,0 @@ -const isUpdater = !!process.argv[2]; -let baseVersion = "0.0.0"; - -if (isUpdater) { - baseVersion = require('./updater/package.json')['version']; -} else { - baseVersion = require('./package.json')['version']; -} - -process.stdout.write(baseVersion + "-" + new Date().toISOString() - .replaceAll("-", "") - .replaceAll(":", "") - .split(".")[0] - .replace("T", ".") -); diff --git a/dom/index.html b/dom/index.html index 7b090b3..4239a1d 100755 --- a/dom/index.html +++ b/dom/index.html @@ -2,7 +2,7 @@ - Prisbeam + Faunerie @@ -13,7 +13,7 @@