Compare commits
No commits in common. "master" and "v0.9-rc1" have entirely different histories.
|
|
@ -23,7 +23,5 @@ module.exports = {
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
"@typescript-eslint/no-explicit-any": "off",
|
"@typescript-eslint/no-explicit-any": "off",
|
||||||
"eol-last": ["error", "always"],
|
|
||||||
"comma-dangle": ["error", "always-multiline"],
|
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -1,44 +0,0 @@
|
||||||
name: "Setup project"
|
|
||||||
runs:
|
|
||||||
using: "composite"
|
|
||||||
steps:
|
|
||||||
- uses: actions/setup-dotnet@v3
|
|
||||||
with:
|
|
||||||
dotnet-version: "7.0.x"
|
|
||||||
|
|
||||||
- name: Install GitVersion
|
|
||||||
uses: gittools/actions/gitversion/setup@v0
|
|
||||||
with:
|
|
||||||
versionSpec: "5.x"
|
|
||||||
|
|
||||||
- name: Determine Version
|
|
||||||
uses: gittools/actions/gitversion/execute@v0
|
|
||||||
id: version
|
|
||||||
with:
|
|
||||||
useConfigFile: true
|
|
||||||
|
|
||||||
- name: Use the version
|
|
||||||
shell: bash
|
|
||||||
run: |
|
|
||||||
echo VITE_SZ_VERSION="${{ steps.version.outputs.AssemblySemFileVer }}" >> $GITHUB_ENV
|
|
||||||
echo VITE_SZ_VERSION_INFO="${{ steps.version.outputs.InformationalVersion }}" >> $GITHUB_ENV
|
|
||||||
|
|
||||||
- uses: pnpm/action-setup@v2
|
|
||||||
name: Install pnpm
|
|
||||||
id: pnpm-install
|
|
||||||
with:
|
|
||||||
version: 9
|
|
||||||
run_install: false
|
|
||||||
|
|
||||||
- uses: actions/setup-node@v3
|
|
||||||
with:
|
|
||||||
node-version: "20"
|
|
||||||
cache: "pnpm"
|
|
||||||
|
|
||||||
- name: Install dependencies
|
|
||||||
shell: bash
|
|
||||||
run: pnpm install
|
|
||||||
|
|
||||||
- name: Linter
|
|
||||||
shell: bash
|
|
||||||
run: pnpm lint
|
|
||||||
|
|
@ -1,95 +0,0 @@
|
||||||
name: Build release
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
paths:
|
|
||||||
- src/**
|
|
||||||
- extension/**
|
|
||||||
- package.json
|
|
||||||
- pnpm-lock.yaml
|
|
||||||
workflow_dispatch:
|
|
||||||
inputs:
|
|
||||||
publish_amo_listed:
|
|
||||||
description: "Publish to AMO"
|
|
||||||
required: false
|
|
||||||
type: boolean
|
|
||||||
jobs:
|
|
||||||
build_chrome:
|
|
||||||
name: "Build Chrome Extension"
|
|
||||||
runs-on: ubuntu-24.04
|
|
||||||
steps:
|
|
||||||
- name: Checkout
|
|
||||||
uses: actions/checkout@v2
|
|
||||||
with:
|
|
||||||
fetch-depth: 0
|
|
||||||
|
|
||||||
- uses: ./.github/actions/setup-for-build
|
|
||||||
|
|
||||||
- name: Build
|
|
||||||
run: pnpm build
|
|
||||||
|
|
||||||
- name: Pack ZIP
|
|
||||||
run: pnpm pack:zip
|
|
||||||
|
|
||||||
- uses: actions/upload-artifact@v4
|
|
||||||
with:
|
|
||||||
name: Chrome Extension (Unsigned)
|
|
||||||
path: extension.zip
|
|
||||||
|
|
||||||
build_unlisted_firefox:
|
|
||||||
name: "Build Unlisted Firefox Extension"
|
|
||||||
runs-on: ubuntu-24.04
|
|
||||||
# Doesn't really need the Chrome build, but we can reuse its cache.
|
|
||||||
needs: build_chrome
|
|
||||||
if: github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/v')
|
|
||||||
steps:
|
|
||||||
- name: Checkout
|
|
||||||
uses: actions/checkout@v2
|
|
||||||
with:
|
|
||||||
fetch-depth: 0
|
|
||||||
|
|
||||||
- uses: ./.github/actions/setup-for-build
|
|
||||||
|
|
||||||
- name: Build
|
|
||||||
run: pnpm build
|
|
||||||
env:
|
|
||||||
SZ_GECKO_ID: 13372607-2257-4360-8f51-5ce66fa73350
|
|
||||||
|
|
||||||
- name: Sign XPI
|
|
||||||
run: pnpm sign:firefox --channel unlisted
|
|
||||||
env:
|
|
||||||
WEB_EXT_API_KEY: ${{ secrets.WEB_EXT_API_KEY }}
|
|
||||||
WEB_EXT_API_SECRET: ${{ secrets.WEB_EXT_API_SECRET }}
|
|
||||||
|
|
||||||
- name: Rename XPI
|
|
||||||
run: rename.ul szuruchrome_gh- SzuruChrome-v web-ext-artifacts/*.xpi
|
|
||||||
|
|
||||||
- uses: actions/upload-artifact@v4
|
|
||||||
with:
|
|
||||||
name: Firefox Extension (Signed)
|
|
||||||
path: web-ext-artifacts/*.xpi
|
|
||||||
|
|
||||||
build_amo_firefox:
|
|
||||||
name: "Build Firefox Extension for AMO"
|
|
||||||
runs-on: ubuntu-24.04
|
|
||||||
# Doesn't really need the Chrome build, but we can reuse its cache.
|
|
||||||
needs: build_chrome
|
|
||||||
# Only run (on master branch && if tagged) or (manually dispatching).
|
|
||||||
if: startsWith(github.ref, 'refs/tags/v') || github.event.inputs.publish_amo_listed == true
|
|
||||||
steps:
|
|
||||||
- name: Checkout
|
|
||||||
uses: actions/checkout@v2
|
|
||||||
with:
|
|
||||||
fetch-depth: 0
|
|
||||||
|
|
||||||
- uses: ./.github/actions/setup-for-build
|
|
||||||
|
|
||||||
- name: Build
|
|
||||||
run: pnpm build
|
|
||||||
env:
|
|
||||||
SZ_GECKO_ID: 18365332-8485-4c04-9498-2843a41ab620
|
|
||||||
|
|
||||||
- name: Sign XPI and upload to AMO
|
|
||||||
run: pnpm sign:firefox --channel listed
|
|
||||||
env:
|
|
||||||
WEB_EXT_API_KEY: ${{ secrets.WEB_EXT_API_KEY }}
|
|
||||||
WEB_EXT_API_SECRET: ${{ secrets.WEB_EXT_API_SECRET }}
|
|
||||||
|
|
@ -14,4 +14,3 @@ extension/manifest.json
|
||||||
node_modules
|
node_modules
|
||||||
src/auto-imports.d.ts
|
src/auto-imports.d.ts
|
||||||
src/components.d.ts
|
src/components.d.ts
|
||||||
*artifacts/
|
|
||||||
|
|
|
||||||
1
.npmrc
1
.npmrc
|
|
@ -1,3 +1,2 @@
|
||||||
shamefully-hoist=true
|
shamefully-hoist=true
|
||||||
auto-install-peers=true
|
auto-install-peers=true
|
||||||
strict-peer-dependencies=false
|
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,6 @@
|
||||||
{
|
{
|
||||||
"recommendations": ["vue.volar", "dbaeumer.vscode-eslint", "esbenp.prettier-vscode"]
|
"recommendations": [
|
||||||
|
"vue.volar",
|
||||||
|
"dbaeumer.vscode-eslint",
|
||||||
|
]
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"typescript.tsdk": "node_modules/typescript/lib",
|
"typescript.tsdk": "node_modules/typescript/lib",
|
||||||
"editor.codeActionsOnSave": {
|
"editor.codeActionsOnSave": {
|
||||||
"source.fixAll.eslint": "explicit"
|
"source.fixAll.eslint": true
|
||||||
}
|
},
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,7 +0,0 @@
|
||||||
mode: ContinuousDelivery
|
|
||||||
increment: None
|
|
||||||
assembly-file-versioning-format: "{Major}.{Minor}.{Patch}.{CommitsSinceVersionSource}"
|
|
||||||
branches: {}
|
|
||||||
ignore:
|
|
||||||
sha: []
|
|
||||||
merge-message-formats: {}
|
|
||||||
42
README.md
42
README.md
|
|
@ -2,22 +2,39 @@
|
||||||
|
|
||||||
Chrome/Firefox extension which can import media from various sites into a [szurubooru](https://github.com/rr-/szurubooru) instance.
|
Chrome/Firefox extension which can import media from various sites into a [szurubooru](https://github.com/rr-/szurubooru) instance.
|
||||||
|
|
||||||

|
## Supported sites
|
||||||
|
|
||||||
|
| Engine | Sites | Features | Notes |
|
||||||
|
| -------------- | ------------------------------------------------------------- | -------------------------------------------------------------- | ------------------------------------------------------------------------------- |
|
||||||
|
| animepictures | anime-pictures.net | content, resolution, tags, tag_category | Rating is assumed to be safe. |
|
||||||
|
| danbooru | danbooru.donmai.us, safebooru.donmai.us | content, rating, resolution, tags, tag_category, source, notes | |
|
||||||
|
| e621 | e621.net, e926.net | content, rating, resolution, tags, tag_category, source | |
|
||||||
|
| furaffinity | www.furaffinity.net | content, rating, resolution, tags, tag_category | |
|
||||||
|
| gelbooru | safebooru.org, gelbooru.com, rule34.xxx, tbib.org, xbooru.com | content, rating, resolution, tags, tag_category, source, notes | Supported features might vary between hosts. |
|
||||||
|
| inkbunny | inkbunny.net | content, rating, resolution, tags | |
|
||||||
|
| moebooru | yande.re, konachan.com | content, rating, resolution, tags, tag_category, source, notes | |
|
||||||
|
| pixiv | pixiv.net, www.pixiv.net | content | |
|
||||||
|
| reddit | reddit.com, new.reddit.com, old.reddit.com | content | |
|
||||||
|
| rule34us | rule34.us | content, resolution, tags, tag_category | Rating is assumed to be unsafe. |
|
||||||
|
| sankakucomplex | chan.sankakucomplex.com | content, rating, tags, tag_category, notes | Hotlink protection currently prevents szurubooru from importing from this site. |
|
||||||
|
| shimmie2 | rule34.paheal.net, rule34hentai.net | content, tags, source | Rating is assumed to be unsafe. |
|
||||||
|
| shuushuu | e-shuushuu.net | content, rating, resolution, tags, tag_category | Rating is assumed to be safe. |
|
||||||
|
| twitter | twitter.com, mobile.twitter.com | content | |
|
||||||
|
| zerochan | www.zerochan.net | content, resolution, tags, tag_category | Rating is assumed to be safe. |
|
||||||
|
| fallback | | content | Tries to find the largest image or video on the current page. |
|
||||||
|
|
||||||
## Installation
|
## Installation
|
||||||
|
|
||||||
|
For development see [build/debug](#Builddebug).
|
||||||
|
|
||||||
### Firefox
|
### Firefox
|
||||||
|
|
||||||
I am experimenting with publishing the extension to Firefox Add-ons. You can find it [here](https://addons.mozilla.org/en-US/firefox/addon/szuruchrome/). This version will automatically update.
|
Just download the .xpi from [release tab](https://github.com/neobooru/SzuruChrome/releases) and install it.
|
||||||
|
|
||||||
You can also download the .xpi from the [release tab](https://github.com/neobooru/SzuruChrome/releases) and manually install it. This version will not automatically update.
|
|
||||||
|
|
||||||
Both versions can be installed side by side, as they do not affect each other. This also means that you need to configure both of them independently.
|
|
||||||
|
|
||||||
### Chrome
|
### Chrome
|
||||||
|
|
||||||
I can't create a valid .crx file, which means that you'll have to use [Chrome's "Load unpacked extension"](https://developer.chrome.com/docs/extensions/mv3/getstarted/#unpacked) feature.
|
I can't create a valid .crx file, which means that you'll have to use [Chrome's "Load unpacked extension"](https://developer.chrome.com/docs/extensions/mv3/getstarted/#unpacked) feature.
|
||||||
You can download a .zip containing the needed files from the [release tab](https://github.com/neobooru/SzuruChrome/releases). Check [this Stack Overflow answer](https://stackoverflow.com/a/38011386) if you want to get rid of the developer extension popup.
|
You can download a .zip containing the needed files from the [release tab](https://github.com/neobooru/SzuruChrome/releases). Check [this stackoverflow answer](https://stackoverflow.com/a/38011386) if you want to get rid of the developer extension popup.
|
||||||
|
|
||||||
## Build/debug
|
## Build/debug
|
||||||
|
|
||||||
|
|
@ -36,4 +53,13 @@ After this you can load them in your browser.
|
||||||
Chrome: `chrome://extensions/` → "Load unpacked" → Select `./dist` folder
|
Chrome: `chrome://extensions/` → "Load unpacked" → Select `./dist` folder
|
||||||
Firefox: `about:debugging` → "Load Temporary Add-on..." → Select any file in the `./dist` folder (it will load all files)
|
Firefox: `about:debugging` → "Load Temporary Add-on..." → Select any file in the `./dist` folder (it will load all files)
|
||||||
|
|
||||||
See [the developer notes](https://github.com/neobooru/SzuruChrome/wiki/Developer-notes) for more information.
|
See [the developer docs](./docs/DEVELOPER.md) for more information.
|
||||||
|
|
||||||
|
## Planned features
|
||||||
|
|
||||||
|
These are some things I might work on. Though honestly I don't expect this extension to change much anytime soon.
|
||||||
|
|
||||||
|
- Finishing the initial version of this add-on (see visual design doc for all features)
|
||||||
|
- Right click any image on a page to import it
|
||||||
|
- Configurable list of tags to always ignore (e.g. tagme, highres)
|
||||||
|
- [low priority] Import artist commentary
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,42 @@
|
||||||
|
# Developer notes
|
||||||
|
|
||||||
|
## How does it work?
|
||||||
|
|
||||||
|
This add-on has three parts.
|
||||||
|
The first part is the popup, which is what pops up when you click on the logo.
|
||||||
|
|
||||||
|
The second part is a content script which is injected on the page you visit. This script tries to find importable content on the current page and sends this to the popup.
|
||||||
|
|
||||||
|
The third part is the background script which handles the upload functionality. This was previously part of the popup, but has since been moved to the background script.
|
||||||
|
|
||||||
|
### The popup
|
||||||
|
|
||||||
|
When opened (when you click on the add-on logo in your browser) it sends a message to the content script injected on the current page (active tab). This message asks the content script to scrape the DOM and return a SzuruPost element (with a source, contentUrl, safety, and a list of tags). Once it receives this element it renders it in the popup where you can make changes before importing it. When you click on the "Upload" button the SzuruPost will be sent to the background script which will handle the upload functionality. This is done so that the upload continues even after you close the popup. This means that you can close the popup after clicking the "Upload" button, and it'll continue with the upload.
|
||||||
|
|
||||||
|
### The content script
|
||||||
|
|
||||||
|
This script is injected on every page and does absolutely nothing until it receives the 'grab_post' message from the popup. When it does receive this message it checks if there are any loaders available to scrape this page. If a matching loader is found it'll pass the DOM of this page to the loader. The loader then uses the DOM to fill (as much as possible) a SzuruPost object. The SzuruPost is then passed back to the popup where you can change the post before importing it.
|
||||||
|
|
||||||
|
### The background script
|
||||||
|
|
||||||
|
This script handles the uploading of a post. It will also update a tag's category in your szurubooru instance when it differs from what is imported.
|
||||||
|
|
||||||
|
## F.A.Q
|
||||||
|
|
||||||
|
### How to use a newer neo-scraper version?
|
||||||
|
|
||||||
|
Running the below command will pull the latest neo-scraper version from github.
|
||||||
|
|
||||||
|
```sh
|
||||||
|
yarn upgrade neo-scraper
|
||||||
|
```
|
||||||
|
|
||||||
|
### Why send the DOM to the ILoader instead of just a URL?
|
||||||
|
|
||||||
|
If we send a URL to the ILoader it has to download the page again itself, which can go wrong in a dozen ways:
|
||||||
|
|
||||||
|
1. The website might be offline now
|
||||||
|
2. If the website is an SPA it might not see the same version/content as you did
|
||||||
|
3. If you made changes to the DOM but didn't submit them to the server (e.g. edit post page) the ILoader would see a different page (kinda the same as point 2)
|
||||||
|
4. If any form of authentication (username+password/client certificate/etc.) is involved it gets tricky
|
||||||
|
5. We already have the DOM, why download it again?
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 350 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 306 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 293 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 36 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 36 KiB After Width: | Height: | Size: 33 KiB |
84
package.json
84
package.json
|
|
@ -4,6 +4,7 @@
|
||||||
"description": "Import media from various sites into szurubooru.",
|
"description": "Import media from various sites into szurubooru.",
|
||||||
"version": "0.0.0",
|
"version": "0.0.0",
|
||||||
"private": true,
|
"private": true,
|
||||||
|
"packageManager": "pnpm@7.8.0",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "npm run clear && cross-env NODE_ENV=development run-p dev:*",
|
"dev": "npm run clear && cross-env NODE_ENV=development run-p dev:*",
|
||||||
"dev:prepare": "esno scripts/prepare.ts",
|
"dev:prepare": "esno scripts/prepare.ts",
|
||||||
|
|
@ -19,63 +20,52 @@
|
||||||
"pack:xpi": "cross-env WEB_EXT_ARTIFACTS_DIR=./ web-ext build --source-dir ./extension --filename extension.xpi --overwrite-dest",
|
"pack:xpi": "cross-env WEB_EXT_ARTIFACTS_DIR=./ web-ext build --source-dir ./extension --filename extension.xpi --overwrite-dest",
|
||||||
"start:chromium": "web-ext run --source-dir ./extension --target=chromium",
|
"start:chromium": "web-ext run --source-dir ./extension --target=chromium",
|
||||||
"start:firefox": "web-ext run --source-dir ./extension --target=firefox-desktop",
|
"start:firefox": "web-ext run --source-dir ./extension --target=firefox-desktop",
|
||||||
"sign:firefox": "web-ext sign --source-dir ./extension",
|
"sign:firefox": "web-ext sign --use-submission-api --source-dir ./extension --channel unlisted",
|
||||||
"clear": "rimraf extension/dist extension/manifest.json extension.*",
|
"clear": "rimraf extension/dist extension/manifest.json extension.*",
|
||||||
"lint": "eslint .",
|
"lint": "eslint .",
|
||||||
"extlint": "web-ext lint -s extension",
|
"test": "vitest test"
|
||||||
"test": "vitest test",
|
|
||||||
"pretty": "prettier -w ."
|
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"axios": "^1.19.0",
|
"axios": "^1.2.2",
|
||||||
"byte-size": "^8.2.1",
|
"basscss": "^8.1.0",
|
||||||
"deepmerge": "^4.3.1",
|
"markdown-it": "^13.0.1",
|
||||||
"lodash": "^4.18.1",
|
"neo-scraper": "^0.5.8",
|
||||||
"markdown-it": "^14.3.0",
|
"normalize.css": "^8.0.1"
|
||||||
"neo-scraper": "^0.11.1",
|
|
||||||
"normalize.css": "^8.0.1",
|
|
||||||
"pinia": "^2.3.1",
|
|
||||||
"primeflex": "^3.3.1",
|
|
||||||
"primevue": "3.45.0",
|
|
||||||
"vue-router": "^4.6.4"
|
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@ffflorian/jszip-cli": "^3.16.5",
|
"@ffflorian/jszip-cli": "^3.1.6",
|
||||||
"@fortawesome/fontawesome-svg-core": "^6.7.2",
|
"@fortawesome/fontawesome-svg-core": "^6.2.1",
|
||||||
"@fortawesome/free-solid-svg-icons": "^6.7.2",
|
"@fortawesome/free-solid-svg-icons": "^6.2.1",
|
||||||
"@fortawesome/vue-fontawesome": "^3.3.3",
|
"@fortawesome/vue-fontawesome": "^3.0.3",
|
||||||
"@types/byte-size": "^8.1.2",
|
"@types/fs-extra": "^9.0.13",
|
||||||
"@types/fs-extra": "^11.0.4",
|
"@types/markdown-it": "^12.2.3",
|
||||||
"@types/lodash": "^4.17.25",
|
"@types/node": "^18.11.9",
|
||||||
"@types/markdown-it": "^13.0.9",
|
"@types/webextension-polyfill": "^0.9.1",
|
||||||
"@types/node": "^20.19.43",
|
"@typescript-eslint/eslint-plugin": "^5.44.0",
|
||||||
"@types/webextension-polyfill": "^0.10.7",
|
"@vitejs/plugin-vue": "^3.2.0",
|
||||||
"@typescript-eslint/eslint-plugin": "^6.21.0",
|
"@vue/compiler-sfc": "^3.2.45",
|
||||||
"@vitejs/plugin-vue": "^5.2.4",
|
"@vue/test-utils": "^2.2.4",
|
||||||
"@vue/compiler-sfc": "^3.5.41",
|
"@vueuse/core": "^9.6.0",
|
||||||
"@vue/test-utils": "^2.4.11",
|
"chokidar": "^3.5.3",
|
||||||
"@vueuse/core": "^10.11.1",
|
|
||||||
"chokidar": "^3.6.0",
|
|
||||||
"cross-env": "^7.0.3",
|
"cross-env": "^7.0.3",
|
||||||
"crx": "^5.0.1",
|
"crx": "^5.0.1",
|
||||||
"eslint": "^8.57.1",
|
"eslint": "^8.32.0",
|
||||||
"eslint-plugin-vue": "^9.33.0",
|
"eslint-plugin-vue": "^9.9.0",
|
||||||
"esno": "^4.8.0",
|
"esno": "^0.16.3",
|
||||||
"fs-extra": "^11.4.0",
|
"fs-extra": "^10.1.0",
|
||||||
"jsdom": "^23.2.0",
|
"jsdom": "^20.0.3",
|
||||||
"kolorist": "^1.8.0",
|
"kolorist": "^1.6.0",
|
||||||
"npm-run-all": "^4.1.5",
|
"npm-run-all": "^4.1.5",
|
||||||
"prettier": "^3.9.6",
|
|
||||||
"rimraf": "^3.0.2",
|
"rimraf": "^3.0.2",
|
||||||
"sass": "^1.102.0",
|
"sass": "^1.57.1",
|
||||||
"typescript": "^5.9.3",
|
"typescript": "^4.9.3",
|
||||||
"unplugin-auto-import": "^0.17.8",
|
"unplugin-auto-import": "^0.12.2",
|
||||||
"unplugin-vue-components": "^0.26.0",
|
"unplugin-vue-components": "^0.23.0",
|
||||||
"vite": "^5.4.21",
|
"vite": "^3.2.4",
|
||||||
"vitest": "^1.6.1",
|
"vitest": "^0.25.3",
|
||||||
"vue": "^3.5.41",
|
"vue": "^3.2.45",
|
||||||
"vue-eslint-parser": "^9.4.3",
|
"vue-eslint-parser": "^9.1.0",
|
||||||
"web-ext": "^8.10.0",
|
"web-ext": "^7.5.0",
|
||||||
"webextension-polyfill": "^0.10.0"
|
"webextension-polyfill": "^0.10.0"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
10849
pnpm-lock.yaml
10849
pnpm-lock.yaml
File diff suppressed because it is too large
Load Diff
|
|
@ -1,9 +1,9 @@
|
||||||
import { resolve } from "path";
|
import { resolve } from 'path';
|
||||||
import { bgCyan, black } from "kolorist";
|
import { bgCyan, black } from 'kolorist';
|
||||||
|
|
||||||
export const port = parseInt(process.env.PORT || "") || 3303;
|
export const port = parseInt(process.env.PORT || '') || 3303;
|
||||||
export const r = (...args: string[]) => resolve(__dirname, "..", ...args);
|
export const r = (...args: string[]) => resolve(__dirname, '..', ...args);
|
||||||
export const isDev = process.env.NODE_ENV !== "production";
|
export const isDev = process.env.NODE_ENV !== 'production';
|
||||||
|
|
||||||
export function log(name: string, message: string) {
|
export function log(name: string, message: string) {
|
||||||
console.log(black(bgCyan(` ${name} `)), message);
|
console.log(black(bgCyan(` ${name} `)), message);
|
||||||
|
|
|
||||||
115
src/api/index.ts
115
src/api/index.ts
|
|
@ -1,5 +1,4 @@
|
||||||
import axios, { AxiosRequestConfig, CancelToken } from "axios";
|
import axios, { AxiosRequestConfig, CancelToken } from "axios";
|
||||||
import { isEqual } from "lodash";
|
|
||||||
import {
|
import {
|
||||||
TagsResult,
|
TagsResult,
|
||||||
TagCategoriesResult,
|
TagCategoriesResult,
|
||||||
|
|
@ -9,14 +8,9 @@ import {
|
||||||
ImageSearchResult,
|
ImageSearchResult,
|
||||||
TagFields,
|
TagFields,
|
||||||
TemporaryFileUploadResult,
|
TemporaryFileUploadResult,
|
||||||
UpdatePostRequest,
|
|
||||||
PoolsResult,
|
|
||||||
PoolFields,
|
|
||||||
Pool,
|
|
||||||
UpdatePoolRequest,
|
|
||||||
} from "./models";
|
} from "./models";
|
||||||
import { ScrapedPostDetails, SzuruSiteConfig } from "~/models";
|
import { ScrapedPostDetails } from "~/models";
|
||||||
import { UploadMode } from "neo-scraper";
|
import { SzuruSiteConfig } from "~/config";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A 1:1 wrapper around the szurubooru API.
|
* A 1:1 wrapper around the szurubooru API.
|
||||||
|
|
@ -51,24 +45,16 @@ export default class SzurubooruApi {
|
||||||
return (await this.apiGet("info")).data;
|
return (await this.apiGet("info")).data;
|
||||||
}
|
}
|
||||||
|
|
||||||
async getPost(id: number): Promise<Post> {
|
|
||||||
return (await this.apiGet("post/" + id)).data;
|
|
||||||
}
|
|
||||||
|
|
||||||
async updateTag(tag: Tag): Promise<any> {
|
async updateTag(tag: Tag): Promise<any> {
|
||||||
return (await this.apiPut("tag/" + encodeURIComponent(tag.names[0]), tag)).data;
|
return (await this.apiPut("tag/" + encodeURIComponent(tag.names[0]), tag)).data;
|
||||||
}
|
}
|
||||||
|
|
||||||
async updatePost(id: number, updateRequest: UpdatePostRequest): Promise<Post> {
|
|
||||||
return (await this.apiPut("post/" + id, updateRequest)).data;
|
|
||||||
}
|
|
||||||
|
|
||||||
async getTags(
|
async getTags(
|
||||||
query: string,
|
query: string,
|
||||||
offset = 0,
|
offset = 0,
|
||||||
limit = 100,
|
limit = 100,
|
||||||
fields?: TagFields[],
|
fields?: TagFields[],
|
||||||
cancelToken?: CancelToken,
|
cancelToken?: CancelToken
|
||||||
): Promise<TagsResult> {
|
): Promise<TagsResult> {
|
||||||
const params = new URLSearchParams();
|
const params = new URLSearchParams();
|
||||||
params.append("offset", offset.toString());
|
params.append("offset", offset.toString());
|
||||||
|
|
@ -86,7 +72,7 @@ export default class SzurubooruApi {
|
||||||
|
|
||||||
async createPost(post: ScrapedPostDetails, contentToken?: string): Promise<Post> {
|
async createPost(post: ScrapedPostDetails, contentToken?: string): Promise<Post> {
|
||||||
const obj = <any>{
|
const obj = <any>{
|
||||||
tags: post.tags.map((x) => x.names[0]),
|
tags: post.tags.map((x) => x.name),
|
||||||
safety: post.rating,
|
safety: post.rating,
|
||||||
source: post.source,
|
source: post.source,
|
||||||
notes: post.notes,
|
notes: post.notes,
|
||||||
|
|
@ -104,40 +90,6 @@ export default class SzurubooruApi {
|
||||||
return (await this.apiPost("posts", obj)).data;
|
return (await this.apiPost("posts", obj)).data;
|
||||||
}
|
}
|
||||||
|
|
||||||
async createPool(name: string, category: string, posts?: number[]): Promise<Pool> {
|
|
||||||
const obj = <any>{
|
|
||||||
names: [name],
|
|
||||||
category,
|
|
||||||
};
|
|
||||||
|
|
||||||
if (posts) {
|
|
||||||
obj.posts = posts;
|
|
||||||
}
|
|
||||||
|
|
||||||
return (await this.apiPost("pool", obj)).data;
|
|
||||||
}
|
|
||||||
|
|
||||||
async getPools(
|
|
||||||
query?: string,
|
|
||||||
offset = 0,
|
|
||||||
limit = 100,
|
|
||||||
fields?: PoolFields[],
|
|
||||||
cancelToken?: CancelToken,
|
|
||||||
): Promise<PoolsResult> {
|
|
||||||
const params = new URLSearchParams();
|
|
||||||
params.append("offset", offset.toString());
|
|
||||||
params.append("limit", limit.toString());
|
|
||||||
|
|
||||||
if (fields && fields.length > 0) params.append("fields", fields.join());
|
|
||||||
if (query) params.append("query", query);
|
|
||||||
|
|
||||||
return (await this.apiGet("pools?" + params.toString(), {}, cancelToken)).data;
|
|
||||||
}
|
|
||||||
|
|
||||||
async updatePool(id: number, updateRequest: UpdatePoolRequest): Promise<Pool> {
|
|
||||||
return (await this.apiPut("pool/" + id, updateRequest)).data;
|
|
||||||
}
|
|
||||||
|
|
||||||
async reverseSearch(contentUrl: string): Promise<ImageSearchResult> {
|
async reverseSearch(contentUrl: string): Promise<ImageSearchResult> {
|
||||||
const obj = { contentUrl };
|
const obj = { contentUrl };
|
||||||
return (await this.apiPost("posts/reverse-search", obj)).data;
|
return (await this.apiPost("posts/reverse-search", obj)).data;
|
||||||
|
|
@ -148,71 +100,15 @@ export default class SzurubooruApi {
|
||||||
return (await this.apiPost("posts/reverse-search", obj)).data;
|
return (await this.apiPost("posts/reverse-search", obj)).data;
|
||||||
}
|
}
|
||||||
|
|
||||||
async uploadTempFile(contentUrl: string, uploadMode: UploadMode): Promise<TemporaryFileUploadResult> {
|
async uploadTempFile(contentUrl: string): Promise<TemporaryFileUploadResult> {
|
||||||
// For some sources we need to download the image to the client and then upload it to szurubooru.
|
|
||||||
// We can't just pass the contentUrl because that would trigger the bot/hotlink protection.
|
|
||||||
|
|
||||||
if (uploadMode == "content") {
|
|
||||||
console.log("Upload from content");
|
|
||||||
return this.uploadTempFileFromContent(contentUrl);
|
|
||||||
} else {
|
|
||||||
console.log("Upload from URL");
|
|
||||||
return this.uploadTempFileFromUrl(contentUrl);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async uploadTempFileFromUrl(contentUrl: string): Promise<TemporaryFileUploadResult> {
|
|
||||||
const obj = { contentUrl };
|
const obj = { contentUrl };
|
||||||
return (await this.apiPost("uploads", obj)).data;
|
return (await this.apiPost("uploads", obj)).data;
|
||||||
}
|
}
|
||||||
|
|
||||||
async uploadTempFileFromContent(contentUrl: string): Promise<TemporaryFileUploadResult> {
|
|
||||||
const content = await (await fetch(contentUrl)).blob();
|
|
||||||
|
|
||||||
const fullUrl = this.apiUrl + "uploads";
|
|
||||||
|
|
||||||
const formData = new FormData();
|
|
||||||
formData.append("content", content);
|
|
||||||
|
|
||||||
const config: AxiosRequestConfig = {
|
|
||||||
method: "POST",
|
|
||||||
url: fullUrl,
|
|
||||||
data: formData,
|
|
||||||
};
|
|
||||||
|
|
||||||
config.headers = { ...this.baseHeaders, "Content-Type": "multipart/form-data" };
|
|
||||||
return (await this.execute(config)).data;
|
|
||||||
}
|
|
||||||
|
|
||||||
static createFromConfig(siteConfig: SzuruSiteConfig): SzurubooruApi {
|
static createFromConfig(siteConfig: SzuruSiteConfig): SzurubooruApi {
|
||||||
return new SzurubooruApi(siteConfig.domain, siteConfig.username, siteConfig.authToken);
|
return new SzurubooruApi(siteConfig.domain, siteConfig.username, siteConfig.authToken);
|
||||||
}
|
}
|
||||||
|
|
||||||
static createUpdatePostRequest(orig: Post, newPost: Post /*, anonymous = false*/) {
|
|
||||||
const detail = <UpdatePostRequest>{ version: newPost.version };
|
|
||||||
|
|
||||||
// Send only changed fields to avoid user privilege violation
|
|
||||||
// if (anonymous === true) {
|
|
||||||
// detail.anonymous = true;
|
|
||||||
// }
|
|
||||||
|
|
||||||
if (orig.safety != newPost.safety) {
|
|
||||||
detail.safety = newPost.safety;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (orig.source != newPost.source) {
|
|
||||||
detail.source = newPost.source;
|
|
||||||
}
|
|
||||||
|
|
||||||
const oldTags = orig.tags.map((x) => x.names[0]);
|
|
||||||
const newTags = newPost.tags.map((x) => x.names[0]);
|
|
||||||
if (isEqual(oldTags, newTags) == false) {
|
|
||||||
detail.tags = newTags;
|
|
||||||
}
|
|
||||||
|
|
||||||
return detail;
|
|
||||||
}
|
|
||||||
|
|
||||||
private async apiGet(url: string, additionalHeaders: any = {}, cancelToken?: CancelToken): Promise<any> {
|
private async apiGet(url: string, additionalHeaders: any = {}, cancelToken?: CancelToken): Promise<any> {
|
||||||
const fullUrl = this.apiUrl + url;
|
const fullUrl = this.apiUrl + url;
|
||||||
const config: AxiosRequestConfig = {
|
const config: AxiosRequestConfig = {
|
||||||
|
|
@ -253,6 +149,7 @@ export default class SzurubooruApi {
|
||||||
if (this.username && this.authToken) {
|
if (this.username && this.authToken) {
|
||||||
const token = "Token " + btoa(`${this.username}:${this.authToken}`);
|
const token = "Token " + btoa(`${this.username}:${this.authToken}`);
|
||||||
if (!config.headers) config.headers = {};
|
if (!config.headers) config.headers = {};
|
||||||
|
// @ts-expect-error xxx
|
||||||
config.headers["Authorization"] = token;
|
config.headers["Authorization"] = token;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -3,11 +3,9 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
export type Safety = "safe" | "sketchy" | "unsafe";
|
export type Safety = "safe" | "sketchy" | "unsafe";
|
||||||
export type TagFields = "version" | "names" | "category" | "usages" | "implications";
|
export type TagFields = "names" | "category" | "usages" | "implications";
|
||||||
export type PoolFields = "version" | "id" | "names" | "category" | "description" | "postCount" | "posts";
|
|
||||||
|
|
||||||
export type TagsResult = PagedSearchResult<Tag>;
|
export type TagsResult = PagedSearchResult<Tag>;
|
||||||
export type PoolsResult = PagedSearchResult<Pool>;
|
|
||||||
export type TagCategoriesResult = UnpagedSearchResult<TagCategory>;
|
export type TagCategoriesResult = UnpagedSearchResult<TagCategory>;
|
||||||
|
|
||||||
export interface SzuruError {
|
export interface SzuruError {
|
||||||
|
|
@ -39,28 +37,18 @@ export interface MicroTag {
|
||||||
usages: number;
|
usages: number;
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface Tag extends MicroTag {
|
export interface Tag {
|
||||||
|
names: string[];
|
||||||
|
category: string;
|
||||||
version: number;
|
version: number;
|
||||||
description?: string; // Markdown
|
description?: string; // Markdown
|
||||||
creationTime: Date;
|
creationTime: Date;
|
||||||
lastEditTime?: Date;
|
lastEditTime?: Date;
|
||||||
|
usages: number;
|
||||||
suggestions: MicroTag[];
|
suggestions: MicroTag[];
|
||||||
implications: MicroTag[];
|
implications: MicroTag[];
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* All fields can be optional.
|
|
||||||
*/
|
|
||||||
export interface Pool {
|
|
||||||
id: number;
|
|
||||||
names: string[];
|
|
||||||
category: string;
|
|
||||||
version: number;
|
|
||||||
description: null;
|
|
||||||
postCount: number;
|
|
||||||
posts: MicroPost[];
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface TagCategory {
|
export interface TagCategory {
|
||||||
name: string;
|
name: string;
|
||||||
version: number;
|
version: number;
|
||||||
|
|
@ -74,17 +62,13 @@ export interface MicroUser {
|
||||||
avatarUrl: string;
|
avatarUrl: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface MicroPost {
|
export interface Post {
|
||||||
id: number;
|
id: number;
|
||||||
thumbnailUrl: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface Post extends MicroPost {
|
|
||||||
version: number;
|
version: number;
|
||||||
creationTime: Date;
|
creationTime: Date;
|
||||||
lastEditTime?: Date;
|
lastEditTime?: Date;
|
||||||
safety: Safety;
|
safety: Safety;
|
||||||
source: string | null;
|
source: string;
|
||||||
type: string;
|
type: string;
|
||||||
mimeType: string;
|
mimeType: string;
|
||||||
checksum: string;
|
checksum: string;
|
||||||
|
|
@ -92,6 +76,7 @@ export interface Post extends MicroPost {
|
||||||
canvasWidth: number;
|
canvasWidth: number;
|
||||||
canvasHeight: number;
|
canvasHeight: number;
|
||||||
contentUrl: string;
|
contentUrl: string;
|
||||||
|
thumbnailUrl: string;
|
||||||
flags: string[];
|
flags: string[];
|
||||||
tags: MicroTag[];
|
tags: MicroTag[];
|
||||||
relations: any[]; // MicroPost resource
|
relations: any[]; // MicroPost resource
|
||||||
|
|
@ -130,21 +115,3 @@ export interface ImageSearchResult {
|
||||||
export interface TemporaryFileUploadResult {
|
export interface TemporaryFileUploadResult {
|
||||||
token: string;
|
token: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface UpdatePostRequest {
|
|
||||||
version: number;
|
|
||||||
tags: string[] | undefined;
|
|
||||||
safety: Safety | undefined;
|
|
||||||
source: string | undefined | null;
|
|
||||||
// relations: string[];
|
|
||||||
// notes: string[],
|
|
||||||
// flags: string[];
|
|
||||||
contentUrl: string | undefined;
|
|
||||||
contentToken: string | undefined;
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface UpdatePoolRequest {
|
|
||||||
version: number;
|
|
||||||
// names?: string[];
|
|
||||||
posts: number[];
|
|
||||||
}
|
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
<!doctype html>
|
<!DOCTYPE html>
|
||||||
<html lang="en">
|
<html lang="en">
|
||||||
<head>
|
<head>
|
||||||
<meta charset="UTF-8" />
|
<meta charset="UTF-8" />
|
||||||
|
|
|
||||||
|
|
@ -1,15 +1,8 @@
|
||||||
import { encodeTagName, getErrorMessage, getUrl } from "~/utils";
|
import { encodeTagName, getErrorMessage } from "~/utils";
|
||||||
import {
|
import { BrowserCommand, PostUploadCommandData, PostUploadInfo, SetPostUploadInfoData, SetExactPostId } from "~/models";
|
||||||
BrowserCommand,
|
import { PostAlreadyUploadedError } from "~/api/models";
|
||||||
PostUploadCommandData,
|
|
||||||
PostUploadInfo,
|
|
||||||
SetPostUploadInfoData,
|
|
||||||
SetExactPostId,
|
|
||||||
PostUpdateCommandData,
|
|
||||||
FetchCommandData,
|
|
||||||
} from "~/models";
|
|
||||||
import { PostAlreadyUploadedError, UpdatePoolRequest } from "~/api/models";
|
|
||||||
import SzurubooruApi from "~/api";
|
import SzurubooruApi from "~/api";
|
||||||
|
import { Config } from "~/config";
|
||||||
|
|
||||||
// Only on dev mode
|
// Only on dev mode
|
||||||
if (import.meta.hot) {
|
if (import.meta.hot) {
|
||||||
|
|
@ -19,54 +12,56 @@ if (import.meta.hot) {
|
||||||
import("./contentScriptHMR");
|
import("./contentScriptHMR");
|
||||||
}
|
}
|
||||||
|
|
||||||
browser.notifications.onClicked.addListener((url) => {
|
|
||||||
if (url) {
|
|
||||||
browser.tabs.create({ url });
|
|
||||||
browser.notifications.clear(url);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
async function uploadPost(data: PostUploadCommandData) {
|
async function uploadPost(data: PostUploadCommandData) {
|
||||||
|
console.dir(data.post);
|
||||||
|
|
||||||
|
const cfg = await Config.load();
|
||||||
|
const selectedSite = cfg.sites.find((x) => x.id == data.siteId);
|
||||||
|
|
||||||
|
if (!selectedSite) {
|
||||||
|
// TODO: Generic error handler which also shows the message in the popup frontend.
|
||||||
|
// browser.runtime.sendMessage(
|
||||||
|
// new BrowserCommand("push_message", new Message("Selected instance not found in config!", "error"))
|
||||||
|
// );
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
const info: PostUploadInfo = {
|
const info: PostUploadInfo = {
|
||||||
state: "uploading",
|
state: "uploading",
|
||||||
};
|
};
|
||||||
|
|
||||||
const pushInfo = () =>
|
|
||||||
browser.runtime.sendMessage(
|
|
||||||
new BrowserCommand("set_post_upload_info", new SetPostUploadInfoData(data.selectedSite.id, data.post.id, info)),
|
|
||||||
);
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const szuru = SzurubooruApi.createFromConfig(data.selectedSite);
|
const szuru = SzurubooruApi.createFromConfig(selectedSite);
|
||||||
|
|
||||||
// Create and upload post
|
// Create and upload post
|
||||||
pushInfo();
|
browser.runtime.sendMessage(
|
||||||
|
new BrowserCommand("set_post_upload_info", new SetPostUploadInfoData(data.siteId, data.post.id, info))
|
||||||
const contentToken = data.post.instanceSpecificData[data.selectedSite.id]?.contentToken;
|
);
|
||||||
|
|
||||||
if (!contentToken) {
|
|
||||||
// TODO: If donmai URL is the source then we need to do the uploadTempFileFromContent here!
|
|
||||||
console.log("contentToken is undefined. This could be a problem for some sources!");
|
|
||||||
}
|
|
||||||
|
|
||||||
|
const contentToken = data.post.instanceSpecificData[data.siteId]?.contentToken;
|
||||||
const createdPost = await szuru.createPost(data.post, contentToken);
|
const createdPost = await szuru.createPost(data.post, contentToken);
|
||||||
|
|
||||||
info.state = "uploaded";
|
info.state = "uploaded";
|
||||||
info.instancePostId = createdPost.id;
|
info.instancePostId = createdPost.id;
|
||||||
pushInfo();
|
|
||||||
|
browser.runtime.sendMessage(
|
||||||
|
new BrowserCommand("set_post_upload_info", new SetPostUploadInfoData(data.siteId, data.post.id, info))
|
||||||
|
);
|
||||||
|
|
||||||
// Find tags with "default" category and update it
|
// Find tags with "default" category and update it
|
||||||
// TODO: Make all these categories configurable
|
// TODO: Make all these categories configurable
|
||||||
const tagsWithCategory = data.post.tags.filter((x) => x.category);
|
const tagsWithCategory = data.post.tags.filter((x) => x.category);
|
||||||
const unsetCategoryTags = createdPost.tags
|
const unsetCategoryTags = createdPost.tags
|
||||||
.filter((x) => x.category == "default")
|
.filter((x) => x.category == "default")
|
||||||
.filter((x) => tagsWithCategory.some((y) => x.names.includes(y.names[0])));
|
.filter((x) => tagsWithCategory.some((y) => x.names.includes(y.name)));
|
||||||
|
|
||||||
if (unsetCategoryTags.length != 0) {
|
if (unsetCategoryTags.length != 0) {
|
||||||
info.updateTagsState = {
|
info.updateTagsState = {
|
||||||
total: unsetCategoryTags.length,
|
total: unsetCategoryTags.length,
|
||||||
};
|
};
|
||||||
pushInfo();
|
browser.runtime.sendMessage(
|
||||||
|
new BrowserCommand("set_post_upload_info", new SetPostUploadInfoData(data.siteId, data.post.id, info))
|
||||||
|
);
|
||||||
|
|
||||||
// unsetCategoryTags is of type MicroTag[] and we need a Tag resource to update it, so let's get those
|
// unsetCategoryTags is of type MicroTag[] and we need a Tag resource to update it, so let's get those
|
||||||
const query = unsetCategoryTags.map((x) => encodeTagName(x.names[0])).join();
|
const query = unsetCategoryTags.map((x) => encodeTagName(x.names[0])).join();
|
||||||
|
|
@ -76,9 +71,11 @@ async function uploadPost(data: PostUploadCommandData) {
|
||||||
|
|
||||||
for (const i in tags) {
|
for (const i in tags) {
|
||||||
info.updateTagsState.current = parseInt(i);
|
info.updateTagsState.current = parseInt(i);
|
||||||
pushInfo();
|
browser.runtime.sendMessage(
|
||||||
|
new BrowserCommand("set_post_upload_info", new SetPostUploadInfoData(data.siteId, data.post.id, info))
|
||||||
|
);
|
||||||
|
|
||||||
const wantedCategory = tagsWithCategory.find((x) => tags[i].names.includes(x.names[0]))?.category;
|
const wantedCategory = tagsWithCategory.find((x) => tags[i].names.includes(x.name))?.category;
|
||||||
if (wantedCategory) {
|
if (wantedCategory) {
|
||||||
if (existingCategories.some((x) => x.name == wantedCategory)) {
|
if (existingCategories.some((x) => x.name == wantedCategory)) {
|
||||||
tags[i].category = wantedCategory;
|
tags[i].category = wantedCategory;
|
||||||
|
|
@ -86,7 +83,7 @@ async function uploadPost(data: PostUploadCommandData) {
|
||||||
categoriesChangedCount++;
|
categoriesChangedCount++;
|
||||||
} else {
|
} else {
|
||||||
console.log(
|
console.log(
|
||||||
`Not adding the '${wantedCategory}' category to the tag '${tags[i].names[0]}' because the szurubooru instance does not have this category.`,
|
`Not adding the '${wantedCategory}' category to the tag '${tags[i].names[0]}' because the szurubooru instance does not have this category.`
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -94,101 +91,31 @@ async function uploadPost(data: PostUploadCommandData) {
|
||||||
|
|
||||||
if (categoriesChangedCount > 0) {
|
if (categoriesChangedCount > 0) {
|
||||||
info.updateTagsState.totalChanged = categoriesChangedCount;
|
info.updateTagsState.totalChanged = categoriesChangedCount;
|
||||||
pushInfo();
|
browser.runtime.sendMessage(
|
||||||
|
new BrowserCommand("set_post_upload_info", new SetPostUploadInfoData(data.siteId, data.post.id, info))
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: This code shouldn't all be in the same try catch.
|
|
||||||
// Add post to pools
|
|
||||||
for (const scrapedPool of data.post.pools) {
|
|
||||||
// Attention! Don't use the .name getter as it does not exist. Just use names[0].
|
|
||||||
const existingPools = await szuru.getPools(encodeTagName(scrapedPool.names[0]), 0, 1, ["id", "posts", "version"]);
|
|
||||||
|
|
||||||
if (existingPools.results.length == 0) {
|
|
||||||
// Pool does not exist. Create a new pool and add the post to it in one API call.
|
|
||||||
console.log(`Creating new pool ${scrapedPool.names[0]} and adding post ${createdPost.id}.`);
|
|
||||||
await szuru.createPool(scrapedPool.names[0], "default", [createdPost.id]);
|
|
||||||
} else {
|
|
||||||
// Pool exists, so add it to the existing pool.
|
|
||||||
const existingPool = existingPools.results[0];
|
|
||||||
const posts = existingPool.posts.map((x) => x.id);
|
|
||||||
posts.push(createdPost.id);
|
|
||||||
|
|
||||||
console.log(`Adding post ${createdPost.id} to existing pool ${existingPool.id}`);
|
|
||||||
|
|
||||||
const updateRequest = <UpdatePoolRequest>{
|
|
||||||
version: existingPool.version,
|
|
||||||
posts,
|
|
||||||
};
|
|
||||||
|
|
||||||
await szuru.updatePool(existingPool.id, updateRequest);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (data.sendNotifications && browser.notifications) {
|
|
||||||
const createdPostUrl = getUrl(data.selectedSite.domain, "post", createdPost.id.toString());
|
|
||||||
browser.notifications.create(createdPostUrl, {
|
|
||||||
type: "basic",
|
|
||||||
iconUrl: browser.runtime.getURL("assets/icon-128.png"),
|
|
||||||
title: data.selectedSite.domain,
|
|
||||||
message: `Uploaded ${data.post.contentUrl}`,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
} catch (ex: any) {
|
} catch (ex: any) {
|
||||||
console.error(ex);
|
|
||||||
if (ex.name && ex.name == "PostAlreadyUploadedError") {
|
if (ex.name && ex.name == "PostAlreadyUploadedError") {
|
||||||
const otherPostId = (ex as PostAlreadyUploadedError).otherPostId;
|
const otherPostId = (ex as PostAlreadyUploadedError).otherPostId;
|
||||||
browser.runtime.sendMessage(
|
browser.runtime.sendMessage(
|
||||||
new BrowserCommand("set_exact_post_id", new SetExactPostId(data.selectedSite.id, data.post.id, otherPostId)),
|
new BrowserCommand("set_exact_post_id", new SetExactPostId(data.siteId, data.post.id, otherPostId))
|
||||||
);
|
);
|
||||||
// We don't set an error message, because we have a different message for posts that are already uploaded.
|
|
||||||
} else {
|
// No error message, because we have a different message for posts that are already uploaded.
|
||||||
// Set generic error message.
|
|
||||||
info.error = getErrorMessage(ex);
|
|
||||||
}
|
|
||||||
info.state = "error";
|
info.state = "error";
|
||||||
pushInfo();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async function updatePost(data: PostUpdateCommandData) {
|
|
||||||
const info: PostUploadInfo = {
|
|
||||||
state: "uploading",
|
|
||||||
instancePostId: data.postId,
|
|
||||||
};
|
|
||||||
|
|
||||||
const pushInfo = () =>
|
|
||||||
browser.runtime.sendMessage(
|
browser.runtime.sendMessage(
|
||||||
new BrowserCommand(
|
new BrowserCommand("set_post_upload_info", new SetPostUploadInfoData(data.siteId, data.post.id, info))
|
||||||
"set_post_update_info",
|
|
||||||
new SetPostUploadInfoData(data.selectedSite.id, `merge-${data.postId}`, info),
|
|
||||||
),
|
|
||||||
);
|
);
|
||||||
|
} else {
|
||||||
try {
|
|
||||||
const szuru = SzurubooruApi.createFromConfig(data.selectedSite);
|
|
||||||
|
|
||||||
pushInfo();
|
|
||||||
|
|
||||||
await szuru.updatePost(data.postId, data.updateRequest);
|
|
||||||
|
|
||||||
info.state = "uploaded";
|
|
||||||
pushInfo();
|
|
||||||
} catch (ex: any) {
|
|
||||||
console.error(ex);
|
|
||||||
info.state = "error";
|
info.state = "error";
|
||||||
info.error = getErrorMessage(ex);
|
info.error = getErrorMessage(ex);
|
||||||
pushInfo();
|
browser.runtime.sendMessage(
|
||||||
|
new BrowserCommand("set_post_upload_info", new SetPostUploadInfoData(data.siteId, data.post.id, info))
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Executes fetch in the background page. This allows us to do "forbidden" stuff, like ignoring CORS headers.
|
|
||||||
* @param data
|
|
||||||
* @returns
|
|
||||||
*/
|
|
||||||
async function executeFetch(data: FetchCommandData) {
|
|
||||||
return await fetch(data.url, data.options);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
async function messageHandler(cmd: BrowserCommand): Promise<any> {
|
async function messageHandler(cmd: BrowserCommand): Promise<any> {
|
||||||
|
|
@ -198,10 +125,6 @@ async function messageHandler(cmd: BrowserCommand): Promise<any> {
|
||||||
switch (cmd.name) {
|
switch (cmd.name) {
|
||||||
case "upload_post":
|
case "upload_post":
|
||||||
return uploadPost(cmd.data);
|
return uploadPost(cmd.data);
|
||||||
case "update_post":
|
|
||||||
return updatePost(cmd.data);
|
|
||||||
case "fetch":
|
|
||||||
return executeFetch(cmd.data);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,154 +0,0 @@
|
||||||
<script setup lang="ts">
|
|
||||||
import axios, { CancelTokenSource } from "axios";
|
|
||||||
|
|
||||||
const inputText = ref("");
|
|
||||||
const autocompleteShown = ref(false);
|
|
||||||
const cancelSource = ref<CancelTokenSource | undefined>(undefined);
|
|
||||||
const autocompleteIndex = ref(-1);
|
|
||||||
|
|
||||||
const props = defineProps({
|
|
||||||
autocompleteItems: {
|
|
||||||
type: Array<any>,
|
|
||||||
required: true,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
const emit = defineEmits(["addItem", "addFromCurrentInput", "autocompletePopulator"]);
|
|
||||||
|
|
||||||
function addItem(item: any) {
|
|
||||||
emit("addItem", item);
|
|
||||||
}
|
|
||||||
|
|
||||||
async function onAddItemKeyUp(e: KeyboardEvent) {
|
|
||||||
await autocompletePopulator((<HTMLInputElement>e.target).value);
|
|
||||||
}
|
|
||||||
|
|
||||||
function addItemFromCurrentInput() {
|
|
||||||
emit("addFromCurrentInput", inputText.value);
|
|
||||||
inputText.value = ""; // Reset input
|
|
||||||
|
|
||||||
// Only needed when the button is clicked
|
|
||||||
// When this is triggered by the enter key the `onAddItemKeyUp` will internally also hide the autocomplete.
|
|
||||||
// Though hiding it twice doesn't hurt so we don't care.
|
|
||||||
hideAutocomplete();
|
|
||||||
}
|
|
||||||
|
|
||||||
function onAddItemKeyDown(e: KeyboardEvent) {
|
|
||||||
if (e.code == "ArrowDown") {
|
|
||||||
e.preventDefault();
|
|
||||||
if (autocompleteIndex.value < props.autocompleteItems.length - 1) {
|
|
||||||
autocompleteIndex.value++;
|
|
||||||
}
|
|
||||||
} else if (e.code == "ArrowUp") {
|
|
||||||
e.preventDefault();
|
|
||||||
if (autocompleteIndex.value >= 0) {
|
|
||||||
autocompleteIndex.value--;
|
|
||||||
}
|
|
||||||
} else if (e.code == "Enter") {
|
|
||||||
if (autocompleteIndex.value == -1) {
|
|
||||||
addItemFromCurrentInput();
|
|
||||||
} else {
|
|
||||||
// Add auto completed item
|
|
||||||
const itemToAdd = props.autocompleteItems[autocompleteIndex.value];
|
|
||||||
addItem(itemToAdd);
|
|
||||||
inputText.value = ""; // Reset input
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function onClickAutocompleteItem(item: any) {
|
|
||||||
addItem(item);
|
|
||||||
inputText.value = ""; // Reset input
|
|
||||||
autocompleteShown.value = false; // Hide autocomplete list
|
|
||||||
}
|
|
||||||
|
|
||||||
function hideAutocomplete() {
|
|
||||||
autocompleteIndex.value = -1;
|
|
||||||
autocompleteShown.value = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
async function autocompletePopulator(input: string) {
|
|
||||||
// Based on https://www.w3schools.com/howto/howto_js_autocomplete.asp
|
|
||||||
|
|
||||||
// Hide autocomplete when the input is empty, and don't do anything else.
|
|
||||||
if (input.length == 0) {
|
|
||||||
hideAutocomplete();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Cancel previous request, not sure if this still works after the refactor.
|
|
||||||
if (cancelSource.value) {
|
|
||||||
cancelSource.value.cancel();
|
|
||||||
}
|
|
||||||
cancelSource.value = axios.CancelToken.source();
|
|
||||||
|
|
||||||
emit("autocompletePopulator", inputText.value, cancelSource.value.token);
|
|
||||||
}
|
|
||||||
|
|
||||||
watch(props, (newValue) => {
|
|
||||||
if (newValue.autocompleteItems.length > 0) {
|
|
||||||
autocompleteShown.value = true;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<template>
|
|
||||||
<div style="display: flex; flex-direction: column">
|
|
||||||
<div style="display: flex">
|
|
||||||
<input type="text" v-model="inputText" @keyup="onAddItemKeyUp" @keydown="onAddItemKeyDown" autocomplete="off" />
|
|
||||||
<button class="primary" style="margin-left: 5px" @click="addItemFromCurrentInput">Add</button>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="autocomplete-items" v-bind:class="{ show: autocompleteShown }">
|
|
||||||
<div
|
|
||||||
v-for="(item, idx) in autocompleteItems"
|
|
||||||
@click="onClickAutocompleteItem(item)"
|
|
||||||
:key="item.name"
|
|
||||||
:class="{
|
|
||||||
active: idx == autocompleteIndex,
|
|
||||||
}"
|
|
||||||
>
|
|
||||||
<slot :item="item"></slot>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<style lang="scss">
|
|
||||||
.autocomplete-items {
|
|
||||||
position: absolute;
|
|
||||||
z-index: 10;
|
|
||||||
background-color: var(--bg-main-color);
|
|
||||||
border: 2px solid var(--primary-color);
|
|
||||||
margin-top: 34px;
|
|
||||||
display: none;
|
|
||||||
|
|
||||||
&.show {
|
|
||||||
display: block;
|
|
||||||
}
|
|
||||||
|
|
||||||
> div {
|
|
||||||
cursor: pointer;
|
|
||||||
padding: 2px 4px;
|
|
||||||
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
gap: 0.5em;
|
|
||||||
|
|
||||||
&:hover {
|
|
||||||
background: var(--primary-color);
|
|
||||||
|
|
||||||
> span {
|
|
||||||
color: var(--text-color);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
> div.active {
|
|
||||||
background: var(--primary-color);
|
|
||||||
|
|
||||||
> span {
|
|
||||||
color: var(--text-color);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
|
|
@ -1,33 +0,0 @@
|
||||||
<script setup lang="ts">
|
|
||||||
import type { PropType } from "vue";
|
|
||||||
import type { PoolDetails } from "~/models";
|
|
||||||
import { breakTagName } from "~/utils";
|
|
||||||
|
|
||||||
defineProps({
|
|
||||||
pools: Array as PropType<PoolDetails[]>,
|
|
||||||
showPostCount: Boolean,
|
|
||||||
showRemovePool: Boolean,
|
|
||||||
});
|
|
||||||
defineEmits(["removePool"]);
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<template>
|
|
||||||
<ul class="compact-pools">
|
|
||||||
<li v-for="pool in pools" :key="pool.name">
|
|
||||||
<a v-if="showRemovePool" class="remove-tag" @click="$emit('removePool', pool)">x</a>
|
|
||||||
<span class="tag-general" v-html="breakTagName(pool.name)"></span>
|
|
||||||
<span v-if="showPostCount" class="tag-usages tag-usages-reserve-space">{{
|
|
||||||
pool.postCount ? pool.postCount : ""
|
|
||||||
}}</span>
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<style scoped lang="scss">
|
|
||||||
/* Hacky way to stop the layout from resizing when we lazy load the usage count. */
|
|
||||||
.tag-usages-reserve-space {
|
|
||||||
min-width: 5ch;
|
|
||||||
/* 5 character width */
|
|
||||||
display: inline-block;
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
|
|
@ -1,31 +0,0 @@
|
||||||
<script setup lang="ts">
|
|
||||||
import type { PropType } from "vue";
|
|
||||||
import type { TagDetails } from "~/models";
|
|
||||||
import { getTagClasses, breakTagName } from "~/utils";
|
|
||||||
|
|
||||||
defineProps({
|
|
||||||
tags: Array as PropType<TagDetails[]>,
|
|
||||||
showUsages: Boolean,
|
|
||||||
showRemoveTag: Boolean,
|
|
||||||
});
|
|
||||||
defineEmits(["removeTag"]);
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<template>
|
|
||||||
<ul class="compact-tags">
|
|
||||||
<li v-for="tag in tags" :key="tag.name">
|
|
||||||
<a v-if="showRemoveTag" class="remove-tag" @click="$emit('removeTag', tag)">x</a>
|
|
||||||
<span :class="getTagClasses(tag)" v-html="breakTagName(tag.name)"></span>
|
|
||||||
<span v-if="showUsages" class="tag-usages tag-usages-reserve-space">{{ tag.usages ? tag.usages : "" }}</span>
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<style scoped lang="scss">
|
|
||||||
/* Hacky way to stop the layout from resizing when we lazy load the usage count. */
|
|
||||||
.tag-usages-reserve-space {
|
|
||||||
min-width: 5ch;
|
|
||||||
/* 5 character width */
|
|
||||||
display: inline-block;
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
|
|
@ -1,47 +0,0 @@
|
||||||
<script setup lang="ts">
|
|
||||||
import { PropType } from "vue";
|
|
||||||
import { PoolDetails } from "~/models";
|
|
||||||
import { encodeTagName, getTagClasses } from "~/utils";
|
|
||||||
import SzurubooruApi from "~/api";
|
|
||||||
import { CancelToken } from "axios";
|
|
||||||
|
|
||||||
const autocompleteItems = ref<PoolDetails[]>([]);
|
|
||||||
|
|
||||||
const props = defineProps({
|
|
||||||
szuru: Object as PropType<SzurubooruApi>,
|
|
||||||
});
|
|
||||||
const emit = defineEmits(["addPool"]);
|
|
||||||
|
|
||||||
function addPool(tag: PoolDetails) {
|
|
||||||
emit("addPool", tag);
|
|
||||||
}
|
|
||||||
|
|
||||||
function addPoolFromCurrentInput(input: string) {
|
|
||||||
addPool(new PoolDetails([input]));
|
|
||||||
}
|
|
||||||
|
|
||||||
async function autocompletePopulator(input: string, ct: CancelToken) {
|
|
||||||
const query = decodeURIComponent(`*${encodeTagName(input)}*`);
|
|
||||||
const res = await props.szuru?.getPools(query, 0, 100, ["id", "names", "category", "description", "postCount"], ct);
|
|
||||||
|
|
||||||
if (res) {
|
|
||||||
// TODO: Maybe search on hamming distance or something?
|
|
||||||
autocompleteItems.value = res.results.map((x) => PoolDetails.fromPool(x));
|
|
||||||
} else {
|
|
||||||
autocompleteItems.value = [];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<template>
|
|
||||||
<AutocompleteInput
|
|
||||||
:autocomplete-items="autocompleteItems"
|
|
||||||
@add-item="addPool"
|
|
||||||
@add-from-current-input="addPoolFromCurrentInput"
|
|
||||||
@autocomplete-populator="autocompletePopulator"
|
|
||||||
v-slot="slotProps"
|
|
||||||
>
|
|
||||||
<span :class="getTagClasses(slotProps.item)">{{ slotProps.item.name }}</span>
|
|
||||||
<span class="tag-usages">{{ slotProps.item.usages ? slotProps.item.usages : "" }}</span>
|
|
||||||
</AutocompleteInput>
|
|
||||||
</template>
|
|
||||||
|
|
@ -1,39 +0,0 @@
|
||||||
<script setup lang="ts">
|
|
||||||
const props = defineProps({
|
|
||||||
modelValue: {
|
|
||||||
type: Boolean,
|
|
||||||
default: true,
|
|
||||||
},
|
|
||||||
toggleable: {
|
|
||||||
type: Boolean,
|
|
||||||
},
|
|
||||||
header: {
|
|
||||||
type: String,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
defineEmits(["update:modelValue"]);
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<template>
|
|
||||||
<div class="popup-section">
|
|
||||||
<div
|
|
||||||
class="section-header"
|
|
||||||
:class="{
|
|
||||||
toggleable: props.toggleable,
|
|
||||||
}"
|
|
||||||
@click="$emit('update:modelValue', !props.modelValue)"
|
|
||||||
>
|
|
||||||
<slot name="header">
|
|
||||||
<span>{{ props.header }}</span>
|
|
||||||
<template v-if="props.toggleable">
|
|
||||||
<font-awesome-icon v-show="props.modelValue" icon="fa-solid fa-chevron-up" class="cursor-pointer" />
|
|
||||||
<font-awesome-icon v-show="!props.modelValue" icon="fa-solid fa-chevron-down" class="cursor-pointer" />
|
|
||||||
</template>
|
|
||||||
</slot>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<slot v-if="props.modelValue"></slot>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<style lang="scss" scoped></style>
|
|
||||||
|
|
@ -1,51 +0,0 @@
|
||||||
<script setup lang="ts">
|
|
||||||
defineProps({
|
|
||||||
contentUrl: String,
|
|
||||||
notes: {
|
|
||||||
type: Array,
|
|
||||||
default: () => [],
|
|
||||||
},
|
|
||||||
contentType: String,
|
|
||||||
});
|
|
||||||
|
|
||||||
const emit = defineEmits(["onResolutionLoaded"]);
|
|
||||||
|
|
||||||
const imgEl = ref<HTMLImageElement | undefined>(undefined);
|
|
||||||
|
|
||||||
// Get image width and height from the <img> element.
|
|
||||||
// This works because we load the full-resolution image in the <img> element.
|
|
||||||
// This code might stop showing correct resolutions if/when we implement a progressive image loading.
|
|
||||||
function onloadImage() {
|
|
||||||
// I guess post/selectedPost could have a race condition here?
|
|
||||||
// Seems very unlikely though, as the load event gets cancelled as soon as we change the :src attribute.
|
|
||||||
// A race condition might even be impossible then.
|
|
||||||
if (imgEl.value) {
|
|
||||||
emit("onResolutionLoaded", [imgEl.value.naturalWidth, imgEl.value.naturalHeight]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<template>
|
|
||||||
<div class="post-container">
|
|
||||||
<img v-if="contentType == 'image'" ref="imgEl" :src="contentUrl" @load="onloadImage" />
|
|
||||||
<video v-if="contentType == 'video'" controls>
|
|
||||||
<source :src="contentUrl" />
|
|
||||||
</video>
|
|
||||||
<div class="post-overlay">
|
|
||||||
<PostNotes :notes="notes" />
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<style scoped lang="scss">
|
|
||||||
.post-overlay {
|
|
||||||
position: absolute;
|
|
||||||
width: 100%;
|
|
||||||
height: 100%;
|
|
||||||
}
|
|
||||||
|
|
||||||
.post-container {
|
|
||||||
position: relative;
|
|
||||||
display: flex;
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
|
|
@ -1,29 +0,0 @@
|
||||||
<script setup lang="ts">
|
|
||||||
import byteSize from "byte-size";
|
|
||||||
import { PropType } from "vue";
|
|
||||||
import { ScrapedPostDetails } from "~/models";
|
|
||||||
import { resolutionToString } from "~/utils";
|
|
||||||
|
|
||||||
defineProps({
|
|
||||||
modelValue: {
|
|
||||||
required: true,
|
|
||||||
type: Object as PropType<ScrapedPostDetails>,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<template>
|
|
||||||
<div class="basic-info-inline">
|
|
||||||
<span v-if="modelValue.contentSize">{{ byteSize(modelValue.contentSize) }}</span>
|
|
||||||
<span v-if="modelValue.contentSubType">{{ modelValue.contentSubType }}</span>
|
|
||||||
<span v-if="modelValue.resolution">({{ resolutionToString(modelValue.resolution) }})</span>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<style scoped lang="scss">
|
|
||||||
.basic-info-inline {
|
|
||||||
display: flex;
|
|
||||||
gap: 0 1ch;
|
|
||||||
flex-wrap: wrap;
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
|
|
@ -2,10 +2,7 @@
|
||||||
import { ScrapedNote } from "neo-scraper";
|
import { ScrapedNote } from "neo-scraper";
|
||||||
|
|
||||||
class Point {
|
class Point {
|
||||||
constructor(
|
constructor(public x: any, public y: any) {}
|
||||||
public x: any,
|
|
||||||
public y: any,
|
|
||||||
) {}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// HACK: Copied from old client
|
// HACK: Copied from old client
|
||||||
|
|
|
||||||
|
|
@ -1,48 +0,0 @@
|
||||||
<script setup lang="ts">
|
|
||||||
import { PropType } from "vue";
|
|
||||||
import { TagDetails } from "~/models";
|
|
||||||
import { encodeTagName, getTagClasses } from "~/utils";
|
|
||||||
import SzurubooruApi from "~/api";
|
|
||||||
import { CancelToken } from "axios";
|
|
||||||
|
|
||||||
const autocompleteItems = ref<TagDetails[]>([]);
|
|
||||||
|
|
||||||
const props = defineProps({
|
|
||||||
szuru: Object as PropType<SzurubooruApi>,
|
|
||||||
});
|
|
||||||
const emit = defineEmits(["addTag"]);
|
|
||||||
|
|
||||||
function addTag(tag: TagDetails) {
|
|
||||||
emit("addTag", tag);
|
|
||||||
}
|
|
||||||
|
|
||||||
function addTagFromCurrentInput(input: string) {
|
|
||||||
addTag(new TagDetails([input]));
|
|
||||||
}
|
|
||||||
|
|
||||||
async function autocompletePopulator(input: string, ct: CancelToken) {
|
|
||||||
const query = decodeURIComponent(`*${encodeTagName(input)}* sort:usages`);
|
|
||||||
const res = await props.szuru?.getTags(query, 0, 100, ["names", "category", "usages", "implications"], ct);
|
|
||||||
|
|
||||||
if (res) {
|
|
||||||
// TODO: Maybe search on hamming distance or something?
|
|
||||||
autocompleteItems.value = res.results.map((x) => TagDetails.fromTag(x));
|
|
||||||
console.dir(autocompleteItems.value);
|
|
||||||
} else {
|
|
||||||
autocompleteItems.value = [];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<template>
|
|
||||||
<AutocompleteInput
|
|
||||||
:autocomplete-items="autocompleteItems"
|
|
||||||
@add-item="addTag"
|
|
||||||
@add-from-current-input="addTagFromCurrentInput"
|
|
||||||
@autocomplete-populator="autocompletePopulator"
|
|
||||||
v-slot="slotProps"
|
|
||||||
>
|
|
||||||
<span :class="getTagClasses(slotProps.item)">{{ slotProps.item.name }}</span>
|
|
||||||
<span class="tag-usages">{{ slotProps.item.usages ? slotProps.item.usages : "" }}</span>
|
|
||||||
</AutocompleteInput>
|
|
||||||
</template>
|
|
||||||
|
|
@ -1,24 +0,0 @@
|
||||||
import { storage } from "webextension-polyfill";
|
|
||||||
import type { MaybeRef, RemovableRef, StorageLikeAsync, UseStorageAsyncOptions } from "@vueuse/core";
|
|
||||||
import { useStorageAsync } from "@vueuse/core";
|
|
||||||
|
|
||||||
const storageLocal: StorageLikeAsync = {
|
|
||||||
removeItem(key: string) {
|
|
||||||
return storage.local.remove(key);
|
|
||||||
},
|
|
||||||
|
|
||||||
setItem(key: string, value: string) {
|
|
||||||
return storage.local.set({ [key]: value });
|
|
||||||
},
|
|
||||||
|
|
||||||
async getItem(key: string) {
|
|
||||||
const item = (await storage.local.get(key))[key];
|
|
||||||
return item;
|
|
||||||
},
|
|
||||||
};
|
|
||||||
|
|
||||||
export const useStorageLocal = <T>(
|
|
||||||
key: string,
|
|
||||||
initialValue: MaybeRef<T>,
|
|
||||||
options?: UseStorageAsyncOptions<T>,
|
|
||||||
): RemovableRef<T> => useStorageAsync(key, initialValue, storageLocal, options);
|
|
||||||
|
|
@ -0,0 +1,39 @@
|
||||||
|
export class SzuruSiteConfig {
|
||||||
|
id = window.crypto.randomUUID();
|
||||||
|
domain = "https://example.com";
|
||||||
|
username = "user";
|
||||||
|
authToken = "";
|
||||||
|
}
|
||||||
|
|
||||||
|
export class Config {
|
||||||
|
importExistingTags = true;
|
||||||
|
importAllTags = false;
|
||||||
|
importCommentary = false;
|
||||||
|
addPageUrlToSource = true;
|
||||||
|
autoSearchSimilar = false;
|
||||||
|
loadTagCounts = true;
|
||||||
|
useContentTokens = true;
|
||||||
|
sites: Array<SzuruSiteConfig> = [];
|
||||||
|
selectedSiteId?: string;
|
||||||
|
|
||||||
|
public async save() {
|
||||||
|
await browser.storage.local.set({
|
||||||
|
config: JSON.stringify(this),
|
||||||
|
});
|
||||||
|
|
||||||
|
console.dir("Save " + JSON.stringify(this));
|
||||||
|
console.log("Saved config");
|
||||||
|
}
|
||||||
|
|
||||||
|
static async load(): Promise<Config> {
|
||||||
|
const storage = await browser.storage.local.get("config");
|
||||||
|
let config: Config = new Config();
|
||||||
|
|
||||||
|
if ("config" in storage) {
|
||||||
|
config = Object.assign(config, JSON.parse(storage["config"]));
|
||||||
|
}
|
||||||
|
|
||||||
|
console.dir("Load " + JSON.stringify(config));
|
||||||
|
return config;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -1,23 +0,0 @@
|
||||||
import { TagCategoryColor } from "./models";
|
|
||||||
|
|
||||||
export function makeCssName(prefix: string, name: string) {
|
|
||||||
return prefix + "-" + name.replace(/[^a-z0-9]/g, "_");
|
|
||||||
}
|
|
||||||
|
|
||||||
export function refreshTagCategoryColorMap(tagCategories: TagCategoryColor[], styleElement?: HTMLStyleElement) {
|
|
||||||
if (styleElement) {
|
|
||||||
document.head.removeChild(styleElement);
|
|
||||||
}
|
|
||||||
styleElement = document.createElement("style");
|
|
||||||
document.head.appendChild(styleElement);
|
|
||||||
for (const category of tagCategories) {
|
|
||||||
const ruleName = makeCssName("tag", category.name);
|
|
||||||
|
|
||||||
if (styleElement.sheet) {
|
|
||||||
styleElement.sheet.insertRule(`.${ruleName} { color: ${category.color} }`, styleElement.sheet.cssRules.length);
|
|
||||||
} else {
|
|
||||||
console.error("styleElement.sheet is undefined. This should never happen!");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return styleElement;
|
|
||||||
}
|
|
||||||
|
|
@ -1,20 +1,9 @@
|
||||||
import type { App } from "vue";
|
import type { App } from "vue";
|
||||||
import { library } from "@fortawesome/fontawesome-svg-core";
|
import { library } from "@fortawesome/fontawesome-svg-core";
|
||||||
import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
|
import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
|
||||||
import { faCog, faChevronDown, faChevronUp, faChevronLeft } from "@fortawesome/free-solid-svg-icons";
|
import { faCog } from "@fortawesome/free-solid-svg-icons";
|
||||||
import { createPinia } from "pinia";
|
|
||||||
|
|
||||||
export function setupPinia(app: App) {
|
|
||||||
const pinia = createPinia();
|
|
||||||
app.use(pinia);
|
|
||||||
}
|
|
||||||
|
|
||||||
export function setupApp(app: App) {
|
export function setupApp(app: App) {
|
||||||
setupPinia(app);
|
|
||||||
|
|
||||||
library.add(faCog);
|
library.add(faCog);
|
||||||
library.add(faChevronDown);
|
|
||||||
library.add(faChevronUp);
|
|
||||||
library.add(faChevronLeft);
|
|
||||||
app.component("font-awesome-icon", FontAwesomeIcon);
|
app.component("font-awesome-icon", FontAwesomeIcon);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@ export async function getManifest() {
|
||||||
const manifest: Manifest.WebExtensionManifest = {
|
const manifest: Manifest.WebExtensionManifest = {
|
||||||
name: pkg.displayName,
|
name: pkg.displayName,
|
||||||
description: pkg.description,
|
description: pkg.description,
|
||||||
version: process.env.VITE_SZ_VERSION || pkg.version,
|
version: process.env.SZ_VERSION || pkg.version,
|
||||||
manifest_version: 2,
|
manifest_version: 2,
|
||||||
icons: {
|
icons: {
|
||||||
16: "./assets/icon-128.png",
|
16: "./assets/icon-128.png",
|
||||||
|
|
@ -31,26 +31,19 @@ export async function getManifest() {
|
||||||
page: "./dist/background/index.html",
|
page: "./dist/background/index.html",
|
||||||
// persistent: false,
|
// persistent: false,
|
||||||
},
|
},
|
||||||
permissions: ["storage", "activeTab", "webRequest", "webRequestBlocking", "notifications", "<all_urls>"],
|
permissions: ["storage", "activeTab", "webRequest", "webRequestBlocking", "<all_urls>"],
|
||||||
content_scripts: [
|
content_scripts: [
|
||||||
{
|
{
|
||||||
matches: ["http://*/*", "https://*/*"],
|
matches: ["http://*/*", "https://*/*"],
|
||||||
js: ["./dist/contentScripts/index.global.js"],
|
js: ["./dist/contentScripts/index.global.js"],
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
};
|
browser_specific_settings: {
|
||||||
|
|
||||||
if (process.env.SZ_GECKO_ID) {
|
|
||||||
manifest.browser_specific_settings = {
|
|
||||||
gecko: {
|
gecko: {
|
||||||
id: `{${process.env.SZ_GECKO_ID}}`,
|
id: "{13372607-2257-4360-8f51-5ce66fa73350}",
|
||||||
strict_min_version: "113.0",
|
|
||||||
},
|
},
|
||||||
gecko_android: {
|
|
||||||
strict_min_version: "113.0",
|
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
}
|
|
||||||
|
|
||||||
if (isDev) {
|
if (isDev) {
|
||||||
// for content script, as browsers will cache them for each reload,
|
// for content script, as browsers will cache them for each reload,
|
||||||
|
|
|
||||||
|
|
@ -1,21 +1,13 @@
|
||||||
import { BooruTypes, ContentType, ScrapedNote, ScrapedPost, ScrapedTag, UploadMode } from "neo-scraper";
|
import { BooruTypes, ContentType, ScrapedNote, ScrapedPost, ScrapedTag } from "neo-scraper";
|
||||||
import { MicroTag, Pool, Tag, UpdatePostRequest } from "~/api/models";
|
import { MicroTag, Tag } from "~/api/models";
|
||||||
|
|
||||||
export class TagDetails {
|
export class TagDetails {
|
||||||
public implications: TagDetails[] = [];
|
public implications: TagDetails[] = [];
|
||||||
|
|
||||||
constructor(
|
constructor(public name: string, public category?: string, public usages?: number) {}
|
||||||
public names: string[],
|
|
||||||
public category?: string,
|
|
||||||
public usages?: number,
|
|
||||||
) {}
|
|
||||||
|
|
||||||
get name() {
|
|
||||||
return this.names[0];
|
|
||||||
}
|
|
||||||
|
|
||||||
static fromTag(tag: Tag) {
|
static fromTag(tag: Tag) {
|
||||||
const x = new TagDetails(tag.names, tag.category, tag.usages);
|
const x = new TagDetails(tag.names[0], tag.category, tag.usages);
|
||||||
|
|
||||||
if (tag.implications) {
|
if (tag.implications) {
|
||||||
x.implications = tag.implications.map((y) => TagDetails.fromMicroTag(y));
|
x.implications = tag.implications.map((y) => TagDetails.fromMicroTag(y));
|
||||||
|
|
@ -25,27 +17,11 @@ export class TagDetails {
|
||||||
}
|
}
|
||||||
|
|
||||||
static fromMicroTag(tag: MicroTag) {
|
static fromMicroTag(tag: MicroTag) {
|
||||||
return new TagDetails(tag.names, tag.category, tag.usages);
|
return new TagDetails(tag.names[0], tag.category, tag.usages);
|
||||||
}
|
}
|
||||||
|
|
||||||
static fromScapedTag(tag: ScrapedTag): TagDetails {
|
static fromScapedTag(tag: ScrapedTag): TagDetails {
|
||||||
return new TagDetails([tag.name], tag.category);
|
return new TagDetails(tag.name, tag.category);
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
export class PoolDetails {
|
|
||||||
constructor(
|
|
||||||
public names: string[],
|
|
||||||
public category?: string,
|
|
||||||
public postCount?: number,
|
|
||||||
) {}
|
|
||||||
|
|
||||||
get name() {
|
|
||||||
return this.names[0];
|
|
||||||
}
|
|
||||||
|
|
||||||
static fromPool(pool: Pool) {
|
|
||||||
return new PoolDetails(pool.names, pool.category, pool.postCount);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -64,25 +40,18 @@ export class ScrapedPostDetails {
|
||||||
id = window.crypto.randomUUID();
|
id = window.crypto.randomUUID();
|
||||||
name = "";
|
name = "";
|
||||||
tags: TagDetails[] = [];
|
tags: TagDetails[] = [];
|
||||||
pools: PoolDetails[] = [];
|
|
||||||
notes: ScrapedNote[];
|
notes: ScrapedNote[];
|
||||||
contentUrl: string;
|
contentUrl: string;
|
||||||
extraContentUrl: string | undefined;
|
|
||||||
contentSize: number | undefined;
|
|
||||||
pageUrl: string;
|
pageUrl: string;
|
||||||
contentType: ContentType;
|
contentType: ContentType;
|
||||||
contentSubType: string | undefined;
|
|
||||||
rating: BooruTypes.SafetyRating;
|
rating: BooruTypes.SafetyRating;
|
||||||
source;
|
source = "";
|
||||||
uploadMode: UploadMode;
|
|
||||||
referrer?: string;
|
referrer?: string;
|
||||||
resolution?: [number, number];
|
resolution?: [number, number];
|
||||||
instanceSpecificData: MappedInstanceSpecificData = {};
|
instanceSpecificData: MappedInstanceSpecificData = {};
|
||||||
|
|
||||||
constructor(post: ScrapedPost) {
|
constructor(post: ScrapedPost) {
|
||||||
this.contentUrl = post.contentUrl;
|
this.contentUrl = post.contentUrl;
|
||||||
this.extraContentUrl = post.extraContentUrl;
|
|
||||||
// this.contentSize = post.contentSize;
|
|
||||||
this.pageUrl = post.pageUrl;
|
this.pageUrl = post.pageUrl;
|
||||||
this.contentType = post.contentType;
|
this.contentType = post.contentType;
|
||||||
this.rating = post.rating;
|
this.rating = post.rating;
|
||||||
|
|
@ -91,7 +60,6 @@ export class ScrapedPostDetails {
|
||||||
this.tags = post.tags.map((x) => TagDetails.fromScapedTag(x));
|
this.tags = post.tags.map((x) => TagDetails.fromScapedTag(x));
|
||||||
this.notes = post.notes;
|
this.notes = post.notes;
|
||||||
this.resolution = post.resolution;
|
this.resolution = post.resolution;
|
||||||
this.uploadMode = post.uploadMode;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -106,10 +74,7 @@ export interface SimpleSimilarPost {
|
||||||
}
|
}
|
||||||
|
|
||||||
export class SimilarPostInfo {
|
export class SimilarPostInfo {
|
||||||
constructor(
|
constructor(public readonly id: number, public readonly percentage: number) {}
|
||||||
public readonly id: number,
|
|
||||||
public readonly percentage: number,
|
|
||||||
) {}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export type PostUploadState = "uploading" | "uploaded" | "error";
|
export type PostUploadState = "uploading" | "uploaded" | "error";
|
||||||
|
|
@ -125,14 +90,7 @@ export class PostUploadInfo {
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
export type BrowserCommandName =
|
export type BrowserCommandName = "grab_post" | "upload_post" | "set_post_upload_info" | "set_exact_post_id";
|
||||||
| "grab_post"
|
|
||||||
| "upload_post"
|
|
||||||
| "set_post_upload_info"
|
|
||||||
| "set_exact_post_id"
|
|
||||||
| "update_post"
|
|
||||||
| "set_post_update_info"
|
|
||||||
| "fetch";
|
|
||||||
|
|
||||||
export class BrowserCommand<T = any> {
|
export class BrowserCommand<T = any> {
|
||||||
name: BrowserCommandName;
|
name: BrowserCommandName;
|
||||||
|
|
@ -145,18 +103,14 @@ export class BrowserCommand<T = any> {
|
||||||
}
|
}
|
||||||
|
|
||||||
export class PostUploadCommandData {
|
export class PostUploadCommandData {
|
||||||
constructor(
|
constructor(public readonly post: ScrapedPostDetails, public readonly siteId: string) {}
|
||||||
public readonly post: ScrapedPostDetails,
|
|
||||||
public readonly selectedSite: SzuruSiteConfig,
|
|
||||||
public readonly sendNotifications: boolean,
|
|
||||||
) {}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export class SetPostUploadInfoData {
|
export class SetPostUploadInfoData {
|
||||||
constructor(
|
constructor(
|
||||||
public instanceId: string,
|
public readonly instanceId: string,
|
||||||
public postId: string,
|
public readonly postId: string,
|
||||||
public info: PostUploadInfo,
|
public readonly info: PostUploadInfo
|
||||||
) {}
|
) {}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -164,42 +118,6 @@ export class SetExactPostId {
|
||||||
constructor(
|
constructor(
|
||||||
public readonly instanceId: string,
|
public readonly instanceId: string,
|
||||||
public readonly postId: string,
|
public readonly postId: string,
|
||||||
public readonly exactPostId: number,
|
public readonly exactPostId: number
|
||||||
) {}
|
) {}
|
||||||
}
|
}
|
||||||
|
|
||||||
export class PostUpdateCommandData {
|
|
||||||
constructor(
|
|
||||||
public readonly postId: number,
|
|
||||||
public readonly updateRequest: UpdatePostRequest,
|
|
||||||
public readonly selectedSite: SzuruSiteConfig,
|
|
||||||
) {}
|
|
||||||
}
|
|
||||||
|
|
||||||
export class FetchCommandData {
|
|
||||||
constructor(
|
|
||||||
public readonly url: string,
|
|
||||||
public readonly options: RequestInit | undefined = undefined,
|
|
||||||
) {}
|
|
||||||
}
|
|
||||||
|
|
||||||
export class SzuruSiteConfig {
|
|
||||||
id = window.crypto.randomUUID();
|
|
||||||
domain = "https://example.com";
|
|
||||||
username = "user";
|
|
||||||
authToken = "";
|
|
||||||
}
|
|
||||||
|
|
||||||
export class TagCategoryColor {
|
|
||||||
constructor(
|
|
||||||
public name: string,
|
|
||||||
public color: string,
|
|
||||||
) {}
|
|
||||||
}
|
|
||||||
|
|
||||||
export const getDefaultTagCategories = () => [
|
|
||||||
new TagCategoryColor("copyright", "#a0a"),
|
|
||||||
new TagCategoryColor("character", "#0a0"),
|
|
||||||
new TagCategoryColor("artist", "#a00"),
|
|
||||||
new TagCategoryColor("meta", "#f80"),
|
|
||||||
];
|
|
||||||
|
|
|
||||||
|
|
@ -1,34 +1,24 @@
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { useColorMode } from "@vueuse/core";
|
import { useColorMode } from "@vueuse/core";
|
||||||
import SzuruWrapper from "~/api";
|
import SzuruWrapper from "~/api";
|
||||||
import { cfg } from "~/stores";
|
import { Config, SzuruSiteConfig } from "~/config";
|
||||||
import { getErrorMessage } from "~/utils";
|
import { getErrorMessage } from "~/utils";
|
||||||
|
|
||||||
import TabView from "primevue/tabview";
|
let autoSearchSimilar = ref(false);
|
||||||
import TabPanel from "primevue/tabpanel";
|
let loadTagCounts = ref(false);
|
||||||
import DataTable from "primevue/datatable";
|
let addPageUrlToSource = ref(false);
|
||||||
import Column from "primevue/column";
|
let useContentTokens = ref(false);
|
||||||
import { TagDetails, SzuruSiteConfig, TagCategoryColor, getDefaultTagCategories } from "~/models";
|
let statusText = ref("");
|
||||||
import SzurubooruApi from "~/api";
|
let statusType = ref("");
|
||||||
|
let sites = reactive<SzuruSiteConfig[]>([]);
|
||||||
type StatusType = "success" | "error" | "quiet";
|
let selectedSiteId = ref<string | undefined>(undefined);
|
||||||
|
|
||||||
const statusText = ref("");
|
|
||||||
const statusType = ref("status-quiet");
|
|
||||||
const versionInfo = "Version: " + (import.meta.env.VITE_SZ_VERSION ?? browser.runtime.getManifest().version);
|
|
||||||
|
|
||||||
const columns = ref([
|
|
||||||
{ field: "name", header: "Category name" },
|
|
||||||
{ field: "color", header: "CSS color" },
|
|
||||||
]);
|
|
||||||
|
|
||||||
const selectedSite = computed(() => {
|
const selectedSite = computed(() => {
|
||||||
if (cfg.value.selectedSiteId) {
|
if (selectedSiteId.value) {
|
||||||
return cfg.value.sites.find((x) => x.id == cfg.value.selectedSiteId);
|
return sites.find((x) => x.id == selectedSiteId.value);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
const mode = useColorMode({ emitAuto: true });
|
type StatusType = "success" | "error";
|
||||||
|
|
||||||
async function testConnection() {
|
async function testConnection() {
|
||||||
if (
|
if (
|
||||||
|
|
@ -56,6 +46,21 @@ async function testConnection() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async function saveSettings() {
|
||||||
|
let config = await Config.load();
|
||||||
|
|
||||||
|
config.sites = sites;
|
||||||
|
config.autoSearchSimilar = autoSearchSimilar.value;
|
||||||
|
config.loadTagCounts = loadTagCounts.value;
|
||||||
|
config.addPageUrlToSource = addPageUrlToSource.value;
|
||||||
|
config.useContentTokens = useContentTokens.value;
|
||||||
|
config.selectedSiteId = selectedSiteId.value;
|
||||||
|
|
||||||
|
await config.save();
|
||||||
|
|
||||||
|
setStatus("Settings successfully saved");
|
||||||
|
}
|
||||||
|
|
||||||
function setStatus(text: string, type: StatusType = "success") {
|
function setStatus(text: string, type: StatusType = "success") {
|
||||||
statusText.value = text;
|
statusText.value = text;
|
||||||
statusType.value = "status-" + type;
|
statusType.value = "status-" + type;
|
||||||
|
|
@ -63,179 +68,55 @@ function setStatus(text: string, type: StatusType = "success") {
|
||||||
|
|
||||||
function addSite() {
|
function addSite() {
|
||||||
const site = new SzuruSiteConfig();
|
const site = new SzuruSiteConfig();
|
||||||
cfg.value.sites.push(site);
|
sites.push(site);
|
||||||
cfg.value.selectedSiteId = site.id;
|
selectedSiteId.value = site.id;
|
||||||
}
|
}
|
||||||
|
|
||||||
function removeSelectedSite() {
|
function removeSelectedSite() {
|
||||||
if (selectedSite.value) {
|
if (selectedSite.value) {
|
||||||
const idx = cfg.value.sites.indexOf(selectedSite.value);
|
const idx = sites.indexOf(selectedSite.value);
|
||||||
cfg.value.sites.splice(idx, 1);
|
sites.splice(idx, 1);
|
||||||
}
|
|
||||||
|
|
||||||
// Select first site in list, if it exists.
|
|
||||||
if (cfg.value.sites.length > 0) {
|
|
||||||
cfg.value.selectedSiteId = cfg.value.sites[0].id;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function resetTagCategories() {
|
onMounted(async () => {
|
||||||
cfg.value.tagCategories.splice(0);
|
let config = await Config.load();
|
||||||
cfg.value.tagCategories.push(...getDefaultTagCategories());
|
|
||||||
|
for (let site of config.sites) {
|
||||||
|
// Generate IDs for sites which are missing them.
|
||||||
|
// This is needed to correctly import old configs.
|
||||||
|
if (!site.id) {
|
||||||
|
site.id = window.crypto.randomUUID();
|
||||||
}
|
}
|
||||||
|
|
||||||
function addTagCategory() {
|
// This somehow makes `site` reactive.
|
||||||
cfg.value.tagCategories.push(new TagCategoryColor("category", "#abcdef"));
|
sites.push(site);
|
||||||
}
|
}
|
||||||
|
|
||||||
async function importTagCategoriesFromInstance() {
|
autoSearchSimilar.value = config.autoSearchSimilar;
|
||||||
const szuruConfig = cfg.value.sites.find((x) => x.id == cfg.value.selectedSiteId)!;
|
loadTagCounts.value = config.loadTagCounts;
|
||||||
const szuru = SzurubooruApi.createFromConfig(szuruConfig);
|
addPageUrlToSource.value = config.addPageUrlToSource;
|
||||||
const cats = (await szuru.getTagCategories()).results;
|
useContentTokens.value = config.useContentTokens;
|
||||||
|
selectedSiteId.value = config.selectedSiteId;
|
||||||
|
});
|
||||||
|
|
||||||
for (const cat of cats) {
|
let mode = useColorMode({ emitAuto: true });
|
||||||
if (cat.name == "default") continue;
|
|
||||||
|
|
||||||
if (!cfg.value.tagCategories.find((x) => x.name == cat.name)) {
|
|
||||||
cfg.value.tagCategories.push(new TagCategoryColor(cat.name, cat.color));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function addTagIgnore() {
|
|
||||||
cfg.value.tagIgnores.push(new TagDetails([""]));
|
|
||||||
}
|
|
||||||
|
|
||||||
function resetTagIgnores() {
|
|
||||||
cfg.value.tagIgnores.splice(0);
|
|
||||||
}
|
|
||||||
|
|
||||||
// For debugging
|
|
||||||
const wnd = window as any;
|
|
||||||
wnd.szc_get_config = () => JSON.parse(JSON.stringify(cfg.value));
|
|
||||||
wnd.szc_set_config_version = (v = 0) => (cfg.value.version = v);
|
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<div class="content-holder">
|
<div class="content-holder">
|
||||||
<div class="content-wrapper flex flex-auto flex-column gap-3">
|
<div class="content-wrapper flex flex-wrap gap-3">
|
||||||
<div><strong>SzuruChrome Settings</strong></div>
|
<div class="flex-fit"><strong>SzuruChrome Settings</strong></div>
|
||||||
|
|
||||||
<TabView>
|
<div class="flex-fit">
|
||||||
<TabPanel header="General">
|
<div class="fit flex flex-wrap">
|
||||||
<div class="grid">
|
<div class="flex-fit">
|
||||||
<div class="col-12 md:col-6">
|
<label>Szurubooru Instances</label>
|
||||||
<label>
|
|
||||||
<input type="checkbox" v-model="cfg.addPageUrlToSource" />
|
|
||||||
Add page URL to the source list
|
|
||||||
</label>
|
|
||||||
<p class="hint">
|
|
||||||
This will add the current page URL (e.g. the booru link) to the source list in addition to the actual
|
|
||||||
source (e.g. twitter/pixiv/artstation). Note: if the source is empty/not detected then the page URL will
|
|
||||||
always be used as fallback source.
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="col-12 md:col-6">
|
<!-- This isn't perfectly responsive for very small devices. -->
|
||||||
<label>
|
<div class="fit flex gap-1 flex-fit">
|
||||||
<input type="checkbox" v-model="cfg.addAllParsedTags" />
|
<select v-model="selectedSiteId">
|
||||||
Automatically import all tags on supported pages
|
<option v-for="site in sites" :key="site.id" :value="site.id">
|
||||||
</label>
|
|
||||||
<p class="hint">
|
|
||||||
This will automatically import all tags, including their categories, on supported pages such as Danbooru
|
|
||||||
and Zerochan.
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="col-12 md:col-6">
|
|
||||||
<label>
|
|
||||||
<input type="checkbox" v-model="cfg.alwaysUploadAsContent" />
|
|
||||||
Always upload as content
|
|
||||||
</label>
|
|
||||||
<p class="hint">This will always upload the image content directly, instead of as an URL</p>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="col-12 md:col-6">
|
|
||||||
<label>
|
|
||||||
<input type="checkbox" v-model="cfg.sendUploadNotifications" />
|
|
||||||
Send browser notifications after uploading
|
|
||||||
</label>
|
|
||||||
<p class="hint">
|
|
||||||
This will send a browser notification after a successful upload. Clicking the notification will open the
|
|
||||||
uploaded post in a new tab.
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<span class="col-12 status-quiet">{{ versionInfo }}</span>
|
|
||||||
</div>
|
|
||||||
</TabPanel>
|
|
||||||
|
|
||||||
<TabPanel header="Interface">
|
|
||||||
<div class="grid">
|
|
||||||
<div class="col-12 md:col-6 mb-2">
|
|
||||||
<label>Theme</label>
|
|
||||||
<select v-model="mode">
|
|
||||||
<option value="auto">System</option>
|
|
||||||
<option value="light">Light</option>
|
|
||||||
<option value="dark">Dark</option>
|
|
||||||
</select>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="grid">
|
|
||||||
<div class="col-12 md:col-6">
|
|
||||||
<label>
|
|
||||||
<input type="checkbox" v-model="cfg.autoSearchSimilar" />
|
|
||||||
Automatically search for similar posts
|
|
||||||
</label>
|
|
||||||
<p class="hint">
|
|
||||||
Automatically start searching for similar posts when opening the popup. Enabling this option will hide
|
|
||||||
the "Find Similar" button.
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="col-12 md:col-6">
|
|
||||||
<label>
|
|
||||||
<input type="checkbox" v-model="cfg.loadTagCounts" />
|
|
||||||
Show how often a tag is used in the selected szurubooru instance
|
|
||||||
</label>
|
|
||||||
<p class="hint">
|
|
||||||
Shows how often a given tag is used in the selected szurubooru instance. No number will be displayed
|
|
||||||
when the tag does not yet exist.
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="col-12 md:col-6">
|
|
||||||
<label>
|
|
||||||
<input type="checkbox" v-model="cfg.popup.showSource" />
|
|
||||||
Show source textbox in popup
|
|
||||||
</label>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="col-12 md:col-6">
|
|
||||||
<label>
|
|
||||||
<input type="checkbox" v-model="cfg.popup.showPools" />
|
|
||||||
Show pools in popup
|
|
||||||
</label>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="col-12 md:col-6">
|
|
||||||
<label>
|
|
||||||
<input type="checkbox" v-model="cfg.popup.showInstancePicker" />
|
|
||||||
Show instance picker in popup
|
|
||||||
</label>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</TabPanel>
|
|
||||||
|
|
||||||
<TabPanel header="Instances">
|
|
||||||
<div class="formgrid grid">
|
|
||||||
<div class="field col-12">
|
|
||||||
<label>Selected Szurubooru Instance</label>
|
|
||||||
|
|
||||||
<div class="flex gap-1">
|
|
||||||
<select v-model="cfg.selectedSiteId">
|
|
||||||
<option v-for="site in cfg.sites" :key="site.id" :value="site.id">
|
|
||||||
{{ site.username }} @ {{ site.domain }}
|
{{ site.username }} @ {{ site.domain }}
|
||||||
</option>
|
</option>
|
||||||
</select>
|
</select>
|
||||||
|
|
@ -245,132 +126,92 @@ wnd.szc_set_config_version = (v = 0) => (cfg.value.version = v);
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<template v-if="selectedSite">
|
<div v-if="selectedSite" class="flex-fit flex flex-wrap gap-1 border-box pb2">
|
||||||
<div class="field col-12">
|
<div style="flex: 1 1 20ch">
|
||||||
<label>URL</label>
|
<label>URL</label>
|
||||||
<input
|
<input
|
||||||
v-if="selectedSite"
|
v-if="selectedSite"
|
||||||
text="Szurubooru URL"
|
text="Szurubooru URL"
|
||||||
type="text"
|
type="text"
|
||||||
name="domain"
|
name="domain"
|
||||||
v-model="selectedSite.domain"
|
v-model.lazy="selectedSite.domain"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="field col-12 md:col-6">
|
<div style="flex: 1 1 12ch">
|
||||||
<label>Username</label>
|
<label>Username</label>
|
||||||
<input text="Username" type="text" name="username" v-model="selectedSite.username" />
|
<input text="Username" type="text" name="username" v-model="selectedSite.username" />
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="field col-12 md:col-6">
|
<div style="flex: 1 1 28ch">
|
||||||
<label>Authentication token</label>
|
<label>Authentication token</label>
|
||||||
<input text="Authentication token" type="text" name="token" v-model="selectedSite.authToken" />
|
<input text="Authentication token" type="text" name="token" v-model="selectedSite.authToken" />
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
<div class="col-12 flex flex-wrap justify-content-between gap-3">
|
<div class="flex-fit flex flex-wrap gap-3">
|
||||||
|
<div class="settings-block" style="flex: 1 0 10ch">
|
||||||
|
<label>Theme</label>
|
||||||
|
<select v-model="mode">
|
||||||
|
<option value="auto">System</option>
|
||||||
|
<option value="light">Light</option>
|
||||||
|
<option value="dark">Dark</option>
|
||||||
|
</select>
|
||||||
|
<p class="hint">This setting auto-saves.</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="settings-block">
|
||||||
|
<label>
|
||||||
|
<input type="checkbox" v-model="autoSearchSimilar" />
|
||||||
|
Automatically search for similar posts
|
||||||
|
</label>
|
||||||
|
<p class="hint">
|
||||||
|
Automatically start searching for similar posts when opening the popup. Enabling this option will hide the
|
||||||
|
"Find Similar" button.
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="settings-block">
|
||||||
|
<label>
|
||||||
|
<input type="checkbox" v-model="addPageUrlToSource" />
|
||||||
|
Add page URL to the source list
|
||||||
|
</label>
|
||||||
|
<p class="hint">
|
||||||
|
This will add the current page URL (e.g. the booru link) to the source list in addition to the actual source
|
||||||
|
(e.g. twitter/pixiv/artstation). Note: if the source is empty/not detected then the page URL will always be
|
||||||
|
used as fallback source.
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="settings-block">
|
||||||
|
<label>
|
||||||
|
<input type="checkbox" v-model="loadTagCounts" />
|
||||||
|
Show how often a tag is used in the selected szurubooru instance
|
||||||
|
</label>
|
||||||
|
<p class="hint">
|
||||||
|
Shows how often a given tag is used in the selected szurubooru instance. No number will be displayed when
|
||||||
|
the tag does not yet exist.
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="flex-fit flex flex-wrap justify-between gap-3">
|
||||||
<span class="status" :class="statusType">{{ statusText }}</span>
|
<span class="status" :class="statusType">{{ statusText }}</span>
|
||||||
|
|
||||||
|
<div class="flex gap-1">
|
||||||
<button @click="testConnection">Test connection</button>
|
<button @click="testConnection">Test connection</button>
|
||||||
</div>
|
<button @click="saveSettings" class="primary">Save settings</button>
|
||||||
</template>
|
|
||||||
</div>
|
|
||||||
</TabPanel>
|
|
||||||
|
|
||||||
<TabPanel header="Tags">
|
|
||||||
<div class="separated-content">
|
|
||||||
<div class="grid">
|
|
||||||
<DataTable :value="cfg.tagCategories" table-class="col-12" style="width: 100%">
|
|
||||||
<Column v-for="col of columns" :key="col.field" :field="col.field" :header="col.header">
|
|
||||||
<template #body="{ data, field }">
|
|
||||||
<template v-if="field == 'color'">
|
|
||||||
<div class="color-preview">
|
|
||||||
<input type="text" class="color" v-model="data[field]" />
|
|
||||||
<div
|
|
||||||
class="preview background-preview"
|
|
||||||
:style="{ 'border-color': data[field], 'background-color': data[field] }"
|
|
||||||
></div>
|
|
||||||
<div
|
|
||||||
class="preview text-preview"
|
|
||||||
:style="{ 'border-color': data[field], color: data[field] }"
|
|
||||||
></div>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<template v-else>
|
|
||||||
<input type="text" :name="field" v-model="data[field]" />
|
|
||||||
</template>
|
|
||||||
</template>
|
|
||||||
</Column>
|
|
||||||
|
|
||||||
<Column field="name">
|
|
||||||
<template #body="{ index }">
|
|
||||||
<a class="color-primary cursor-pointer" @click="() => cfg.tagCategories.splice(index, 1)">Remove</a>
|
|
||||||
</template>
|
|
||||||
</Column>
|
|
||||||
</DataTable>
|
|
||||||
|
|
||||||
<div class="col-12 flex flex-wrap grid grid-nogutter gap-1">
|
|
||||||
<button class="primary" @click="addTagCategory">Add new category</button>
|
|
||||||
<button @click="importTagCategoriesFromInstance">Import from active instance</button>
|
|
||||||
<button class="bg-danger sm:ml-auto" @click="resetTagCategories">Reset to default</button>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- TODO: Tag category colors -->
|
|
||||||
|
|
||||||
<div class="grid">
|
|
||||||
<DataTable :value="cfg.tagIgnores" table-class="col-12" style="width: 100%">
|
|
||||||
<Column field="names" header="Tags to ignore">
|
|
||||||
<template #body="{ data, field }">
|
|
||||||
<input type="text" :name="field" v-model="data[field][0]" />
|
|
||||||
</template>
|
|
||||||
</Column>
|
|
||||||
|
|
||||||
<Column field="remove">
|
|
||||||
<template #body="{ index }">
|
|
||||||
<a class="color-primary cursor-pointer" @click="() => cfg.tagIgnores.splice(index, 1)">Remove</a>
|
|
||||||
</template>
|
|
||||||
</Column>
|
|
||||||
</DataTable>
|
|
||||||
|
|
||||||
<div class="col-12 flex flex-wrap grid grid-nogutter gap-1">
|
|
||||||
<button class="primary" @click="addTagIgnore">Add tag</button>
|
|
||||||
<button class="bg-danger sm:ml-auto" @click="resetTagIgnores">Clear</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- TODO: Category ignore list -->
|
|
||||||
</div>
|
|
||||||
</TabPanel>
|
|
||||||
|
|
||||||
<!-- <TabPanel header="About">
|
|
||||||
<div class="grid">
|
|
||||||
<div v-for="engine in scraper.engines" :key="engine.name" class="col-12 md:col-4 flex flex-column">
|
|
||||||
<span class="font-bold">{{ engine.name }}</span>
|
|
||||||
<span>Features: {{ engine.features.join(", ") }}</span>
|
|
||||||
<span>Hosts: {{ engine.supportedHosts.join(", ") }}</span>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</TabPanel> -->
|
|
||||||
|
|
||||||
<!--
|
|
||||||
<TabPanel header="Developer">
|
|
||||||
<div class="flex flex-column gap-2">
|
|
||||||
<b>Config</b>
|
|
||||||
<Textarea v-model="configText" autoResize rows="16" />
|
|
||||||
|
|
||||||
<div class="flex flex-wrap gap-1">
|
|
||||||
<button class="primary" @click="showConfig">Show config</button>
|
|
||||||
<button class="bg-danger" @click="importConfig">Import config</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</TabPanel>
|
|
||||||
-->
|
|
||||||
</TabView>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<style lang="scss">
|
<style lang="scss">
|
||||||
|
@use "../styles/main.scss";
|
||||||
|
|
||||||
.content-holder {
|
.content-holder {
|
||||||
padding: 1.5em;
|
padding: 1.5em;
|
||||||
display: flex;
|
display: flex;
|
||||||
|
|
@ -378,7 +219,7 @@ wnd.szc_set_config_version = (v = 0) => (cfg.value.version = v);
|
||||||
|
|
||||||
> .content-wrapper {
|
> .content-wrapper {
|
||||||
// box-sizing: border-box;
|
// box-sizing: border-box;
|
||||||
text-align: left;
|
// text-align: left;
|
||||||
// display: inline-block;
|
// display: inline-block;
|
||||||
// flex: auto;
|
// flex: auto;
|
||||||
max-width: 1000px;
|
max-width: 1000px;
|
||||||
|
|
@ -392,6 +233,15 @@ html.dark .content-wrapper {
|
||||||
background: var(--section-header-bg-color);
|
background: var(--section-header-bg-color);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.settings-block {
|
||||||
|
flex: 1 0 200px;
|
||||||
|
|
||||||
|
label {
|
||||||
|
padding: 0;
|
||||||
|
margin-bottom: 0.3em;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
.hint {
|
.hint {
|
||||||
margin-top: 0.4em;
|
margin-top: 0.4em;
|
||||||
margin-bottom: 0;
|
margin-bottom: 0;
|
||||||
|
|
@ -400,10 +250,6 @@ html.dark .content-wrapper {
|
||||||
line-height: 120%;
|
line-height: 120%;
|
||||||
}
|
}
|
||||||
|
|
||||||
.status {
|
|
||||||
align-self: center;
|
|
||||||
}
|
|
||||||
|
|
||||||
.status-error {
|
.status-error {
|
||||||
color: red;
|
color: red;
|
||||||
}
|
}
|
||||||
|
|
@ -412,8 +258,9 @@ html.dark .content-wrapper {
|
||||||
color: green;
|
color: green;
|
||||||
}
|
}
|
||||||
|
|
||||||
.status-quiet {
|
label {
|
||||||
opacity: 0.6;
|
display: block;
|
||||||
|
padding: 0.3em 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
input[type="checkbox"] {
|
input[type="checkbox"] {
|
||||||
|
|
@ -429,31 +276,4 @@ input[type="checkbox"] {
|
||||||
flex: 0 0 100%;
|
flex: 0 0 100%;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
div.color-preview {
|
|
||||||
white-space: nowrap;
|
|
||||||
position: relative;
|
|
||||||
display: flex;
|
|
||||||
|
|
||||||
input {
|
|
||||||
margin-right: 0.5em;
|
|
||||||
}
|
|
||||||
|
|
||||||
.preview {
|
|
||||||
display: inline-block;
|
|
||||||
text-align: center;
|
|
||||||
padding: 0 0.5em;
|
|
||||||
border: 2px solid #000;
|
|
||||||
|
|
||||||
&::after {
|
|
||||||
content: "A";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.background-preview {
|
|
||||||
border-right: 0;
|
|
||||||
border-right-color: currentcolor;
|
|
||||||
color: transparent;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</style>
|
</style>
|
||||||
|
|
|
||||||
|
|
@ -1,10 +1,10 @@
|
||||||
<!doctype html>
|
<!DOCTYPE html>
|
||||||
<html lang="en">
|
<html lang="en">
|
||||||
<head>
|
<head>
|
||||||
<meta charset="UTF-8" />
|
<meta charset="UTF-8" />
|
||||||
<base target="_blank" />
|
<base target="_blank" />
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1" />
|
<meta name="viewport" content="width=device-width, initial-scale=1" />
|
||||||
<title>SzuruChrome Settings</title>
|
<title>Options</title>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<div id="app"></div>
|
<div id="app"></div>
|
||||||
|
|
|
||||||
|
|
@ -1,12 +1,7 @@
|
||||||
import { createApp } from "vue";
|
import { createApp } from "vue";
|
||||||
import PrimeVue from "primevue/config";
|
|
||||||
import App from "./App.vue";
|
import App from "./App.vue";
|
||||||
import { setupApp } from "~/logic/common-setup";
|
import { setupApp } from "~/logic/common-setup";
|
||||||
|
|
||||||
import "../styles/main.scss";
|
|
||||||
import "../styles/primevue.scss";
|
|
||||||
|
|
||||||
const app = createApp(App);
|
const app = createApp(App);
|
||||||
setupApp(app);
|
setupApp(app);
|
||||||
app.use(PrimeVue);
|
|
||||||
app.mount("#app");
|
app.mount("#app");
|
||||||
|
|
|
||||||
|
|
@ -1,24 +1,393 @@
|
||||||
<script lang="ts" setup>
|
<script setup lang="ts">
|
||||||
import { onMounted } from "vue";
|
import { useDark } from "@vueuse/core";
|
||||||
import { isChrome } from "~/env";
|
import axios, { CancelTokenSource } from "axios";
|
||||||
import { BrowserCommand, SetPostUploadInfoData, SetExactPostId } from "~/models";
|
import { ScrapeResults } from "neo-scraper";
|
||||||
|
import { getUrl, encodeTagName, getErrorMessage } from "~/utils";
|
||||||
|
import {
|
||||||
|
BrowserCommand,
|
||||||
|
ScrapedPostDetails,
|
||||||
|
TagDetails,
|
||||||
|
PostUploadCommandData,
|
||||||
|
SimilarPostInfo,
|
||||||
|
SetPostUploadInfoData,
|
||||||
|
SetExactPostId,
|
||||||
|
SimpleSimilarPost,
|
||||||
|
SimpleImageSearchResult,
|
||||||
|
} from "~/models";
|
||||||
|
import SzuruWrapper from "~/api";
|
||||||
|
import { ImageSearchResult } from "~/api/models";
|
||||||
|
import { isChrome, isMobile } from "~/env";
|
||||||
import { Runtime, WebRequest } from "webextension-polyfill";
|
import { Runtime, WebRequest } from "webextension-polyfill";
|
||||||
import { cfg, useMergeStore, usePopupStore } from "~/stores";
|
import { Config } from "~/config";
|
||||||
import { refreshTagCategoryColorMap } from "~/dynamicStyle";
|
import { DeepReadonly } from "vue";
|
||||||
|
|
||||||
const pop = usePopupStore();
|
let config = new Config();
|
||||||
const merge = useMergeStore();
|
let posts = reactive([] as ScrapedPostDetails[]);
|
||||||
|
let selectedPostId = ref<string | undefined>(undefined);
|
||||||
|
let addTagInput = ref("");
|
||||||
|
let autocompleteShown = ref(false);
|
||||||
|
let autocompleteTags = ref<TagDetails[]>([]);
|
||||||
|
let cancelSource = ref<CancelTokenSource | undefined>(undefined);
|
||||||
|
let autocompleteIndex = ref(-1);
|
||||||
|
let selectedSiteId = ref<string | undefined>(undefined);
|
||||||
|
let isSearchingForSimilarPosts = ref<number>(0);
|
||||||
|
|
||||||
let el: any;
|
const selectedInstance = computed(() => {
|
||||||
watch(
|
if (selectedSiteId.value) {
|
||||||
cfg,
|
return config.sites.find((x) => x.id == selectedSiteId.value);
|
||||||
(value) => {
|
}
|
||||||
el = refreshTagCategoryColorMap(value.tagCategories, el);
|
});
|
||||||
},
|
|
||||||
{ immediate: true },
|
const selectedPost = computed(() => {
|
||||||
|
if (selectedPostId.value) {
|
||||||
|
return posts.find((x) => x.id == selectedPostId.value);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
const szuru = computed(() => {
|
||||||
|
return selectedInstance.value ? SzuruWrapper.createFromConfig(selectedInstance.value) : undefined;
|
||||||
|
});
|
||||||
|
|
||||||
|
// (Reactive) shorthand for `selectedPost.value.instanceSpecificData.get(selectedSiteId.value)`.
|
||||||
|
// This should only be used as if it were readonly, because the instanceId might change.
|
||||||
|
const instanceSpecificData = readonly(
|
||||||
|
computed(() => {
|
||||||
|
if (selectedPost.value && selectedSiteId.value) {
|
||||||
|
return selectedPost.value.instanceSpecificData[selectedSiteId.value];
|
||||||
|
}
|
||||||
|
})
|
||||||
);
|
);
|
||||||
|
|
||||||
onMounted(() => {
|
watch(selectedPostId, () => {
|
||||||
|
// Call findSimilar if wanted.
|
||||||
|
if (config.autoSearchSimilar) {
|
||||||
|
let selectedPost = posts.find((x) => x.id == selectedPostId.value);
|
||||||
|
if (selectedPost) findSimilar(selectedPost);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
watch(selectedSiteId, async (x) => {
|
||||||
|
// If changed
|
||||||
|
if (config.selectedSiteId != x) {
|
||||||
|
// Update selectedSiteId in config
|
||||||
|
config.selectedSiteId = x;
|
||||||
|
await config.save();
|
||||||
|
|
||||||
|
// Call findSimilar if wanted.
|
||||||
|
if (config.autoSearchSimilar && selectedPost.value) {
|
||||||
|
findSimilar(selectedPost.value);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
function openOptionsPage() {
|
||||||
|
browser.runtime.openOptionsPage();
|
||||||
|
}
|
||||||
|
|
||||||
|
async function getActiveTabId(): Promise<number> {
|
||||||
|
const activeTabs = await browser.tabs.query({
|
||||||
|
active: true,
|
||||||
|
currentWindow: true,
|
||||||
|
});
|
||||||
|
|
||||||
|
if (activeTabs.length > 0 && activeTabs[0].id) return activeTabs[0].id;
|
||||||
|
throw new Error("No active tab.");
|
||||||
|
}
|
||||||
|
|
||||||
|
async function grabPost() {
|
||||||
|
// Get active tab
|
||||||
|
const activeTabId = await getActiveTabId();
|
||||||
|
|
||||||
|
// Send 'grab_post' to the content script on the active tab
|
||||||
|
const x = await browser.tabs.sendMessage(activeTabId, new BrowserCommand("grab_post"));
|
||||||
|
// We need to create a new ScrapeResults object and fill it with our data, because the get_posts()
|
||||||
|
// method gets 'lost' when sent from the contentscript to the popup (it gets JSON.stringified and any prototype defines are lost there)
|
||||||
|
const res = Object.assign(new ScrapeResults(), x);
|
||||||
|
|
||||||
|
console.dir(res);
|
||||||
|
|
||||||
|
// Clear current posts array
|
||||||
|
posts.splice(0);
|
||||||
|
|
||||||
|
for (const result of res.results) {
|
||||||
|
for (const i in result.posts) {
|
||||||
|
const vm = new ScrapedPostDetails(result.posts[i]);
|
||||||
|
vm.name = `[${result.engine}] Post ${parseInt(i) + 1}`; // parseInt() is required!
|
||||||
|
|
||||||
|
// Add current pageUrl to the source if either
|
||||||
|
// a. user has addPageUrlToSource set to true
|
||||||
|
// b. source is empty
|
||||||
|
if (config?.addPageUrlToSource || vm.source == "") {
|
||||||
|
if (vm.source != "") vm.source += "\n";
|
||||||
|
vm.source += vm.pageUrl;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Initialize instanceSpecificData with an empty object.
|
||||||
|
for (const site of config.sites) {
|
||||||
|
vm.instanceSpecificData[site.id] = {};
|
||||||
|
}
|
||||||
|
|
||||||
|
posts.push(vm);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (posts.length > 0) {
|
||||||
|
selectedPostId.value = posts[0].id;
|
||||||
|
if (config?.loadTagCounts) {
|
||||||
|
loadTagCounts();
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// pushInfo("No posts found.");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function upload() {
|
||||||
|
if (!selectedSiteId.value) return;
|
||||||
|
|
||||||
|
// Don't try to upload if an exact copy is already on the server.
|
||||||
|
if (instanceSpecificData.value?.reverseSearchResult?.exactPostId) return;
|
||||||
|
|
||||||
|
// TODO: Terrible code.
|
||||||
|
const post = JSON.parse(JSON.stringify(selectedPost.value));
|
||||||
|
const cmdData = new PostUploadCommandData(post, selectedSiteId.value);
|
||||||
|
const cmd = new BrowserCommand("upload_post", cmdData);
|
||||||
|
await browser.runtime.sendMessage(cmd);
|
||||||
|
// TODO: Handle errors/status update
|
||||||
|
}
|
||||||
|
|
||||||
|
function getTagClasses(tag: TagDetails): string[] {
|
||||||
|
let classes: string[] = [];
|
||||||
|
|
||||||
|
if (tag.category && tag.category != "default") {
|
||||||
|
classes.push("tag-" + tag.category);
|
||||||
|
} else {
|
||||||
|
classes.push("tag-general");
|
||||||
|
}
|
||||||
|
|
||||||
|
return classes;
|
||||||
|
}
|
||||||
|
|
||||||
|
function breakTagName(tagName: string) {
|
||||||
|
// Based on https://stackoverflow.com/a/6316913
|
||||||
|
return tagName.replace(/_/g, "_<wbr>");
|
||||||
|
}
|
||||||
|
|
||||||
|
function resolutionToString(resolution: [number, number]) {
|
||||||
|
if (resolution && resolution.length == 2) {
|
||||||
|
return resolution[0] + "x" + resolution[1];
|
||||||
|
}
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
|
||||||
|
function removeTag(tag: TagDetails) {
|
||||||
|
if (selectedPost.value) {
|
||||||
|
const idx = selectedPost.value.tags.indexOf(tag);
|
||||||
|
if (idx != -1) {
|
||||||
|
selectedPost.value.tags.splice(idx, 1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function getActiveSitePostUrl(postId: number): string {
|
||||||
|
if (!selectedInstance.value) return "";
|
||||||
|
return getUrl(selectedInstance.value.domain, "post", postId.toString());
|
||||||
|
}
|
||||||
|
|
||||||
|
function getSimilarPosts(data?: DeepReadonly<SimpleImageSearchResult>): SimilarPostInfo[] {
|
||||||
|
if (!data) return [];
|
||||||
|
|
||||||
|
const lst: SimilarPostInfo[] = [];
|
||||||
|
|
||||||
|
for (const similarPost of data.similarPosts) {
|
||||||
|
if (data.exactPostId == similarPost.postId) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
lst.push(new SimilarPostInfo(similarPost.postId, Math.round(100 - similarPost.distance * 100)));
|
||||||
|
}
|
||||||
|
|
||||||
|
return lst;
|
||||||
|
}
|
||||||
|
|
||||||
|
function addTag(tag: TagDetails) {
|
||||||
|
if (selectedPost.value) {
|
||||||
|
// Only add tag if it doesn't already exist
|
||||||
|
if (tag.name.length > 0 && selectedPost.value.tags.find((x) => x.name == tag.name) == undefined) {
|
||||||
|
selectedPost.value.tags.push(tag);
|
||||||
|
|
||||||
|
// Add implications for the tag
|
||||||
|
selectedPost.value.tags.push(...tag.implications);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function clickFindSimilar() {
|
||||||
|
let selectedPost = posts.find((x) => x.id == selectedPostId.value);
|
||||||
|
if (selectedPost) return await findSimilar(selectedPost);
|
||||||
|
}
|
||||||
|
|
||||||
|
async function findSimilar(post: ScrapedPostDetails | undefined) {
|
||||||
|
if (!post || !szuru.value || !selectedSiteId.value) return;
|
||||||
|
|
||||||
|
const selectedInstance = szuru.value; // Get current object, and not reactive.
|
||||||
|
let instanceSpecificData = post.instanceSpecificData[selectedSiteId.value];
|
||||||
|
|
||||||
|
if (!instanceSpecificData) {
|
||||||
|
console.error("instanceSpecificData is undefined. This should never happen!");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Don't load this again if it is already loaded.
|
||||||
|
if (instanceSpecificData?.reverseSearchResult) return;
|
||||||
|
|
||||||
|
isSearchingForSimilarPosts.value++;
|
||||||
|
|
||||||
|
try {
|
||||||
|
let res: ImageSearchResult | undefined;
|
||||||
|
|
||||||
|
if (config.useContentTokens) {
|
||||||
|
let tmpRes = await selectedInstance.uploadTempFile(post.contentUrl);
|
||||||
|
// TODO: Error handling?
|
||||||
|
// Save contentToken in PostViewModel so that we can reuse it when creating/uploading the post.
|
||||||
|
instanceSpecificData.contentToken = tmpRes.token;
|
||||||
|
|
||||||
|
res = await selectedInstance.reverseSearchToken(tmpRes.token);
|
||||||
|
} else {
|
||||||
|
res = await selectedInstance.reverseSearch(post.contentUrl);
|
||||||
|
}
|
||||||
|
|
||||||
|
instanceSpecificData.reverseSearchResult = {
|
||||||
|
exactPostId: res.exactPost?.id,
|
||||||
|
similarPosts: res.similarPosts.map((x) => <SimpleSimilarPost>{ postId: x.post.id, distance: x.distance }),
|
||||||
|
};
|
||||||
|
} catch (ex: any) {
|
||||||
|
instanceSpecificData.genericError = "Couldn't reverse search. " + getErrorMessage(ex);
|
||||||
|
}
|
||||||
|
|
||||||
|
isSearchingForSimilarPosts.value--;
|
||||||
|
}
|
||||||
|
|
||||||
|
function getPostForUrl(contentUrl: string): ScrapedPostDetails | undefined {
|
||||||
|
return posts.find((x) => x.contentUrl == contentUrl);
|
||||||
|
}
|
||||||
|
|
||||||
|
async function loadTagCounts() {
|
||||||
|
const allTags = posts.flatMap((x) => x.tags);
|
||||||
|
|
||||||
|
for (let i = 0; i < allTags.length; i += 100) {
|
||||||
|
const query = allTags
|
||||||
|
.slice(i, i + 101)
|
||||||
|
.map((x) => encodeTagName(x.name))
|
||||||
|
.join();
|
||||||
|
|
||||||
|
const resp = await szuru.value?.getTags(query);
|
||||||
|
|
||||||
|
// Not the best code, but it works I guess?
|
||||||
|
if (resp) {
|
||||||
|
for (let post of posts)
|
||||||
|
for (let tag of resp.results)
|
||||||
|
for (let postTag of post.tags)
|
||||||
|
if (postTag.name == tag.names[0]) {
|
||||||
|
postTag.usages = tag.usages;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function onAddTagKeyUp(e: KeyboardEvent) {
|
||||||
|
await autocompletePopulator((<HTMLInputElement>e.target).value);
|
||||||
|
}
|
||||||
|
|
||||||
|
function addTagFromCurrentInput() {
|
||||||
|
addTag(new TagDetails(addTagInput.value));
|
||||||
|
addTagInput.value = ""; // Reset input
|
||||||
|
|
||||||
|
// Only needed when the button is clicked
|
||||||
|
// When this is triggered by the enter key the `onAddTagKeyUp` will internally also hide the autocomplete.
|
||||||
|
// Though hiding it twice doesn't hurt so we don't care.
|
||||||
|
hideAutocomplete();
|
||||||
|
|
||||||
|
// TODO: Do we also want to add the implications?
|
||||||
|
// Answer: Probably not, because if the user wanted to have implications they should've clicked/selected the autocomplete entry.
|
||||||
|
}
|
||||||
|
|
||||||
|
function onAddTagKeyDown(e: KeyboardEvent) {
|
||||||
|
if (e.code == "ArrowDown") {
|
||||||
|
e.preventDefault();
|
||||||
|
if (autocompleteIndex.value < autocompleteTags.value.length - 1) {
|
||||||
|
autocompleteIndex.value++;
|
||||||
|
}
|
||||||
|
} else if (e.code == "ArrowUp") {
|
||||||
|
e.preventDefault();
|
||||||
|
if (autocompleteIndex.value >= 0) {
|
||||||
|
autocompleteIndex.value--;
|
||||||
|
}
|
||||||
|
} else if (e.code == "Enter") {
|
||||||
|
if (autocompleteIndex.value == -1) {
|
||||||
|
addTagFromCurrentInput();
|
||||||
|
} else {
|
||||||
|
// Add auto completed tag
|
||||||
|
const tagToAdd = autocompleteTags.value[autocompleteIndex.value];
|
||||||
|
addTag(tagToAdd);
|
||||||
|
addTagInput.value = ""; // Reset input
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function onClickAutocompleteTagItem(tag: TagDetails) {
|
||||||
|
addTag(tag);
|
||||||
|
addTagInput.value = ""; // Reset input
|
||||||
|
autocompleteShown.value = false; // Hide autocomplete list
|
||||||
|
}
|
||||||
|
|
||||||
|
function hideAutocomplete() {
|
||||||
|
autocompleteIndex.value = -1;
|
||||||
|
autocompleteShown.value = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
async function autocompletePopulator(input: string) {
|
||||||
|
// Based on https://www.w3schools.com/howto/howto_js_autocomplete.asp
|
||||||
|
// TODO: Put this in a separate component
|
||||||
|
|
||||||
|
// Hide autocomplete when the input is empty, and don't do anything else.
|
||||||
|
if (input.length == 0) {
|
||||||
|
hideAutocomplete();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Cancel previous request
|
||||||
|
if (cancelSource.value) {
|
||||||
|
cancelSource.value.cancel();
|
||||||
|
}
|
||||||
|
cancelSource.value = axios.CancelToken.source();
|
||||||
|
|
||||||
|
const query = decodeURIComponent(`*${encodeTagName(input)}* sort:usages`);
|
||||||
|
const res = await szuru.value?.getTags(
|
||||||
|
query,
|
||||||
|
0,
|
||||||
|
100,
|
||||||
|
["names", "category", "usages", "implications"],
|
||||||
|
cancelSource.value.token
|
||||||
|
);
|
||||||
|
|
||||||
|
if (res) {
|
||||||
|
autocompleteTags.value = res.results.map((x) => TagDetails.fromTag(x));
|
||||||
|
if (autocompleteTags.value.length > 0) autocompleteShown.value = true;
|
||||||
|
} else {
|
||||||
|
autocompleteTags.value = [];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Could people would use https://kazupon.github.io/vue-i18n/guide/pluralization.html
|
||||||
|
function getUpdatedTagsText(count: number) {
|
||||||
|
return `Updated ${count} tag${count > 1 ? "s" : ""}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
onMounted(async () => {
|
||||||
|
config = await Config.load();
|
||||||
|
selectedSiteId.value = config.selectedSiteId;
|
||||||
|
|
||||||
browser.runtime.onMessage.addListener((cmd: BrowserCommand, _sender: Runtime.MessageSender) => {
|
browser.runtime.onMessage.addListener((cmd: BrowserCommand, _sender: Runtime.MessageSender) => {
|
||||||
console.log("Popup received message:");
|
console.log("Popup received message:");
|
||||||
console.dir(cmd);
|
console.dir(cmd);
|
||||||
|
|
@ -27,7 +396,7 @@ onMounted(() => {
|
||||||
case "set_post_upload_info":
|
case "set_post_upload_info":
|
||||||
{
|
{
|
||||||
const { postId, instanceId, info } = <SetPostUploadInfoData>cmd.data;
|
const { postId, instanceId, info } = <SetPostUploadInfoData>cmd.data;
|
||||||
let post = pop.posts.find((x) => x.id == postId);
|
let post = posts.find((x) => x.id == postId);
|
||||||
if (post) {
|
if (post) {
|
||||||
let instanceSpecificData = post.instanceSpecificData[instanceId];
|
let instanceSpecificData = post.instanceSpecificData[instanceId];
|
||||||
if (instanceSpecificData) {
|
if (instanceSpecificData) {
|
||||||
|
|
@ -39,8 +408,8 @@ onMounted(() => {
|
||||||
case "set_exact_post_id":
|
case "set_exact_post_id":
|
||||||
{
|
{
|
||||||
const { postId, instanceId, exactPostId } = <SetExactPostId>cmd.data;
|
const { postId, instanceId, exactPostId } = <SetExactPostId>cmd.data;
|
||||||
let post = pop.posts.find((x) => x.id == postId);
|
let post = posts.find((x) => x.id == postId);
|
||||||
if (post && pop.selectedPostId) {
|
if (post && selectedPostId.value) {
|
||||||
let instanceSpecificData = post.instanceSpecificData[instanceId];
|
let instanceSpecificData = post.instanceSpecificData[instanceId];
|
||||||
if (instanceSpecificData) {
|
if (instanceSpecificData) {
|
||||||
if (instanceSpecificData?.reverseSearchResult) {
|
if (instanceSpecificData?.reverseSearchResult) {
|
||||||
|
|
@ -52,17 +421,6 @@ onMounted(() => {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case "set_post_update_info":
|
|
||||||
{
|
|
||||||
const data = <SetPostUploadInfoData>cmd.data;
|
|
||||||
let existing = merge.uploadInfo.find((x) => x.instanceId == data.instanceId && x.postId == data.postId);
|
|
||||||
if (existing) {
|
|
||||||
existing.info = data.info;
|
|
||||||
} else {
|
|
||||||
merge.uploadInfo.push(data);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
@ -80,7 +438,7 @@ onMounted(() => {
|
||||||
let requestHeaders = details.requestHeaders ?? [];
|
let requestHeaders = details.requestHeaders ?? [];
|
||||||
|
|
||||||
// Find which ScrapedPost this belongs to, if any.
|
// Find which ScrapedPost this belongs to, if any.
|
||||||
const post = pop.getPostForContentUrl(details.url);
|
const post = getPostForUrl(details.url);
|
||||||
if (post != undefined && post.referrer) {
|
if (post != undefined && post.referrer) {
|
||||||
console.log(`Setting referrer to '${post.referrer}' for request to '${post.contentUrl}'.`);
|
console.log(`Setting referrer to '${post.referrer}' for request to '${post.contentUrl}'.`);
|
||||||
// TODO: If the headers already have a 'Referer' header this will _not_ override that.
|
// TODO: If the headers already have a 'Referer' header this will _not_ override that.
|
||||||
|
|
@ -93,18 +451,373 @@ onMounted(() => {
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
{ urls: ["<all_urls>"] },
|
{ urls: ["<all_urls>"] },
|
||||||
extraInfoSpec,
|
extraInfoSpec
|
||||||
);
|
);
|
||||||
|
|
||||||
|
grabPost();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
useDark();
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<div class="popup-container">
|
<div class="popup-container">
|
||||||
<router-view />
|
<div class="popup-messages">
|
||||||
|
<ul class="messages">
|
||||||
|
<!--
|
||||||
|
Error messages
|
||||||
|
-->
|
||||||
|
|
||||||
|
<li v-if="config.sites.length == 0" class="bg-danger">No szurubooru server configured!</li>
|
||||||
|
|
||||||
|
<li v-if="!selectedInstance" class="bg-danger">No target server selected!</li>
|
||||||
|
|
||||||
|
<li v-if="instanceSpecificData?.reverseSearchResult?.exactPostId" class="bg-danger">
|
||||||
|
<a :href="getActiveSitePostUrl(instanceSpecificData.reverseSearchResult?.exactPostId)"
|
||||||
|
>Post already uploaded ({{ instanceSpecificData.reverseSearchResult.exactPostId }})</a
|
||||||
|
>
|
||||||
|
</li>
|
||||||
|
|
||||||
|
<!-- Only show error when it's not undefined and not empty. -->
|
||||||
|
<li v-if="instanceSpecificData?.uploadState?.error?.length" class="bg-danger">
|
||||||
|
Couldn't upload post. {{ instanceSpecificData.uploadState.error }}
|
||||||
|
</li>
|
||||||
|
|
||||||
|
<li v-if="instanceSpecificData?.genericError" class="bg-danger">{{ instanceSpecificData.genericError }}</li>
|
||||||
|
|
||||||
|
<!--
|
||||||
|
Success messages
|
||||||
|
-->
|
||||||
|
|
||||||
|
<!-- TODO: Clicking a link doesn't actually open it in a new tab, see https://stackoverflow.com/questions/8915845 -->
|
||||||
|
<li
|
||||||
|
v-if="
|
||||||
|
instanceSpecificData?.uploadState?.state == 'uploaded' && instanceSpecificData?.uploadState.instancePostId
|
||||||
|
"
|
||||||
|
class="bg-success"
|
||||||
|
>
|
||||||
|
<a :href="getActiveSitePostUrl(instanceSpecificData.uploadState.instancePostId)"
|
||||||
|
>Uploaded post {{ instanceSpecificData.uploadState.instancePostId }}</a
|
||||||
|
>
|
||||||
|
</li>
|
||||||
|
|
||||||
|
<li v-if="instanceSpecificData?.uploadState?.updateTagsState?.totalChanged" class="bg-success">
|
||||||
|
{{ getUpdatedTagsText(instanceSpecificData.uploadState?.updateTagsState?.totalChanged) }}
|
||||||
|
</li>
|
||||||
|
|
||||||
|
<!--
|
||||||
|
Info messages
|
||||||
|
-->
|
||||||
|
|
||||||
|
<li v-if="instanceSpecificData?.uploadState?.state == 'uploading'">Uploading...</li>
|
||||||
|
|
||||||
|
<li
|
||||||
|
v-if="
|
||||||
|
instanceSpecificData?.uploadState?.updateTagsState?.total &&
|
||||||
|
instanceSpecificData.uploadState?.updateTagsState?.current == undefined
|
||||||
|
"
|
||||||
|
>
|
||||||
|
{{ instanceSpecificData.uploadState?.updateTagsState?.total }} tags need a different category
|
||||||
|
</li>
|
||||||
|
|
||||||
|
<li
|
||||||
|
v-if="
|
||||||
|
instanceSpecificData?.uploadState?.updateTagsState?.current &&
|
||||||
|
instanceSpecificData?.uploadState?.updateTagsState?.totalChanged == undefined
|
||||||
|
"
|
||||||
|
>
|
||||||
|
Updating tag {{ instanceSpecificData.uploadState?.updateTagsState?.current }}/{{
|
||||||
|
instanceSpecificData.uploadState?.updateTagsState?.total
|
||||||
|
}}
|
||||||
|
</li>
|
||||||
|
|
||||||
|
<li v-if="isSearchingForSimilarPosts > 0 && instanceSpecificData?.uploadState == undefined">
|
||||||
|
Searching for similar posts...
|
||||||
|
</li>
|
||||||
|
|
||||||
|
<li
|
||||||
|
v-if="
|
||||||
|
instanceSpecificData?.reverseSearchResult?.similarPosts.length == 0 &&
|
||||||
|
instanceSpecificData.uploadState == undefined
|
||||||
|
"
|
||||||
|
>
|
||||||
|
No similar posts found
|
||||||
|
</li>
|
||||||
|
|
||||||
|
<li v-for="similarPost in getSimilarPosts(instanceSpecificData?.reverseSearchResult)" :key="similarPost.id">
|
||||||
|
<a :href="getActiveSitePostUrl(similarPost.id)"
|
||||||
|
>Post {{ similarPost.id }} looks {{ similarPost.percentage }}% similar</a
|
||||||
|
>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div v-if="selectedPost" class="popup-columns" :class="{ mobile: isMobile }">
|
||||||
|
<div class="popup-left">
|
||||||
|
<div class="popup-section">
|
||||||
|
<div class="section-header">
|
||||||
|
<span>Basic info</span>
|
||||||
|
<!-- <i class="fas fa-cog cursor-pointer" @click="openOptionsPage"></i> -->
|
||||||
|
<font-awesome-icon icon="fa-solid fa-cog" class="cursor-pointer" @click="openOptionsPage" />
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="section-row" v-if="selectedPost?.resolution">
|
||||||
|
<ul class="compact">
|
||||||
|
<li>Resolution: {{ resolutionToString(selectedPost.resolution) }}</li>
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="section-row">
|
||||||
|
<span class="section-label">Safety</span>
|
||||||
|
|
||||||
|
<div style="display: flex; gap: 10px">
|
||||||
|
<label>
|
||||||
|
<input type="radio" value="safe" v-model="selectedPost.rating" />
|
||||||
|
Safe
|
||||||
|
</label>
|
||||||
|
|
||||||
|
<label>
|
||||||
|
<input type="radio" value="sketchy" v-model="selectedPost.rating" />
|
||||||
|
Sketchy
|
||||||
|
</label>
|
||||||
|
|
||||||
|
<label>
|
||||||
|
<input type="radio" value="unsafe" v-model="selectedPost.rating" />
|
||||||
|
Unsafe
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="section-row">
|
||||||
|
<span class="section-label">Source</span>
|
||||||
|
<textarea v-model="selectedPost.source"></textarea>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="popup-section">
|
||||||
|
<div class="section-header">
|
||||||
|
<span>Tags</span>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="section-row" style="display: flex; flex-direction: column">
|
||||||
|
<div style="display: flex">
|
||||||
|
<input
|
||||||
|
type="text"
|
||||||
|
v-model="addTagInput"
|
||||||
|
@keyup="onAddTagKeyUp"
|
||||||
|
@keydown="onAddTagKeyDown"
|
||||||
|
autocomplete="off"
|
||||||
|
/>
|
||||||
|
<button class="primary" style="margin-left: 5px" @click="addTagFromCurrentInput">Add</button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="autocomplete-items" v-bind:class="{ show: autocompleteShown }">
|
||||||
|
<div
|
||||||
|
v-for="(tag, idx) in autocompleteTags"
|
||||||
|
@click="onClickAutocompleteTagItem(tag)"
|
||||||
|
:key="tag.name"
|
||||||
|
:class="{
|
||||||
|
active: idx == autocompleteIndex,
|
||||||
|
}"
|
||||||
|
>
|
||||||
|
<span :class="getTagClasses(tag)">{{ tag.name }}</span>
|
||||||
|
<span class="tag-usages">{{ tag.usages ? tag.usages : "" }}</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="section-row">
|
||||||
|
<ul class="compact-tags">
|
||||||
|
<li v-for="tag in selectedPost.tags" :key="tag.name">
|
||||||
|
<a class="remove-tag" @click="removeTag(tag)">x</a>
|
||||||
|
<span :class="getTagClasses(tag)" v-html="breakTagName(tag.name)"></span>
|
||||||
|
<span v-if="config.loadTagCounts" class="tag-usages tag-usages-reserve-space">{{
|
||||||
|
tag.usages ? tag.usages : ""
|
||||||
|
}}</span>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="popup-section">
|
||||||
|
<div class="section-row">
|
||||||
|
<select v-model="selectedSiteId">
|
||||||
|
<option v-for="site in config.sites" :key="site.id" :value="site.id">
|
||||||
|
{{ site.domain }}
|
||||||
|
</option>
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="popup-right">
|
||||||
|
<div class="popup-section">
|
||||||
|
<select v-model="selectedPostId">
|
||||||
|
<option v-for="post in posts" :key="post.id" :value="post.id">{{ post.name }}</option>
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="popup-section">
|
||||||
|
<div style="display: flex; gap: 5px">
|
||||||
|
<button v-if="!config.autoSearchSimilar" class="primary" @click="clickFindSimilar">Find similar</button>
|
||||||
|
<button class="primary full" @click="upload">Import</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="popup-section">
|
||||||
|
<div class="post-container">
|
||||||
|
<img :src="selectedPost.contentUrl" v-if="selectedPost.contentType == 'image'" />
|
||||||
|
<video v-if="selectedPost.contentType == 'video'" controls>
|
||||||
|
<source :src="selectedPost.contentUrl" />
|
||||||
|
</video>
|
||||||
|
<div class="post-overlay">
|
||||||
|
<PostNotes :notes="selectedPost.notes" />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div v-else class="p3 flex items-center gap-3">
|
||||||
|
<span>No content found</span>
|
||||||
|
<font-awesome-icon icon="fa-solid fa-cog" class="cursor-pointer" @click="openOptionsPage" />
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<style lang="scss">
|
<style lang="scss">
|
||||||
@use "~/styles/main.scss";
|
@use "../styles/main.scss";
|
||||||
@use "~/styles/popup.scss";
|
|
||||||
|
video {
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
textarea,
|
||||||
|
select {
|
||||||
|
font-size: 90%;
|
||||||
|
}
|
||||||
|
|
||||||
|
label {
|
||||||
|
flex: 1 0 auto;
|
||||||
|
|
||||||
|
input[type="radio"] {
|
||||||
|
margin: 3px 3px 0 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.popup-container {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
}
|
||||||
|
|
||||||
|
.popup-messages {
|
||||||
|
grid-column: 1 / 3;
|
||||||
|
margin: 0 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.popup-columns {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: row;
|
||||||
|
|
||||||
|
&.mobile {
|
||||||
|
flex-direction: column-reverse;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.popup-left {
|
||||||
|
flex: 1 0 300px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.popup-right {
|
||||||
|
flex: 1 1 auto;
|
||||||
|
}
|
||||||
|
|
||||||
|
.popup-section {
|
||||||
|
margin: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.section-header {
|
||||||
|
height: 30px;
|
||||||
|
padding: 0 6px 0 10px;
|
||||||
|
background-color: var(--section-header-bg-color);
|
||||||
|
display: flex;
|
||||||
|
justify-content: space-between;
|
||||||
|
align-items: center;
|
||||||
|
|
||||||
|
> span {
|
||||||
|
font-size: 1.2em;
|
||||||
|
vertical-align: middle;
|
||||||
|
color: var(--section-header-fg-color);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.section-row {
|
||||||
|
margin: 10px 5px 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.section-label {
|
||||||
|
display: block;
|
||||||
|
margin: 0 0 5px 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.section-block {
|
||||||
|
display: block;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cursor-pointer {
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
|
||||||
|
.autocomplete-items {
|
||||||
|
position: absolute;
|
||||||
|
z-index: 10;
|
||||||
|
background-color: var(--bg-main-color);
|
||||||
|
border: 2px solid var(--primary-color);
|
||||||
|
margin-top: 34px;
|
||||||
|
display: none;
|
||||||
|
|
||||||
|
&.show {
|
||||||
|
display: block;
|
||||||
|
}
|
||||||
|
|
||||||
|
> div {
|
||||||
|
cursor: pointer;
|
||||||
|
padding: 2px 4px;
|
||||||
|
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 0.5em;
|
||||||
|
|
||||||
|
&:hover {
|
||||||
|
background: var(--primary-color);
|
||||||
|
> span {
|
||||||
|
color: var(--text-color);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
> div.active {
|
||||||
|
background: var(--primary-color);
|
||||||
|
> span {
|
||||||
|
color: var(--text-color);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Hacky way to stop the layout from resizing when we lazy load the usage count. */
|
||||||
|
.tag-usages-reserve-space {
|
||||||
|
min-width: 5ch; /* 5 character width */
|
||||||
|
display: inline-block;
|
||||||
|
}
|
||||||
|
|
||||||
|
.post-container {
|
||||||
|
position: relative;
|
||||||
|
display: flex;
|
||||||
|
}
|
||||||
|
|
||||||
|
.post-overlay {
|
||||||
|
position: absolute;
|
||||||
|
width: 100%;
|
||||||
|
height: 100%;
|
||||||
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
<!doctype html>
|
<!DOCTYPE html>
|
||||||
<html lang="en">
|
<html lang="en">
|
||||||
<head>
|
<head>
|
||||||
<meta charset="UTF-8" />
|
<meta charset="UTF-8" />
|
||||||
|
|
|
||||||
|
|
@ -1,11 +1,7 @@
|
||||||
import { createApp } from "vue";
|
import { createApp } from "vue";
|
||||||
|
import App from "./App.vue";
|
||||||
import { setupApp } from "~/logic/common-setup";
|
import { setupApp } from "~/logic/common-setup";
|
||||||
import { isChrome, isMobile } from "~/env";
|
import { isChrome, isMobile } from "~/env";
|
||||||
import { createRouter, createWebHashHistory } from "vue-router";
|
|
||||||
|
|
||||||
import App from "./App.vue";
|
|
||||||
import PopupMain from "./pages/PopupMain.vue";
|
|
||||||
import MergePost from "./pages/MergePost.vue";
|
|
||||||
|
|
||||||
// Firefox automatically makes the popup as large as can be, Chrome doesn't.
|
// Firefox automatically makes the popup as large as can be, Chrome doesn't.
|
||||||
// However setting the width to 780px gives us horizontal scrollbars on Firefox.
|
// However setting the width to 780px gives us horizontal scrollbars on Firefox.
|
||||||
|
|
@ -13,17 +9,6 @@ if (isChrome && !isMobile) {
|
||||||
document.documentElement.style.width = "780px";
|
document.documentElement.style.width = "780px";
|
||||||
}
|
}
|
||||||
|
|
||||||
const routes = [
|
|
||||||
{ path: "/", component: PopupMain },
|
|
||||||
{ name: "merge", path: "/merge/:siteId/:postId", component: MergePost, props: true },
|
|
||||||
];
|
|
||||||
|
|
||||||
const router = createRouter({
|
|
||||||
history: createWebHashHistory(),
|
|
||||||
routes,
|
|
||||||
});
|
|
||||||
|
|
||||||
const app = createApp(App);
|
const app = createApp(App);
|
||||||
setupApp(app);
|
setupApp(app);
|
||||||
app.use(router);
|
|
||||||
app.mount("#app");
|
app.mount("#app");
|
||||||
|
|
|
||||||
|
|
@ -1,402 +0,0 @@
|
||||||
<script lang="ts" setup>
|
|
||||||
import { isEqual, cloneDeep } from "lodash";
|
|
||||||
import SzurubooruApi from "~/api";
|
|
||||||
import { Post, UpdatePostRequest } from "~/api/models";
|
|
||||||
import { isMobile } from "~/env";
|
|
||||||
import { BrowserCommand, PostUpdateCommandData, TagDetails } from "~/models";
|
|
||||||
import { cfg, useMergeStore, usePopupStore } from "~/stores";
|
|
||||||
import { emptyPost, ensurePostHasContentToken, getUrl } from "~/utils";
|
|
||||||
|
|
||||||
const props = defineProps(["siteId", "postId"]);
|
|
||||||
const merge = useMergeStore();
|
|
||||||
const pop = usePopupStore();
|
|
||||||
|
|
||||||
// Why is this cloneDeep needed? Or maybe it isn't?
|
|
||||||
const szuruConfig = cloneDeep(cfg.value.sites.find((x) => x.id == props.siteId))!;
|
|
||||||
const szuru = SzurubooruApi.createFromConfig(szuruConfig);
|
|
||||||
|
|
||||||
// Used for the update post request.
|
|
||||||
// Should NOT be edited by the user, as this is used to compute the changeset, e.g. "Tags: +1 / -3".
|
|
||||||
let existingPostRo: Post | undefined = undefined;
|
|
||||||
|
|
||||||
// Editable existing post.
|
|
||||||
const post = ref<Post>(emptyPost());
|
|
||||||
|
|
||||||
// Readonly scraped post.
|
|
||||||
const scrapedPost = pop.selectedPost;
|
|
||||||
|
|
||||||
// Stuff which the user can change.
|
|
||||||
const imageToKeep = ref<"current" | "new">("new");
|
|
||||||
const tagsToAdd = reactive([] as TagDetails[]);
|
|
||||||
|
|
||||||
// Computed stuff.
|
|
||||||
const sourcesAdded = ref(0);
|
|
||||||
const sourcesRemoved = ref(0);
|
|
||||||
// tagsAdded = tagsToAdd.length
|
|
||||||
const tagsRemoved = ref(0);
|
|
||||||
|
|
||||||
const contentUrl = computed(() => (imageToKeep.value == "current" ? post.value.contentUrl : scrapedPost?.contentUrl));
|
|
||||||
|
|
||||||
function removeExistingTag(tag: TagDetails) {
|
|
||||||
const idx = post.value.tags.findIndex((x) => x.names == tag.names);
|
|
||||||
if (idx != -1) {
|
|
||||||
tagsRemoved.value++;
|
|
||||||
post.value.tags.splice(idx, 1);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function addTag(tag: TagDetails) {
|
|
||||||
// Only add tag if it doesn't already exist
|
|
||||||
if (
|
|
||||||
tag.name.length > 0 &&
|
|
||||||
tagsToAdd.find((x) => x.name == tag.name) == undefined &&
|
|
||||||
post.value.tags.find((x) => x.names.indexOf(tag.name) != -1) == undefined
|
|
||||||
) {
|
|
||||||
tagsToAdd.push(tag);
|
|
||||||
|
|
||||||
// Add implications for the tag
|
|
||||||
if (cfg.value.addTagImplications) {
|
|
||||||
tagsToAdd.push(...tag.implications);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function removeTagToAdd(tag: TagDetails) {
|
|
||||||
const idx = tagsToAdd.indexOf(tag);
|
|
||||||
if (idx != -1) {
|
|
||||||
tagsToAdd.splice(idx, 1);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function appendSources() {
|
|
||||||
if (scrapedPost) {
|
|
||||||
const re = /\r?\n/;
|
|
||||||
const sources = post.value.source?.split(re) ?? [];
|
|
||||||
for (const source of scrapedPost.source.split(re)) {
|
|
||||||
if (sources.indexOf(source) == -1) {
|
|
||||||
sources.push(source);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
post.value.source = sources.join("\n");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function addMissingTags() {
|
|
||||||
if (scrapedPost) {
|
|
||||||
for (const tag of scrapedPost.tags) {
|
|
||||||
if (post.value.tags.find((x) => x.names.indexOf(tag.name) != -1) == undefined) {
|
|
||||||
tagsToAdd.push(tag);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function mergeSafety() {
|
|
||||||
if (scrapedPost) {
|
|
||||||
post.value.safety = scrapedPost.rating;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function getPostUrl(postId: number): string {
|
|
||||||
return getUrl(szuruConfig.domain, "post", postId.toString());
|
|
||||||
}
|
|
||||||
|
|
||||||
async function mergeChanges() {
|
|
||||||
merge.genericError = undefined;
|
|
||||||
|
|
||||||
if (!scrapedPost) {
|
|
||||||
// Should never happend.
|
|
||||||
merge.genericError = "Invalid state. 'scrapedPost' is falsy.";
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!existingPostRo) {
|
|
||||||
// Should only happen with an network error I guess?
|
|
||||||
merge.genericError = "Invalid state. 'existingPostRo' is falsy.";
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
const req = <UpdatePostRequest>{
|
|
||||||
version: existingPostRo?.version,
|
|
||||||
};
|
|
||||||
|
|
||||||
if (post.value.source != existingPostRo.source) {
|
|
||||||
req.source = post.value.source;
|
|
||||||
}
|
|
||||||
|
|
||||||
const newTags = post.value.tags.map((x) => x.names[0]).concat(tagsToAdd.map((x) => x.name));
|
|
||||||
|
|
||||||
if (
|
|
||||||
!isEqual(
|
|
||||||
newTags,
|
|
||||||
existingPostRo.tags.map((x) => x.names[0]),
|
|
||||||
)
|
|
||||||
) {
|
|
||||||
req.tags = newTags;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (post.value.safety != existingPostRo.safety) {
|
|
||||||
req.safety = post.value.safety;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (imageToKeep.value == "new") {
|
|
||||||
// In practice this should not be needed, because finding similar posts requires the use of content tokens.
|
|
||||||
// So if a similar post is found, it means that a contentToken has already been set.
|
|
||||||
await ensurePostHasContentToken(szuru, scrapedPost, cfg);
|
|
||||||
req.contentToken = scrapedPost.instanceSpecificData[cfg.value.selectedSiteId!].contentToken!;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!req.safety && !req.source && !(req.contentUrl || req.contentToken) && req.tags === undefined) {
|
|
||||||
merge.genericError = "No changes to merge.";
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
merge.uploadInfo.push({
|
|
||||||
instanceId: szuruConfig.id,
|
|
||||||
postId: `merge-${existingPostRo.id}`,
|
|
||||||
info: { state: "uploading", instancePostId: existingPostRo.id },
|
|
||||||
});
|
|
||||||
|
|
||||||
const cmdData = new PostUpdateCommandData(existingPostRo.id, req, szuruConfig);
|
|
||||||
const cmd = new BrowserCommand("update_post", cmdData);
|
|
||||||
await browser.runtime.sendMessage(cmd);
|
|
||||||
}
|
|
||||||
|
|
||||||
watch(
|
|
||||||
() => post.value.source,
|
|
||||||
(value, oldValue) => {
|
|
||||||
// TODO: Implement this.
|
|
||||||
sourcesAdded.value = 0;
|
|
||||||
sourcesRemoved.value = 0;
|
|
||||||
},
|
|
||||||
);
|
|
||||||
|
|
||||||
watch(
|
|
||||||
() => cfg.value.merge.addMissingTags,
|
|
||||||
(value) => {
|
|
||||||
if (value) {
|
|
||||||
addMissingTags();
|
|
||||||
} else if (existingPostRo) {
|
|
||||||
tagsToAdd.splice(0);
|
|
||||||
}
|
|
||||||
},
|
|
||||||
);
|
|
||||||
|
|
||||||
watch(
|
|
||||||
() => cfg.value.merge.appendSource,
|
|
||||||
(value) => {
|
|
||||||
if (value) {
|
|
||||||
appendSources();
|
|
||||||
} else if (existingPostRo) {
|
|
||||||
post.value.source = existingPostRo.source;
|
|
||||||
}
|
|
||||||
},
|
|
||||||
);
|
|
||||||
|
|
||||||
watch(
|
|
||||||
() => cfg.value.merge.mergeSafety,
|
|
||||||
(value) => {
|
|
||||||
if (value) {
|
|
||||||
mergeSafety();
|
|
||||||
} else if (existingPostRo) {
|
|
||||||
post.value.safety = existingPostRo.safety;
|
|
||||||
}
|
|
||||||
},
|
|
||||||
);
|
|
||||||
|
|
||||||
onMounted(async () => {
|
|
||||||
// Clear upload info and error.
|
|
||||||
merge.uploadInfo.splice(0);
|
|
||||||
merge.genericError = undefined;
|
|
||||||
|
|
||||||
// Load existing post data.
|
|
||||||
existingPostRo = await szuru?.getPost(props.postId);
|
|
||||||
|
|
||||||
if (existingPostRo) {
|
|
||||||
post.value = cloneDeep(existingPostRo);
|
|
||||||
if (cfg.value.merge.appendSource) appendSources();
|
|
||||||
if (cfg.value.merge.addMissingTags) addMissingTags();
|
|
||||||
if (cfg.value.merge.mergeSafety) mergeSafety();
|
|
||||||
|
|
||||||
if (scrapedPost?.resolution) {
|
|
||||||
// Set imageToKeep depending on which image has the largest resolution.
|
|
||||||
// TODO: Would be neat if this also uses the fileSize.
|
|
||||||
const scrapedPx = scrapedPost.resolution[0] * scrapedPost.resolution[1];
|
|
||||||
const existingPx = existingPostRo.canvasHeight * existingPostRo.canvasWidth;
|
|
||||||
|
|
||||||
if (existingPx >= scrapedPx) {
|
|
||||||
imageToKeep.value = "current";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<template>
|
|
||||||
<div class="popup-messages">
|
|
||||||
<div class="messages">
|
|
||||||
<div v-if="merge.genericError" class="bg-danger">
|
|
||||||
<span>{{ merge.genericError }}</span>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<template v-for="data in merge.uploadInfo">
|
|
||||||
<div :key="data.postId" v-if="data.info.state == 'uploaded' && data.info.instancePostId" class="bg-success">
|
|
||||||
<a :href="getPostUrl(data.info.instancePostId)">Merged into post {{ data.info.instancePostId }}</a>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div :key="data.postId" v-if="data.info.state == 'uploading'"><span>Merging...</span></div>
|
|
||||||
|
|
||||||
<!-- Only show error when it's not undefined and not empty. -->
|
|
||||||
<div :key="data.postId" v-if="data.info.error?.length" class="bg-danger">
|
|
||||||
<span>Couldn't merge into post. {{ data.info.error }}</span>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="popup-columns" :class="{ mobile: isMobile }">
|
|
||||||
<div class="popup-left">
|
|
||||||
<div class="popup-section">
|
|
||||||
<div style="display: flex; flex-direction: column; gap: 5px">
|
|
||||||
<div style="display: flex; gap: 5px">
|
|
||||||
<button class="bg-danger" @click="$router.back()">
|
|
||||||
<font-awesome-icon icon="fa-solid fa-chevron-left" class="cursor-pointer" @click="undefined" />
|
|
||||||
Back
|
|
||||||
</button>
|
|
||||||
<div class="section-header full">
|
|
||||||
<span>Merge into post #{{ props.postId }}</span>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<button class="primary full" @click="mergeChanges">Merge changes</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<PopupSection header="Changes">
|
|
||||||
<div class="section-row">
|
|
||||||
<ul class="compact-tags">
|
|
||||||
<li v-show="tagsToAdd.length != 0 || tagsRemoved != 0">
|
|
||||||
Tags: <span class="success" v-show="tagsToAdd.length != 0">+{{ tagsToAdd.length }}</span>
|
|
||||||
<span class="danger" v-show="tagsRemoved != 0">-{{ tagsRemoved }}</span>
|
|
||||||
</li>
|
|
||||||
<li v-show="sourcesAdded != 0 || sourcesRemoved != 0">
|
|
||||||
Sources: <span class="success" v-show="sourcesAdded != 0">+2</span>
|
|
||||||
<span class="danger" v-show="sourcesRemoved != 0">-1</span>
|
|
||||||
</li>
|
|
||||||
<li v-show="existingPostRo?.safety != post.safety">
|
|
||||||
Safety: <s class="danger">{{ existingPostRo?.safety }}</s> <span class="success">{{ post.safety }}</span>
|
|
||||||
</li>
|
|
||||||
<li v-show="imageToKeep == 'new'">
|
|
||||||
<span class="success">Updating post content</span>
|
|
||||||
</li>
|
|
||||||
|
|
||||||
<!-- TODO: Add "No changes" text. -->
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
</PopupSection>
|
|
||||||
|
|
||||||
<PopupSection header="Basic info">
|
|
||||||
<div class="section-row">
|
|
||||||
<span class="section-label">Safety</span>
|
|
||||||
|
|
||||||
<div style="display: flex; gap: 10px">
|
|
||||||
<label>
|
|
||||||
<input type="radio" value="safe" v-model="post.safety" />
|
|
||||||
Safe
|
|
||||||
</label>
|
|
||||||
|
|
||||||
<label>
|
|
||||||
<input type="radio" value="sketchy" v-model="post.safety" />
|
|
||||||
Sketchy
|
|
||||||
</label>
|
|
||||||
|
|
||||||
<label>
|
|
||||||
<input type="radio" value="unsafe" v-model="post.safety" />
|
|
||||||
Unsafe
|
|
||||||
</label>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="section-row">
|
|
||||||
<span class="section-label">Source</span>
|
|
||||||
<!-- TODO: Fix this -->
|
|
||||||
<textarea v-model="post.source"></textarea>
|
|
||||||
</div>
|
|
||||||
</PopupSection>
|
|
||||||
|
|
||||||
<PopupSection header="Existing tags" toggleable v-model="cfg.merge.expandExistingTags">
|
|
||||||
<div class="section-row">
|
|
||||||
<CompactTags
|
|
||||||
:tags="post.tags.map((x) => TagDetails.fromMicroTag(x))"
|
|
||||||
:show-remove-tag="true"
|
|
||||||
:show-usages="true"
|
|
||||||
@remove-tag="removeExistingTag"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
</PopupSection>
|
|
||||||
|
|
||||||
<PopupSection header="Tags to add" toggleable v-model="cfg.merge.expandAddTags">
|
|
||||||
<div class="section-row">
|
|
||||||
<TagInput :szuru="szuru" @add-tag="addTag" />
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="section-row">
|
|
||||||
<CompactTags :tags="tagsToAdd" :show-remove-tag="true" :show-usages="true" @remove-tag="removeTagToAdd" />
|
|
||||||
</div>
|
|
||||||
</PopupSection>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="popup-right">
|
|
||||||
<PopupSection header="Content">
|
|
||||||
<div class="section-row">
|
|
||||||
<div style="display: flex; gap: 10px; margin: 10px 0">
|
|
||||||
<label>
|
|
||||||
<input type="radio" value="current" v-model="imageToKeep" />
|
|
||||||
Current ({{ post.canvasWidth }}x{{ post.canvasHeight }})
|
|
||||||
</label>
|
|
||||||
|
|
||||||
<!-- TODO: Also display filesize -->
|
|
||||||
|
|
||||||
<label>
|
|
||||||
<input type="radio" value="new" v-model="imageToKeep" />
|
|
||||||
New ({{ scrapedPost?.resolution?.[0] }}x{{ scrapedPost?.resolution?.[1] }})
|
|
||||||
</label>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<PostContentDisplay :content-url="contentUrl" content-type="image" />
|
|
||||||
</div>
|
|
||||||
</PopupSection>
|
|
||||||
|
|
||||||
<PopupSection header="Merge options" toggleable v-model="cfg.merge.expandOptions">
|
|
||||||
<div class="section-row">
|
|
||||||
<div style="display: flex; flex-direction: column">
|
|
||||||
<label>
|
|
||||||
<input type="checkbox" v-model="cfg.merge.addMissingTags" />
|
|
||||||
Add missing tags
|
|
||||||
</label>
|
|
||||||
|
|
||||||
<label>
|
|
||||||
<input type="checkbox" v-model="cfg.merge.appendSource" />
|
|
||||||
Append source
|
|
||||||
</label>
|
|
||||||
|
|
||||||
<label>
|
|
||||||
<input type="checkbox" v-model="cfg.merge.mergeSafety" />
|
|
||||||
Merge safety
|
|
||||||
</label>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</PopupSection>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<style scoped lang="scss">
|
|
||||||
.popup-left {
|
|
||||||
flex: 1 1 auto;
|
|
||||||
}
|
|
||||||
|
|
||||||
.popup-right {
|
|
||||||
flex: 1 0 300px;
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
|
|
@ -1,677 +0,0 @@
|
||||||
<script setup lang="ts">
|
|
||||||
import { useDark } from "@vueuse/core";
|
|
||||||
import { cloneDeep } from "lodash";
|
|
||||||
import { ScrapeResults } from "neo-scraper";
|
|
||||||
import { getUrl, encodeTagName, getErrorMessage, getPostInfoSummary, ensurePostHasContentToken } from "~/utils";
|
|
||||||
import {
|
|
||||||
BrowserCommand,
|
|
||||||
ScrapedPostDetails,
|
|
||||||
TagDetails,
|
|
||||||
SimilarPostInfo,
|
|
||||||
SimpleSimilarPost,
|
|
||||||
SimpleImageSearchResult,
|
|
||||||
PostUploadCommandData,
|
|
||||||
SzuruSiteConfig,
|
|
||||||
PoolDetails,
|
|
||||||
} from "~/models";
|
|
||||||
import { isMobile } from "~/env";
|
|
||||||
import { DeepReadonly } from "vue";
|
|
||||||
import { cfg, usePopupStore } from "~/stores";
|
|
||||||
import SzurubooruApi from "~/api";
|
|
||||||
|
|
||||||
const pop = usePopupStore();
|
|
||||||
const isSearchingForSimilarPosts = ref<number>(0);
|
|
||||||
const enableAutoSearch = ref(true);
|
|
||||||
|
|
||||||
const selectedSite = computed(() => {
|
|
||||||
if (cfg.value.selectedSiteId) {
|
|
||||||
return cfg.value.sites.find((x) => x.id == cfg.value.selectedSiteId);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
const szuru = computed(() => {
|
|
||||||
return selectedSite.value ? SzurubooruApi.createFromConfig(selectedSite.value) : undefined;
|
|
||||||
});
|
|
||||||
|
|
||||||
// (Reactive) shorthand for `main.selectedPost.instanceSpecificData.get(config.selectedSiteId)`.
|
|
||||||
// This should only be used as if it were readonly, because the instanceId might change.
|
|
||||||
const instanceSpecificData = readonly(
|
|
||||||
computed(() => {
|
|
||||||
if (pop.selectedPost && cfg.value.selectedSiteId) {
|
|
||||||
return pop.selectedPost.instanceSpecificData[cfg.value.selectedSiteId];
|
|
||||||
}
|
|
||||||
}),
|
|
||||||
);
|
|
||||||
|
|
||||||
watch(
|
|
||||||
() => pop.selectedPostId,
|
|
||||||
(value) => {
|
|
||||||
// Call findSimilar if wanted.
|
|
||||||
if (cfg.value.autoSearchSimilar && enableAutoSearch.value) {
|
|
||||||
let selectedPost = pop.posts.find((x) => x.id == value);
|
|
||||||
if (selectedPost) findSimilar(selectedPost);
|
|
||||||
}
|
|
||||||
},
|
|
||||||
);
|
|
||||||
|
|
||||||
watch(
|
|
||||||
() => cfg.value.selectedSiteId,
|
|
||||||
async (value, oldValue) => {
|
|
||||||
// If changed
|
|
||||||
if (value != oldValue) {
|
|
||||||
// Update selectedSiteId in config
|
|
||||||
cfg.value.selectedSiteId = value;
|
|
||||||
// Call findSimilar if wanted.
|
|
||||||
if (cfg.value.autoSearchSimilar && pop.selectedPost) {
|
|
||||||
findSimilar(pop.selectedPost);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
);
|
|
||||||
|
|
||||||
function openOptionsPage() {
|
|
||||||
browser.runtime.openOptionsPage();
|
|
||||||
}
|
|
||||||
|
|
||||||
async function getSelectedTabIds(): Promise<number[]> {
|
|
||||||
const selectedTabs = await browser.tabs.query({
|
|
||||||
highlighted: true,
|
|
||||||
currentWindow: true,
|
|
||||||
});
|
|
||||||
|
|
||||||
if (selectedTabs.length > 0 && selectedTabs[0].id) {
|
|
||||||
return selectedTabs.filter((tab) => tab.id).map((tab) => tab.id as number);
|
|
||||||
}
|
|
||||||
throw new Error("No active tab.");
|
|
||||||
}
|
|
||||||
|
|
||||||
async function grabPost() {
|
|
||||||
// Get active tab
|
|
||||||
const selectedTabIds = await getSelectedTabIds();
|
|
||||||
|
|
||||||
let scrapeResults: ScrapeResults = new ScrapeResults();
|
|
||||||
for (const selectedTabId of selectedTabIds) {
|
|
||||||
// Send 'grab_post' to the content script on the active tabs
|
|
||||||
const x = await browser.tabs.sendMessage(selectedTabId, new BrowserCommand("grab_post"));
|
|
||||||
// We need to create a new ScrapeResults object and fill it with our data, because the get_posts()
|
|
||||||
// method gets 'lost' when sent from the contentscript to the popup (it gets JSON.stringified and any prototype defines are lost there)
|
|
||||||
const results: ScrapeResults = Object.assign(new ScrapeResults(), x);
|
|
||||||
|
|
||||||
for (const result of results.results) {
|
|
||||||
const res = scrapeResults.results.find((r) => r.engine === result.engine);
|
|
||||||
if (res) res.posts.push(...result.posts);
|
|
||||||
else scrapeResults.results.push(result);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
console.dir(scrapeResults);
|
|
||||||
|
|
||||||
// Clear current posts array
|
|
||||||
pop.posts.splice(0);
|
|
||||||
|
|
||||||
for (const result of scrapeResults.results) {
|
|
||||||
for (const i in result.posts) {
|
|
||||||
const vm = new ScrapedPostDetails(result.posts[i]);
|
|
||||||
const name = result.posts[i].name ?? `Post ${parseInt(i) + 1}`; // parseInt() is required!
|
|
||||||
vm.name = `[${result.engine}] ${name}`;
|
|
||||||
|
|
||||||
if (!cfg.value.addAllParsedTags) {
|
|
||||||
vm.tags.splice(0);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (cfg.value.alwaysUploadAsContent && vm.name !== "[fallback] Upload as URL") {
|
|
||||||
vm.uploadMode = "content";
|
|
||||||
}
|
|
||||||
|
|
||||||
// Add current pageUrl to the source if either
|
|
||||||
// a. user has addPageUrlToSource set to true
|
|
||||||
// b. source is empty
|
|
||||||
if (cfg.value.addPageUrlToSource || vm.source == "") {
|
|
||||||
if (vm.source != "") vm.source += "\n";
|
|
||||||
vm.source += vm.pageUrl;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Initialize instanceSpecificData with an empty object.
|
|
||||||
for (const site of cfg.value.sites) {
|
|
||||||
vm.instanceSpecificData[site.id] = {};
|
|
||||||
}
|
|
||||||
|
|
||||||
// Remove ignored tags
|
|
||||||
// The complexity for this is quite bad but all the other ways I tried were even worse
|
|
||||||
vm.tags = vm.tags.filter((tag) =>
|
|
||||||
cfg.value.tagIgnores.every(
|
|
||||||
(ignoredTag) => tag.name != ignoredTag.names[0], // no getters after deserializing
|
|
||||||
),
|
|
||||||
);
|
|
||||||
|
|
||||||
pop.posts.push(vm);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (pop.posts.length > 0) {
|
|
||||||
// Hack so that findSimilar does not trigger when we set selectedPostId, due to the watch(...).
|
|
||||||
// This because we might change the contentUrl in fetchPostInfo, after which we'd need to call findSimilar again.
|
|
||||||
// In which case it would be better to just call it once.
|
|
||||||
enableAutoSearch.value = false;
|
|
||||||
pop.selectedPostId = pop.posts[0].id;
|
|
||||||
|
|
||||||
if (cfg.value.loadTagCounts) {
|
|
||||||
loadTagCounts();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (cfg.value.fetchPostInfo) {
|
|
||||||
await fetchPostsInfo();
|
|
||||||
}
|
|
||||||
|
|
||||||
// Delayed call to findSimilar, as fetchPostInfo might change the post's contentUrl.
|
|
||||||
enableAutoSearch.value = true;
|
|
||||||
if (cfg.value.autoSearchSimilar) {
|
|
||||||
findSimilar(pop.selectedPost);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async function upload() {
|
|
||||||
if (!cfg.value.selectedSiteId) return;
|
|
||||||
let instanceSpecificData = pop.selectedPost?.instanceSpecificData[cfg.value.selectedSiteId];
|
|
||||||
|
|
||||||
// Don't try to upload if an exact copy is already on the server.
|
|
||||||
if (instanceSpecificData?.reverseSearchResult?.exactPostId) return;
|
|
||||||
|
|
||||||
if (instanceSpecificData) {
|
|
||||||
instanceSpecificData.uploadState = { state: "uploading" };
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
const post: ScrapedPostDetails = cloneDeep(pop.selectedPost)!;
|
|
||||||
|
|
||||||
// uploadMode "content" requires a content token to work. So ensure it is set.
|
|
||||||
if (post.uploadMode === "content") {
|
|
||||||
await ensurePostHasContentToken(szuru.value!, post, cfg);
|
|
||||||
}
|
|
||||||
|
|
||||||
const cmdData = new PostUploadCommandData(
|
|
||||||
post,
|
|
||||||
<SzuruSiteConfig>cloneDeep(selectedSite.value),
|
|
||||||
cfg.value.sendUploadNotifications,
|
|
||||||
);
|
|
||||||
const cmd = new BrowserCommand("upload_post", cmdData);
|
|
||||||
await browser.runtime.sendMessage(cmd);
|
|
||||||
} catch (ex: any) {
|
|
||||||
if (instanceSpecificData?.uploadState) {
|
|
||||||
instanceSpecificData.uploadState.state = "error";
|
|
||||||
instanceSpecificData.uploadState.error = ex.toString();
|
|
||||||
}
|
|
||||||
throw ex;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function removeTag(tag: TagDetails) {
|
|
||||||
if (pop.selectedPost) {
|
|
||||||
const idx = pop.selectedPost.tags.indexOf(tag);
|
|
||||||
if (idx != -1) {
|
|
||||||
pop.selectedPost.tags.splice(idx, 1);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function removePool(pool: PoolDetails) {
|
|
||||||
if (pop.selectedPost) {
|
|
||||||
const idx = pop.selectedPost.pools.indexOf(pool);
|
|
||||||
if (idx != -1) {
|
|
||||||
pop.selectedPost.pools.splice(idx, 1);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function getActiveSitePostUrl(postId: number): string {
|
|
||||||
if (!selectedSite.value) return "";
|
|
||||||
return getUrl(selectedSite.value.domain, "post", postId.toString());
|
|
||||||
}
|
|
||||||
|
|
||||||
function getSimilarPosts(data?: DeepReadonly<SimpleImageSearchResult>): SimilarPostInfo[] {
|
|
||||||
if (!data) return [];
|
|
||||||
|
|
||||||
const lst: SimilarPostInfo[] = [];
|
|
||||||
|
|
||||||
for (const similarPost of data.similarPosts) {
|
|
||||||
if (data.exactPostId == similarPost.postId) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
lst.push(new SimilarPostInfo(similarPost.postId, Math.round(100 - similarPost.distance * 100)));
|
|
||||||
}
|
|
||||||
|
|
||||||
return lst;
|
|
||||||
}
|
|
||||||
|
|
||||||
function addTag(tag: TagDetails) {
|
|
||||||
if (pop.selectedPost) {
|
|
||||||
// Only add tag if it doesn't already exist
|
|
||||||
if (tag.name.length > 0 && pop.selectedPost.tags.find((x) => x.name == tag.name) == undefined) {
|
|
||||||
pop.selectedPost.tags.push(tag);
|
|
||||||
|
|
||||||
// Add implications for the tag
|
|
||||||
if (cfg.value.addTagImplications) {
|
|
||||||
pop.selectedPost.tags.push(...tag.implications);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function addPool(pool: PoolDetails) {
|
|
||||||
if (pop.selectedPost) {
|
|
||||||
// Only add pool if it doesn't already exist
|
|
||||||
if (pool.name.length > 0 && pop.selectedPost.pools.find((x) => x.name == pool.name) == undefined) {
|
|
||||||
pop.selectedPost.pools.push(pool);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async function clickFindSimilar() {
|
|
||||||
if (pop.selectedPost) return await findSimilar(pop.selectedPost);
|
|
||||||
}
|
|
||||||
|
|
||||||
async function findSimilar(post: ScrapedPostDetails | undefined) {
|
|
||||||
if (!post || !szuru.value || !cfg.value.selectedSiteId) return;
|
|
||||||
|
|
||||||
// TODO: This code might not work.
|
|
||||||
// Why is toRaw used?
|
|
||||||
// I guess it could happen that the selectedInstance changes halfway during this function?
|
|
||||||
// And in that case toRaw would ensure we have the original selected instance (as it was at the start of this function).
|
|
||||||
// In theory this sounds correct, but idk if it is needed in practice.
|
|
||||||
const selectedInstance = toRaw(szuru.value); // Get current object, and not reactive.
|
|
||||||
let instanceSpecificData = post.instanceSpecificData[cfg.value.selectedSiteId];
|
|
||||||
|
|
||||||
if (!instanceSpecificData) {
|
|
||||||
console.error("instanceSpecificData is undefined. This should never happen!");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Don't load this again if it is already loaded.
|
|
||||||
if (instanceSpecificData.reverseSearchResult) return;
|
|
||||||
|
|
||||||
isSearchingForSimilarPosts.value++;
|
|
||||||
|
|
||||||
try {
|
|
||||||
await ensurePostHasContentToken(selectedInstance, post, cfg);
|
|
||||||
|
|
||||||
const res = await selectedInstance.reverseSearchToken(instanceSpecificData.contentToken!);
|
|
||||||
|
|
||||||
instanceSpecificData.reverseSearchResult = {
|
|
||||||
exactPostId: res.exactPost?.id,
|
|
||||||
similarPosts: res.similarPosts.map((x) => <SimpleSimilarPost>{ postId: x.post.id, distance: x.distance }),
|
|
||||||
};
|
|
||||||
} catch (ex: any) {
|
|
||||||
instanceSpecificData.genericError = "Couldn't reverse search. " + getErrorMessage(ex);
|
|
||||||
}
|
|
||||||
|
|
||||||
isSearchingForSimilarPosts.value--;
|
|
||||||
}
|
|
||||||
|
|
||||||
async function loadTagCounts() {
|
|
||||||
const allTags = pop.posts.flatMap((x) => x.tags);
|
|
||||||
|
|
||||||
for (let i = 0; i < allTags.length; i += 100) {
|
|
||||||
const query = allTags
|
|
||||||
.slice(i, i + 101)
|
|
||||||
.map((x) => encodeTagName(x.name))
|
|
||||||
.join();
|
|
||||||
|
|
||||||
const resp = await szuru.value?.getTags(query);
|
|
||||||
|
|
||||||
// Not the best code, but it works I guess?
|
|
||||||
if (resp) {
|
|
||||||
for (let post of pop.posts)
|
|
||||||
for (let tag of resp.results) {
|
|
||||||
const postTag = post.tags.find((postTag) => tag.names.includes(postTag.name));
|
|
||||||
if (postTag) postTag.usages = tag.usages;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async function updatePostWithRemoteInfo(post: ScrapedPostDetails, contentUrl: string) {
|
|
||||||
// We are missing cookies/etc which means that the request might fail.
|
|
||||||
// If you want access to the cookies/session/etc then you need to execute this code inside the content script.
|
|
||||||
try {
|
|
||||||
// This request follows redirects.
|
|
||||||
const res = await fetch(contentUrl, { method: "HEAD" });
|
|
||||||
const size = res.headers.get("Content-Length");
|
|
||||||
const type = res.headers.get("Content-Type");
|
|
||||||
|
|
||||||
if (type) {
|
|
||||||
if (type.indexOf("text/html") != -1) {
|
|
||||||
// If we get a HTML page back it usually means that the request failed.
|
|
||||||
// Not all sites (e.g. e-hentai) reply with a 403.
|
|
||||||
throw new Error(
|
|
||||||
"Received a text/html content type. This probably means that we don't have permission to access the resource.",
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
const [_main, sub] = type.split("/");
|
|
||||||
if (sub) post.contentSubType = sub.toUpperCase();
|
|
||||||
}
|
|
||||||
|
|
||||||
// This should be after the type check, because the type check also checks whether the response we get is valid/unsable.
|
|
||||||
if (size) post.contentSize = parseInt(size);
|
|
||||||
|
|
||||||
// Update url if it changes. The url can change when:
|
|
||||||
// a. the extraContentUrl was successfully loaded
|
|
||||||
// b. because of redirects
|
|
||||||
if (res.url != post.contentUrl) {
|
|
||||||
// The developer needs to make sure that the remote server can load this URL if `post.uploadMode == 'url'`!
|
|
||||||
console.log(`Updating post.contentUrl to '${res.url}'`);
|
|
||||||
post.contentUrl = res.url;
|
|
||||||
}
|
|
||||||
|
|
||||||
return true;
|
|
||||||
} catch (ex) {
|
|
||||||
console.error(ex);
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async function fetchPostsInfo() {
|
|
||||||
for (const post of pop.posts) {
|
|
||||||
if (!post.contentSize || post.extraContentUrl) {
|
|
||||||
let ok = false;
|
|
||||||
if (post.extraContentUrl) {
|
|
||||||
// Prioritize info from extraContentUrl.
|
|
||||||
ok = await updatePostWithRemoteInfo(post, post.extraContentUrl);
|
|
||||||
}
|
|
||||||
if (!ok) {
|
|
||||||
// Fall back to normal contentUrl if we can't get the data from the extraContentUrl.
|
|
||||||
await updatePostWithRemoteInfo(post, post.contentUrl);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Cool people would use https://kazupon.github.io/vue-i18n/guide/pluralization.html
|
|
||||||
function getUpdatedTagsText(count: number) {
|
|
||||||
return `Updated ${count} tag${count > 1 ? "s" : ""}`;
|
|
||||||
}
|
|
||||||
|
|
||||||
function onResolutionLoaded(res: any) {
|
|
||||||
// This no longer checks for `!pop.selectedPost.resolution` because the resolution can change if the contentUrl is updated.
|
|
||||||
if (pop.selectedPost) {
|
|
||||||
pop.selectedPost.resolution = res;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
onMounted(() => {
|
|
||||||
if (pop.posts.length == 0) {
|
|
||||||
grabPost();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
useDark();
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<template>
|
|
||||||
<div class="popup-messages">
|
|
||||||
<div class="messages">
|
|
||||||
<!--
|
|
||||||
Error messages
|
|
||||||
-->
|
|
||||||
|
|
||||||
<div v-if="cfg.sites.length == 0" class="bg-danger">
|
|
||||||
<span>No szurubooru servers configured!</span>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div v-if="!szuru && cfg.sites.length != 0" class="bg-danger">
|
|
||||||
<span>No target server selected!</span>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div v-if="instanceSpecificData?.reverseSearchResult?.exactPostId" class="bg-danger has-merge-button">
|
|
||||||
<a :href="getActiveSitePostUrl(instanceSpecificData.reverseSearchResult?.exactPostId)">
|
|
||||||
Post already uploaded ({{ instanceSpecificData.reverseSearchResult.exactPostId }})
|
|
||||||
</a>
|
|
||||||
|
|
||||||
<!-- TODO: Maybe a 5px gap here? -->
|
|
||||||
|
|
||||||
<div style="display: flex; background: purple; border-radius: 0 2px 2px 0">
|
|
||||||
<router-link
|
|
||||||
:to="{
|
|
||||||
name: 'merge',
|
|
||||||
params: {
|
|
||||||
siteId: cfg.selectedSiteId,
|
|
||||||
postId: instanceSpecificData?.reverseSearchResult?.exactPostId,
|
|
||||||
},
|
|
||||||
}"
|
|
||||||
style="padding: 5px 20px"
|
|
||||||
>Merge</router-link
|
|
||||||
>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!--
|
|
||||||
Only show error when it's not undefined and not empty.
|
|
||||||
TODO: Maybe remove this in favor of genericError?
|
|
||||||
-->
|
|
||||||
<div v-if="instanceSpecificData?.uploadState?.error?.length" class="bg-danger">
|
|
||||||
<span>Couldn't upload post. {{ instanceSpecificData.uploadState.error }}</span>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div v-if="instanceSpecificData?.genericError" class="bg-danger">
|
|
||||||
<span>{{ instanceSpecificData.genericError }}</span>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!--
|
|
||||||
Success messages
|
|
||||||
-->
|
|
||||||
|
|
||||||
<!-- TODO: Clicking a link doesn't actually open it in a new tab, see https://stackoverflow.com/questions/8915845 -->
|
|
||||||
<div
|
|
||||||
v-if="
|
|
||||||
instanceSpecificData?.uploadState?.state == 'uploaded' && instanceSpecificData?.uploadState.instancePostId
|
|
||||||
"
|
|
||||||
class="bg-success"
|
|
||||||
>
|
|
||||||
<a :href="getActiveSitePostUrl(instanceSpecificData.uploadState.instancePostId)"
|
|
||||||
>Uploaded post {{ instanceSpecificData.uploadState.instancePostId }}</a
|
|
||||||
>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div v-if="instanceSpecificData?.uploadState?.updateTagsState?.totalChanged" class="bg-success">
|
|
||||||
<span>{{ getUpdatedTagsText(instanceSpecificData.uploadState?.updateTagsState?.totalChanged) }}</span>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!--
|
|
||||||
Info messages
|
|
||||||
-->
|
|
||||||
|
|
||||||
<div v-if="instanceSpecificData?.uploadState?.state == 'uploading'"><span>Uploading...</span></div>
|
|
||||||
|
|
||||||
<div
|
|
||||||
v-if="
|
|
||||||
instanceSpecificData?.uploadState?.updateTagsState?.total &&
|
|
||||||
instanceSpecificData.uploadState?.updateTagsState?.current == undefined
|
|
||||||
"
|
|
||||||
>
|
|
||||||
<span>{{ instanceSpecificData.uploadState?.updateTagsState?.total }} tags need a different category</span>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div
|
|
||||||
v-if="
|
|
||||||
instanceSpecificData?.uploadState?.updateTagsState?.current &&
|
|
||||||
instanceSpecificData?.uploadState?.updateTagsState?.totalChanged == undefined
|
|
||||||
"
|
|
||||||
>
|
|
||||||
<span
|
|
||||||
>Updating tag {{ instanceSpecificData.uploadState?.updateTagsState?.current }}/{{
|
|
||||||
instanceSpecificData.uploadState?.updateTagsState?.total
|
|
||||||
}}</span
|
|
||||||
>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div v-if="isSearchingForSimilarPosts > 0 && instanceSpecificData?.uploadState == undefined">
|
|
||||||
<span>Searching for similar posts...</span>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div
|
|
||||||
v-if="
|
|
||||||
instanceSpecificData?.reverseSearchResult?.similarPosts.length == 0 &&
|
|
||||||
instanceSpecificData.uploadState == undefined
|
|
||||||
"
|
|
||||||
>
|
|
||||||
<span>No similar posts found</span>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div
|
|
||||||
v-for="similarPost in getSimilarPosts(instanceSpecificData?.reverseSearchResult)"
|
|
||||||
:key="similarPost.id"
|
|
||||||
class="has-merge-button"
|
|
||||||
>
|
|
||||||
<a :href="getActiveSitePostUrl(similarPost.id)"
|
|
||||||
>Post {{ similarPost.id }} looks {{ similarPost.percentage }}% similar</a
|
|
||||||
>
|
|
||||||
|
|
||||||
<!-- TODO: Maybe a 5px gap here? -->
|
|
||||||
|
|
||||||
<div style="display: flex; background: purple; border-radius: 0 2px 2px 0">
|
|
||||||
<router-link
|
|
||||||
:to="{
|
|
||||||
name: 'merge',
|
|
||||||
params: {
|
|
||||||
siteId: cfg.selectedSiteId,
|
|
||||||
postId: similarPost.id,
|
|
||||||
},
|
|
||||||
}"
|
|
||||||
style="padding: 5px 20px"
|
|
||||||
>Merge</router-link
|
|
||||||
>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div v-if="pop.selectedPost" class="popup-columns" :class="{ mobile: isMobile }">
|
|
||||||
<div class="popup-left">
|
|
||||||
<PopupSection>
|
|
||||||
<template #header>
|
|
||||||
<span>Basic info</span>
|
|
||||||
<font-awesome-icon icon="fa-solid fa-cog" class="cursor-pointer" @click="openOptionsPage" />
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<div class="section-row" v-if="pop.selectedPost?.resolution || pop.selectedPost?.contentSize">
|
|
||||||
<PostInfoSummary v-model="pop.selectedPost" />
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="section-row">
|
|
||||||
<span class="section-label">Safety</span>
|
|
||||||
|
|
||||||
<div style="display: flex; gap: 10px">
|
|
||||||
<label>
|
|
||||||
<input type="radio" value="safe" v-model="pop.selectedPost.rating" />
|
|
||||||
Safe
|
|
||||||
</label>
|
|
||||||
|
|
||||||
<label>
|
|
||||||
<input type="radio" value="sketchy" v-model="pop.selectedPost.rating" />
|
|
||||||
Sketchy
|
|
||||||
</label>
|
|
||||||
|
|
||||||
<label>
|
|
||||||
<input type="radio" value="unsafe" v-model="pop.selectedPost.rating" />
|
|
||||||
Unsafe
|
|
||||||
</label>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div v-if="cfg.popup.showSource" class="section-row">
|
|
||||||
<span class="section-label">Source</span>
|
|
||||||
<textarea v-model="pop.selectedPost.source"></textarea>
|
|
||||||
</div>
|
|
||||||
</PopupSection>
|
|
||||||
|
|
||||||
<PopupSection header="Tags" toggleable v-model="cfg.popup.expandTags">
|
|
||||||
<div class="section-row">
|
|
||||||
<TagInput :szuru="szuru" @add-tag="addTag" />
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="section-row">
|
|
||||||
<CompactTags
|
|
||||||
:tags="pop.selectedPost.tags"
|
|
||||||
:show-remove-tag="true"
|
|
||||||
:show-usages="cfg.loadTagCounts"
|
|
||||||
@remove-tag="removeTag"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
</PopupSection>
|
|
||||||
|
|
||||||
<PopupSection v-if="cfg.popup.showPools" header="Pools" toggleable v-model="cfg.popup.expandPools">
|
|
||||||
<div class="section-row">
|
|
||||||
<PoolInput :szuru="szuru" @add-pool="addPool" />
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="section-row">
|
|
||||||
<CompactPools
|
|
||||||
:pools="pop.selectedPost.pools"
|
|
||||||
:show-remove-pool="true"
|
|
||||||
show-post-count
|
|
||||||
@remove-pool="removePool"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
</PopupSection>
|
|
||||||
|
|
||||||
<div v-if="cfg.popup.showInstancePicker" class="popup-section">
|
|
||||||
<div class="section-row">
|
|
||||||
<select v-model="cfg.selectedSiteId">
|
|
||||||
<option v-for="site in cfg.sites" :key="site.id" :value="site.id">
|
|
||||||
{{ site.domain }}
|
|
||||||
</option>
|
|
||||||
</select>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="popup-right">
|
|
||||||
<div class="popup-section">
|
|
||||||
<select v-model="pop.selectedPostId">
|
|
||||||
<!--    is used because duplicate space characters are usually removed by the browser. -->
|
|
||||||
<option v-for="post in pop.posts" :key="post.id" :value="post.id">
|
|
||||||
{{ post.name }}  -  {{ getPostInfoSummary(post) }}
|
|
||||||
</option>
|
|
||||||
</select>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="popup-section">
|
|
||||||
<div style="display: flex; gap: 5px">
|
|
||||||
<button v-if="!cfg.autoSearchSimilar" class="primary" @click="clickFindSimilar">Find similar</button>
|
|
||||||
<button class="primary full" @click="upload">Import</button>
|
|
||||||
<!-- TODO: Add button to open this popup in fullscreen. -->
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="popup-section">
|
|
||||||
<PostContentDisplay
|
|
||||||
:content-url="pop.selectedPost.contentUrl"
|
|
||||||
:content-type="pop.selectedPost.contentType"
|
|
||||||
@on-resolution-loaded="onResolutionLoaded"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div v-else class="p-3 flex items-center gap-3">
|
|
||||||
<span>No content found</span>
|
|
||||||
<font-awesome-icon icon="fa-solid fa-cog" class="cursor-pointer" @click="openOptionsPage" />
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<style scoped lang="scss">
|
|
||||||
.popup-left {
|
|
||||||
flex: 1 0 300px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.popup-right {
|
|
||||||
flex: 1 1 auto;
|
|
||||||
}
|
|
||||||
|
|
||||||
.has-merge-button {
|
|
||||||
display: flex;
|
|
||||||
justify-content: space-between;
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
|
|
@ -1,96 +0,0 @@
|
||||||
import { defineStore } from "pinia";
|
|
||||||
import deepMerge from "deepmerge";
|
|
||||||
import {
|
|
||||||
type TagDetails,
|
|
||||||
getDefaultTagCategories,
|
|
||||||
type ScrapedPostDetails,
|
|
||||||
type SetPostUploadInfoData,
|
|
||||||
type SzuruSiteConfig,
|
|
||||||
type TagCategoryColor,
|
|
||||||
} from "~/models";
|
|
||||||
import { useStorageLocal } from "~/composables/useStorageLocal";
|
|
||||||
|
|
||||||
export const cfg = useStorageLocal(
|
|
||||||
"config",
|
|
||||||
{
|
|
||||||
version: 0,
|
|
||||||
addPageUrlToSource: true,
|
|
||||||
alwaysUploadAsContent: false,
|
|
||||||
sendUploadNotifications: false,
|
|
||||||
autoSearchSimilar: false,
|
|
||||||
loadTagCounts: true,
|
|
||||||
fetchPostInfo: true,
|
|
||||||
useContentTokens: true,
|
|
||||||
sites: [] as Array<SzuruSiteConfig>,
|
|
||||||
selectedSiteId: undefined as string | undefined,
|
|
||||||
addTagImplications: true,
|
|
||||||
addAllParsedTags: true,
|
|
||||||
merge: {
|
|
||||||
expandOptions: true,
|
|
||||||
expandExistingTags: false,
|
|
||||||
expandAddTags: true,
|
|
||||||
addMissingTags: true,
|
|
||||||
appendSource: true,
|
|
||||||
mergeSafety: true,
|
|
||||||
},
|
|
||||||
popup: {
|
|
||||||
expandTags: true,
|
|
||||||
expandPools: false,
|
|
||||||
showSource: true,
|
|
||||||
showPools: true,
|
|
||||||
showInstancePicker: true,
|
|
||||||
},
|
|
||||||
tagCategories: [] as Array<TagCategoryColor>,
|
|
||||||
tagIgnores: [] as Array<TagDetails>,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
mergeDefaults(storageValue, defaults) {
|
|
||||||
const cfg = deepMerge(defaults, storageValue);
|
|
||||||
const oldVersion = cfg.version;
|
|
||||||
|
|
||||||
// Crappy config migration.
|
|
||||||
switch (cfg.version) {
|
|
||||||
case 0:
|
|
||||||
cfg.version++;
|
|
||||||
|
|
||||||
// Don't clear the existing tagCategories and don't add duplicates.
|
|
||||||
for (const cat of getDefaultTagCategories()) {
|
|
||||||
if (!cfg.tagCategories.find((x) => x.name == cat.name)) {
|
|
||||||
cfg.tagCategories.push(cat);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (oldVersion != cfg.version) {
|
|
||||||
console.log(`Migrated config from version ${oldVersion} to ${cfg.version}`);
|
|
||||||
}
|
|
||||||
|
|
||||||
return cfg;
|
|
||||||
},
|
|
||||||
},
|
|
||||||
);
|
|
||||||
|
|
||||||
export const usePopupStore = defineStore("popup", {
|
|
||||||
state: () => ({
|
|
||||||
posts: [] as ScrapedPostDetails[],
|
|
||||||
selectedPostId: undefined as string | undefined,
|
|
||||||
isSearchingForSimilarPosts: 0,
|
|
||||||
}),
|
|
||||||
getters: {
|
|
||||||
selectedPost: (state) => {
|
|
||||||
return state.posts.find((x) => x.id == state.selectedPostId);
|
|
||||||
},
|
|
||||||
},
|
|
||||||
actions: {
|
|
||||||
getPostForContentUrl(contentUrl: string): ScrapedPostDetails | undefined {
|
|
||||||
return this.posts.find((x) => x.contentUrl == contentUrl);
|
|
||||||
},
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
export const useMergeStore = defineStore("merge", {
|
|
||||||
state: () => ({
|
|
||||||
uploadInfo: [] as SetPostUploadInfoData[],
|
|
||||||
genericError: undefined as string | undefined,
|
|
||||||
}),
|
|
||||||
});
|
|
||||||
|
|
@ -1,21 +1,56 @@
|
||||||
@use "sass:color";
|
@use "sass:color";
|
||||||
|
|
||||||
@use "primeflex/primeflex.scss";
|
@use "basscss/css/basscss-cp.css";
|
||||||
|
|
||||||
|
:root {
|
||||||
|
--space-1: 0.25rem;
|
||||||
|
--space-2: 0.5rem;
|
||||||
|
--space-3: 1rem;
|
||||||
|
--space-4: 2rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.flex-fit {
|
||||||
|
flex: 0 0 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.gap-1 {
|
||||||
|
gap: var(--space-1);
|
||||||
|
}
|
||||||
|
|
||||||
|
.gap-2 {
|
||||||
|
gap: var(--space-2);
|
||||||
|
}
|
||||||
|
|
||||||
|
.gap-3 {
|
||||||
|
gap: var(--space-3);
|
||||||
|
}
|
||||||
|
|
||||||
|
.gap-4 {
|
||||||
|
gap: var(--space-4);
|
||||||
|
}
|
||||||
|
|
||||||
|
.gapx-1 {
|
||||||
|
column-gap: var(--space-1);
|
||||||
|
}
|
||||||
|
|
||||||
|
.gapx-2 {
|
||||||
|
column-gap: var(--space-2);
|
||||||
|
}
|
||||||
|
|
||||||
|
.gapx-3 {
|
||||||
|
column-gap: var(--space-3);
|
||||||
|
}
|
||||||
|
|
||||||
|
.gapx-4 {
|
||||||
|
column-gap: var(--space-4);
|
||||||
|
}
|
||||||
|
|
||||||
/* open-sans-regular - latin */
|
/* open-sans-regular - latin */
|
||||||
@font-face {
|
@font-face {
|
||||||
font-family: "Open Sans";
|
font-family: "Open Sans";
|
||||||
font-style: normal;
|
font-style: normal;
|
||||||
font-weight: 400;
|
font-weight: 400;
|
||||||
src:
|
src: local(""), url("/assets/open-sans-v34-latin-regular.woff2") format("woff2");
|
||||||
local(""),
|
|
||||||
url("/assets/open-sans-v34-latin-regular.woff2") format("woff2");
|
|
||||||
}
|
|
||||||
|
|
||||||
*,
|
|
||||||
*:before,
|
|
||||||
*:after {
|
|
||||||
box-sizing: border-box;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
body {
|
body {
|
||||||
|
|
@ -42,7 +77,6 @@ $danger-color-dark: color.scale($danger-color, $lightness: -50%);
|
||||||
--section-header-fg-color: #4c4c4c;
|
--section-header-fg-color: #4c4c4c;
|
||||||
--section-header-bg-color: #eee;
|
--section-header-bg-color: #eee;
|
||||||
--text-color: #111;
|
--text-color: #111;
|
||||||
--tab-color: rgba(0, 0, 0, 0.06);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
html.dark {
|
html.dark {
|
||||||
|
|
@ -55,10 +89,8 @@ html.dark {
|
||||||
--section-header-fg-color: #d9d9d9;
|
--section-header-fg-color: #d9d9d9;
|
||||||
--section-header-bg-color: #272727;
|
--section-header-bg-color: #272727;
|
||||||
--text-color: #e6e6e6;
|
--text-color: #e6e6e6;
|
||||||
--tab-color: rgba(255, 255, 255, 0.06);
|
|
||||||
color: var(--text-color);
|
color: var(--text-color);
|
||||||
background-color: var(--bg-main-color);
|
background-color: var(--bg-main-color);
|
||||||
color-scheme: dark;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
body {
|
body {
|
||||||
|
|
@ -96,10 +128,10 @@ input[type="text"],
|
||||||
select {
|
select {
|
||||||
color: var(--text-color);
|
color: var(--text-color);
|
||||||
background-color: var(--bg-secondary-color);
|
background-color: var(--bg-secondary-color);
|
||||||
border: 2px solid var(--border-color);
|
border: 1px solid var(--border-color);
|
||||||
|
|
||||||
padding: 0.2em 0.3em;
|
padding: 0.2em 0.3em;
|
||||||
// box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
|
|
||||||
width: 100%;
|
width: 100%;
|
||||||
|
|
||||||
|
|
@ -115,7 +147,7 @@ input[type="radio"] {
|
||||||
textarea {
|
textarea {
|
||||||
color: var(--text-color);
|
color: var(--text-color);
|
||||||
background-color: var(--bg-secondary-color);
|
background-color: var(--bg-secondary-color);
|
||||||
border: 2px solid var(--border-color);
|
border: 1px solid var(--border-color);
|
||||||
width: 100%;
|
width: 100%;
|
||||||
white-space: pre;
|
white-space: pre;
|
||||||
overflow-wrap: normal;
|
overflow-wrap: normal;
|
||||||
|
|
@ -125,7 +157,7 @@ textarea {
|
||||||
|
|
||||||
&:focus {
|
&:focus {
|
||||||
outline: var(--primary-color) solid 2px;
|
outline: var(--primary-color) solid 2px;
|
||||||
// box-sizing: content-box;
|
box-sizing: content-box;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -138,7 +170,6 @@ img {
|
||||||
display: flex;
|
display: flex;
|
||||||
}
|
}
|
||||||
|
|
||||||
// DEPRECATED: Replace with primeflex w-full
|
|
||||||
.full {
|
.full {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
}
|
}
|
||||||
|
|
@ -149,8 +180,7 @@ ul.compact {
|
||||||
display: inline;
|
display: inline;
|
||||||
}
|
}
|
||||||
|
|
||||||
.compact-tags,
|
.compact-tags {
|
||||||
.compact-pools {
|
|
||||||
list-style-type: none;
|
list-style-type: none;
|
||||||
padding: 0;
|
padding: 0;
|
||||||
display: inline;
|
display: inline;
|
||||||
|
|
@ -167,6 +197,30 @@ ul.compact {
|
||||||
color: var(--primary-color);
|
color: var(--primary-color);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.tag-copyright {
|
||||||
|
color: rgb(170, 0, 170);
|
||||||
|
}
|
||||||
|
|
||||||
|
.tag-character {
|
||||||
|
color: rgb(0, 170, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
.tag-artist {
|
||||||
|
color: rgb(170, 0, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
.tag-meta {
|
||||||
|
color: rgb(255, 128, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
.tag-species {
|
||||||
|
color: rgb(17, 14, 247);
|
||||||
|
}
|
||||||
|
|
||||||
|
.tag-lore {
|
||||||
|
color: rgb(48, 48, 48);
|
||||||
|
}
|
||||||
|
|
||||||
.remove-tag {
|
.remove-tag {
|
||||||
color: var(--secondary-text);
|
color: var(--secondary-text);
|
||||||
}
|
}
|
||||||
|
|
@ -183,18 +237,17 @@ a.remove-tag {
|
||||||
}
|
}
|
||||||
|
|
||||||
.messages {
|
.messages {
|
||||||
> div {
|
list-style-type: none;
|
||||||
display: flex;
|
padding: 0;
|
||||||
|
display: inline;
|
||||||
|
|
||||||
|
> li {
|
||||||
|
padding: 5px;
|
||||||
border-radius: 2px;
|
border-radius: 2px;
|
||||||
background: var(--primary-color);
|
background: var(--primary-color);
|
||||||
color: #fff;
|
color: #fff;
|
||||||
|
|
||||||
a,
|
> a {
|
||||||
span {
|
|
||||||
padding: 5px;
|
|
||||||
}
|
|
||||||
|
|
||||||
a {
|
|
||||||
color: #fff;
|
color: #fff;
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
}
|
}
|
||||||
|
|
@ -216,61 +269,3 @@ a.remove-tag {
|
||||||
.bg-success {
|
.bg-success {
|
||||||
background: var(--success-color) !important;
|
background: var(--success-color) !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
.danger {
|
|
||||||
color: var(--danger-color);
|
|
||||||
}
|
|
||||||
|
|
||||||
.success {
|
|
||||||
color: var(--success-color);
|
|
||||||
}
|
|
||||||
|
|
||||||
.cursor-pointer {
|
|
||||||
cursor: pointer;
|
|
||||||
}
|
|
||||||
|
|
||||||
.popup-section {
|
|
||||||
margin: 10px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.section-header {
|
|
||||||
height: 30px;
|
|
||||||
padding: 0 6px 0 10px;
|
|
||||||
background-color: var(--section-header-bg-color);
|
|
||||||
display: flex;
|
|
||||||
justify-content: space-between;
|
|
||||||
align-items: center;
|
|
||||||
|
|
||||||
> span {
|
|
||||||
font-size: 1.2em;
|
|
||||||
vertical-align: middle;
|
|
||||||
color: var(--section-header-fg-color);
|
|
||||||
}
|
|
||||||
|
|
||||||
&.toggleable {
|
|
||||||
cursor: pointer;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.section-row {
|
|
||||||
margin: 10px 5px 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.section-label {
|
|
||||||
display: block;
|
|
||||||
margin: 0 0 5px 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.section-block {
|
|
||||||
display: block;
|
|
||||||
}
|
|
||||||
|
|
||||||
.color-primary {
|
|
||||||
color: var(--primary-color);
|
|
||||||
}
|
|
||||||
|
|
||||||
.separated-content > * + * {
|
|
||||||
padding-top: 1rem;
|
|
||||||
margin-top: 1.5rem;
|
|
||||||
border-top: 3px solid #333;
|
|
||||||
}
|
|
||||||
|
|
|
||||||
|
|
@ -1,35 +0,0 @@
|
||||||
.popup-container {
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
}
|
|
||||||
|
|
||||||
.popup-messages {
|
|
||||||
grid-column: 1 / 3;
|
|
||||||
margin: 0 10px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.popup-columns {
|
|
||||||
display: flex;
|
|
||||||
flex-direction: row;
|
|
||||||
|
|
||||||
&.mobile {
|
|
||||||
flex-direction: column-reverse;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
video {
|
|
||||||
width: 100%;
|
|
||||||
}
|
|
||||||
|
|
||||||
textarea,
|
|
||||||
select {
|
|
||||||
font-size: 90%;
|
|
||||||
}
|
|
||||||
|
|
||||||
label {
|
|
||||||
flex: 1 0 auto;
|
|
||||||
|
|
||||||
input[type="radio"] {
|
|
||||||
margin: 3px 3px 0 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,27 +0,0 @@
|
||||||
.p-tabview {
|
|
||||||
.p-tabview-nav {
|
|
||||||
margin: 1em 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.p-tabview-header {
|
|
||||||
span {
|
|
||||||
padding: 0 1.2em;
|
|
||||||
line-height: 2.3em;
|
|
||||||
}
|
|
||||||
|
|
||||||
&.p-highlight {
|
|
||||||
background-color: var(--tab-color);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.p-datatable {
|
|
||||||
margin: -0.4em;
|
|
||||||
|
|
||||||
.p-datatable-table {
|
|
||||||
th,
|
|
||||||
td {
|
|
||||||
padding: 0.4em;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
import { describe, expect, it } from "vitest";
|
import { describe, expect, it } from 'vitest';
|
||||||
|
|
||||||
describe("Demo", () => {
|
describe('Demo', () => {
|
||||||
it("should work", () => {
|
it('should work', () => {
|
||||||
expect(1 + 1).toBe(2);
|
expect(1 + 1).toBe(2);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
|
||||||
112
src/utils.ts
112
src/utils.ts
|
|
@ -1,8 +1,3 @@
|
||||||
import byteSize from "byte-size";
|
|
||||||
import { MicroUser, Post } from "./api/models";
|
|
||||||
import { ScrapedPostDetails, TagDetails } from "./models";
|
|
||||||
import SzurubooruApi from "./api";
|
|
||||||
|
|
||||||
export function getUrl(root: string, ...parts: string[]): string {
|
export function getUrl(root: string, ...parts: string[]): string {
|
||||||
let url = root.replace(/\/+$/, "");
|
let url = root.replace(/\/+$/, "");
|
||||||
for (const part of parts) {
|
for (const part of parts) {
|
||||||
|
|
@ -21,110 +16,3 @@ export function encodeTagName(tagName: string) {
|
||||||
export function getErrorMessage(ex: any) {
|
export function getErrorMessage(ex: any) {
|
||||||
return ex.description ?? ex.message ?? ex;
|
return ex.description ?? ex.message ?? ex;
|
||||||
}
|
}
|
||||||
|
|
||||||
export function emptyMicroUser(): MicroUser {
|
|
||||||
return {
|
|
||||||
name: "",
|
|
||||||
avatarUrl: "",
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
export function emptyPost(): Post {
|
|
||||||
return {
|
|
||||||
id: 0,
|
|
||||||
version: 0,
|
|
||||||
creationTime: new Date(),
|
|
||||||
lastEditTime: new Date(),
|
|
||||||
safety: "safe",
|
|
||||||
source: "",
|
|
||||||
type: "",
|
|
||||||
mimeType: "",
|
|
||||||
checksum: "",
|
|
||||||
fileSize: 0,
|
|
||||||
canvasWidth: 0,
|
|
||||||
canvasHeight: 0,
|
|
||||||
contentUrl: "",
|
|
||||||
thumbnailUrl: "",
|
|
||||||
flags: [],
|
|
||||||
tags: [],
|
|
||||||
relations: [],
|
|
||||||
user: emptyMicroUser(),
|
|
||||||
score: 0,
|
|
||||||
ownScore: 0,
|
|
||||||
ownFavorite: false,
|
|
||||||
tagCount: 0,
|
|
||||||
favoriteCount: 0,
|
|
||||||
commentCount: 0,
|
|
||||||
noteCount: 0,
|
|
||||||
relationCount: 0,
|
|
||||||
featureCount: 0,
|
|
||||||
lastFeatureTime: new Date(),
|
|
||||||
favoritedBy: [],
|
|
||||||
hasCustomThumbnail: false,
|
|
||||||
notes: [],
|
|
||||||
comments: [],
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
export function getTagClasses(tag: TagDetails): string[] {
|
|
||||||
const classes: string[] = [];
|
|
||||||
|
|
||||||
if (tag.category && tag.category != "default") {
|
|
||||||
classes.push("tag-" + tag.category);
|
|
||||||
} else {
|
|
||||||
classes.push("tag-general");
|
|
||||||
}
|
|
||||||
|
|
||||||
return classes;
|
|
||||||
}
|
|
||||||
|
|
||||||
export function breakTagName(tagName: string) {
|
|
||||||
// Based on https://stackoverflow.com/a/6316913
|
|
||||||
return tagName.replace(/_/g, "_<wbr>");
|
|
||||||
}
|
|
||||||
|
|
||||||
export function resolutionToString(resolution: [number, number]) {
|
|
||||||
if (resolution && resolution.length == 2) {
|
|
||||||
return resolution[0] + "x" + resolution[1];
|
|
||||||
}
|
|
||||||
return "";
|
|
||||||
}
|
|
||||||
|
|
||||||
export function getPostInfoSummary(post: ScrapedPostDetails) {
|
|
||||||
const parts = [];
|
|
||||||
if (post.contentSize) {
|
|
||||||
parts.push(byteSize(post.contentSize));
|
|
||||||
}
|
|
||||||
if (post.contentSubType) {
|
|
||||||
parts.push(post.contentSubType);
|
|
||||||
}
|
|
||||||
if (post.resolution) {
|
|
||||||
parts.push(resolutionToString(post.resolution));
|
|
||||||
}
|
|
||||||
return parts.join(" / ");
|
|
||||||
}
|
|
||||||
|
|
||||||
export async function ensurePostHasContentToken(selectedInstance: SzurubooruApi, post: ScrapedPostDetails, cfg: any) {
|
|
||||||
if (!selectedInstance || !cfg.value.selectedSiteId) return;
|
|
||||||
|
|
||||||
const instanceSpecificData = post.instanceSpecificData[cfg.value.selectedSiteId];
|
|
||||||
|
|
||||||
if (!instanceSpecificData) {
|
|
||||||
console.error("instanceSpecificData is undefined. This should never happen!");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (instanceSpecificData.contentToken) {
|
|
||||||
console.log("[ensurePostHasContentToken] contentToken is already set.");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
const tmpRes = await selectedInstance.uploadTempFile(post.contentUrl, post.uploadMode);
|
|
||||||
// Save contentToken in PostViewModel so that we can reuse it when creating/uploading the post.
|
|
||||||
instanceSpecificData.contentToken = tmpRes.token;
|
|
||||||
} catch (ex) {
|
|
||||||
instanceSpecificData.genericError = "Couldn't upload content. " + getErrorMessage(ex);
|
|
||||||
throw ex;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,10 @@
|
||||||
"baseUrl": ".",
|
"baseUrl": ".",
|
||||||
"module": "ESNext",
|
"module": "ESNext",
|
||||||
"target": "es2016",
|
"target": "es2016",
|
||||||
"lib": ["DOM", "ESNext"],
|
"lib": [
|
||||||
|
"DOM",
|
||||||
|
"ESNext"
|
||||||
|
],
|
||||||
"strict": true,
|
"strict": true,
|
||||||
"esModuleInterop": true,
|
"esModuleInterop": true,
|
||||||
"incremental": false,
|
"incremental": false,
|
||||||
|
|
@ -13,10 +16,17 @@
|
||||||
"resolveJsonModule": true,
|
"resolveJsonModule": true,
|
||||||
"noUnusedLocals": true,
|
"noUnusedLocals": true,
|
||||||
"forceConsistentCasingInFileNames": true,
|
"forceConsistentCasingInFileNames": true,
|
||||||
"types": ["vite/client"],
|
"types": [
|
||||||
|
"vite/client"
|
||||||
|
],
|
||||||
"paths": {
|
"paths": {
|
||||||
"~/*": ["src/*"]
|
"~/*": [
|
||||||
|
"src/*"
|
||||||
|
]
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"exclude": ["dist", "node_modules"]
|
"exclude": [
|
||||||
|
"dist",
|
||||||
|
"node_modules"
|
||||||
|
]
|
||||||
}
|
}
|
||||||
|
|
|
||||||
12
updates.json
12
updates.json
|
|
@ -1,12 +0,0 @@
|
||||||
{
|
|
||||||
"addons": {
|
|
||||||
"suzuruchrome@goblincave": {
|
|
||||||
"updates": [
|
|
||||||
{
|
|
||||||
"version": "0.1.4",
|
|
||||||
"update_link": "https://gitea.goblincave.synology.me/Nes/SzuruChrome/releases/download/mod-v0.1.X/SzuruChrome_v0.1.4.xpi"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -71,6 +71,10 @@ export default defineConfig(({ command }) => ({
|
||||||
outDir: r("extension/dist"),
|
outDir: r("extension/dist"),
|
||||||
emptyOutDir: false,
|
emptyOutDir: false,
|
||||||
sourcemap: isDev ? "inline" : false,
|
sourcemap: isDev ? "inline" : false,
|
||||||
|
// https://developer.chrome.com/docs/webstore/program_policies/#:~:text=Code%20Readability%20Requirements
|
||||||
|
terserOptions: {
|
||||||
|
mangle: false,
|
||||||
|
},
|
||||||
rollupOptions: {
|
rollupOptions: {
|
||||||
input: {
|
input: {
|
||||||
background: r("src/background/index.html"),
|
background: r("src/background/index.html"),
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue