From f7849b42c8ef036b17957727f4d6505b86199b90 Mon Sep 17 00:00:00 2001 From: neobooru <50623835+neobooru@users.noreply.github.com> Date: Sat, 4 Feb 2023 13:40:58 +0100 Subject: [PATCH] [wip] Multi szurubooru instance support --- README.md | 12 +-- package.json | 1 + pnpm-lock.yaml | 62 ++++++++++++ src/api/index.ts | 2 +- src/background/main.ts | 19 ++-- src/config.ts | 6 +- src/models/index.ts | 6 +- src/options/Options.vue | 214 +++++++++++++++++++++++----------------- src/popup/Popup.vue | 68 ++++++++----- src/styles/main.scss | 67 +++++++++++-- 10 files changed, 317 insertions(+), 140 deletions(-) diff --git a/README.md b/README.md index f01c6a5..b3d4f29 100644 --- a/README.md +++ b/README.md @@ -40,11 +40,13 @@ You can download a .zip containing the needed files from the [release tab](https ```sh # Install node modules -yarn install +pnpm install -# Use any of the following commands to build -yarn build -yarn build:dev +# Live dev build (watch) +pnpm dev + +# Production build +pnpm build ``` After this you can load them in your browser. @@ -61,5 +63,3 @@ These are some things I might work on. Though honestly I don't expect this exten - 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 -- [lowest priority] Move from 'options_page' to 'options_ui' -- [lowest priority] Multiple szurubooru instances (where you can choose to which one you want to upload the post) diff --git a/package.json b/package.json index cd1afbc..430ffd9 100644 --- a/package.json +++ b/package.json @@ -27,6 +27,7 @@ }, "dependencies": { "axios": "^1.2.2", + "basscss": "^8.1.0", "markdown-it": "^13.0.1", "neo-scraper": "^0.5.8", "normalize.css": "^8.0.1" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 89d4668..b3758f1 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -15,6 +15,7 @@ specifiers: '@vue/test-utils': ^2.2.4 '@vueuse/core': ^9.6.0 axios: ^1.2.2 + basscss: ^8.1.0 chokidar: ^3.5.3 cross-env: ^7.0.3 crx: ^5.0.1 @@ -41,6 +42,7 @@ specifiers: dependencies: axios: 1.2.2 + basscss: 8.1.0 markdown-it: 13.0.1 neo-scraper: 0.5.8 normalize.css: 8.0.1 @@ -1291,6 +1293,66 @@ packages: resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==} dev: true + /basscss-align/1.0.2: + resolution: {integrity: sha512-T7XvlG6jqjBvQ27xSioO5p069E5jW12QbOy+V+QKnkmfwkU+SDTrcLI2DMSlTPGbPmtDZHeRrG9qwOhjbaMMbg==} + dev: false + + /basscss-border/4.0.2: + resolution: {integrity: sha512-qw+AeA7zFVtYWdWR+GQ+CkXbGzJ6QhjyT4eE4SURSkviSoZkZEA+oVbtC/yD/hiy/spWFk9UDLE71vJ8CDEnHw==} + dev: false + + /basscss-flexbox/1.0.2: + resolution: {integrity: sha512-AtG6yBmmza2nPo3x9X4/7rbW22gLmiSvYvirFs7Aspt1zp5FHwpRBz3BD2v/a3qPdmVM8OvOLVNWISGM6O50MA==} + dev: false + + /basscss-grid/2.0.0: + resolution: {integrity: sha512-vUnHyLvNx4Bi7caXWMpooMBOBCP+bib/z+pu/kqySLHe0ap5kNTs9EgTBI/QVD8VrnruIznL5GUP3RuT0KLZ6g==} + dev: false + + /basscss-hide/1.0.1: + resolution: {integrity: sha512-NYKtjyYIoY4GGiRrE5b3NV/9AmLJOoYTshKl2N6rNI+Bvh+rElT+F7GsOvNlmJvoVhDihcLK16U2UYYNlmb9Bw==} + dev: false + + /basscss-layout/3.1.0: + resolution: {integrity: sha512-umKiuaeDS4THPPA/3N8UOO3wyubEKf+93Cm971QkAWLjDu2OrX5rOOAQC+tP+Q+OsMaAKvMNdZlA4kij+2y4nQ==} + dev: false + + /basscss-margin/1.0.9: + resolution: {integrity: sha512-wpF8tXrtzU+iMtLvfSgYJlpkIxChOlay3YumoI+yJ6IiOe5uMmEGUG8FWAIkC8QalkKDAURAqHmQ4nbuyUvyag==} + dev: false + + /basscss-padding/1.1.3: + resolution: {integrity: sha512-pfqA7LgTpdR9lCh36IxWFNV4kZM53G1lnQlvC/2MzUu62XhvRDXD2uENGXWwJYKgaxRAdqdDoHZ0K23mRlk29g==} + dev: false + + /basscss-position/2.0.3: + resolution: {integrity: sha512-g3esHpUHqABF4wieZyAVaLI6JnK7/mPVG65OCfM6VcSRQcw7g4mxHI8nTWlnwlzpwFnqXnI/KBco00ccUJvOLg==} + dev: false + + /basscss-type-scale/1.0.6: + resolution: {integrity: sha512-93KOVRr5iX0e38d6+k2pQ8WW1IA5DigQhJextts4rwbSt2+cr+XrokGJ74HB8LevO54HMoc3VJ8M6oOR2puc8A==} + dev: false + + /basscss-typography/3.0.4: + resolution: {integrity: sha512-PMCxUfYPpAj8gQV8qI09lfNp7eWNrKtQFkCN2fZjLyReSY/wnw8QP8irpvbJ67vSEhlkA6ZP8j7vmTDoxkyu8g==} + dev: false + + /basscss/8.1.0: + resolution: {integrity: sha512-SJ48HWDKqX1OnzeZgqwweFPVM98h0lNtvC+megWPCEJ1R6LIbx6dnj3rpCJueElVn9giWipZhoozMEBRAIlnUw==} + dependencies: + basscss-align: 1.0.2 + basscss-border: 4.0.2 + basscss-flexbox: 1.0.2 + basscss-grid: 2.0.0 + basscss-hide: 1.0.1 + basscss-layout: 3.1.0 + basscss-margin: 1.0.9 + basscss-padding: 1.1.3 + basscss-position: 2.0.3 + basscss-type-scale: 1.0.6 + basscss-typography: 3.0.4 + dev: false + /bcrypt-pbkdf/1.0.2: resolution: {integrity: sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==} dependencies: diff --git a/src/api/index.ts b/src/api/index.ts index b60e563..290e038 100644 --- a/src/api/index.ts +++ b/src/api/index.ts @@ -157,7 +157,7 @@ export default class SzurubooruApi { return await axios(config); } catch (ex: any) { const error = ex.response?.data as SzuruError | undefined; - throw error ? error : ex; + throw error?.name ? error : ex; } } } diff --git a/src/background/main.ts b/src/background/main.ts index fe524b9..197ed65 100644 --- a/src/background/main.ts +++ b/src/background/main.ts @@ -1,5 +1,5 @@ import { encodeTagName, getUrl } from "~/utils"; -import { BrowserCommand, Message, PostDetails } from "~/models"; +import { BrowserCommand, Message, PostUploadCommandData } from "~/models"; import { PostAlreadyUploadedError, SzuruError } from "~/api/models"; import SzurubooruApi from "~/api"; import { Config } from "~/config"; @@ -12,24 +12,27 @@ if (import.meta.hot) { import("./contentScriptHMR"); } -async function uploadPost(post: PostDetails) { - console.dir(post); +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 (cfg.sites.length == 0) { + if (!selectedSite) { // TODO: Generic error handler which also shows the message in the popup frontend. - browser.runtime.sendMessage(new BrowserCommand("push_message", new Message("cfg.sites.length == 0", "error"))); + browser.runtime.sendMessage( + new BrowserCommand("push_message", new Message("Selected instance not found in config!", "error")) + ); return; } - const szuru = SzurubooruApi.createFromConfig(cfg.sites[0]); + const szuru = SzurubooruApi.createFromConfig(selectedSite); try { // Create and upload post browser.runtime.sendMessage(new BrowserCommand("pop_messages", 10)); browser.runtime.sendMessage(new BrowserCommand("push_message", new Message("Uploading..."))); - const createdPost = await szuru.createPost(post); + const createdPost = await szuru.createPost(data.post); browser.runtime.sendMessage(new BrowserCommand("pop_messages", 1)); browser.runtime.sendMessage( new BrowserCommand("push_message", new Message("Uploaded post " + createdPost.id, "success")) @@ -42,7 +45,7 @@ async function uploadPost(post: PostDetails) { // Find tags with "default" category and update it // TODO: Make all these categories configurable - const tagsWithCategory = post.tags.filter((x) => x.category); + const tagsWithCategory = data.post.tags.filter((x) => x.category); const unsetCategoryTags = createdPost.tags .filter((x) => x.category == "default") .filter((x) => tagsWithCategory.some((y) => x.names.includes(y.name))); diff --git a/src/config.ts b/src/config.ts index 0af1d6d..2f72df9 100644 --- a/src/config.ts +++ b/src/config.ts @@ -1,6 +1,7 @@ export class SzuruSiteConfig { - domain = ""; - username = ""; + id = window.crypto.randomUUID(); + domain = "https://example.com"; + username = "user"; authToken = ""; } @@ -13,6 +14,7 @@ export class Config { loadTagCounts = true; useContentTokens = true; sites: Array = []; + selectedSiteId: string | undefined = undefined; public async save() { await browser.storage.local.set({ diff --git a/src/models/index.ts b/src/models/index.ts index fda009d..89ffb10 100644 --- a/src/models/index.ts +++ b/src/models/index.ts @@ -25,7 +25,7 @@ export class TagDetails { } } -export class PostDetails { +export class ScrapedPostDetails { name = ""; tags: TagDetails[] = []; notes: ScrapedNote[]; @@ -73,3 +73,7 @@ export class BrowserCommand { this.data = data; } } + +export class PostUploadCommandData { + constructor(public readonly post: ScrapedPostDetails, public readonly siteId: string) {} +} diff --git a/src/options/Options.vue b/src/options/Options.vue index 753c3e2..d939af7 100644 --- a/src/options/Options.vue +++ b/src/options/Options.vue @@ -1,58 +1,61 @@