From 0e4667779ffe5b79c346826160ee33fdebf8e345 Mon Sep 17 00:00:00 2001 From: neobooru <50623835+neobooru@users.noreply.github.com> Date: Sun, 4 Aug 2019 20:26:30 +0200 Subject: [PATCH] Small fixes + Danbooru boilerplate --- package-lock.json | 41 ++++++++++++++++++++++++++++++----------- src/loaders/Danbooru.ts | 27 +++++++++++++++++++++++++++ src/loaders/index.ts | 1 + src/popup/App.vue | 8 ++++---- 4 files changed, 62 insertions(+), 15 deletions(-) create mode 100644 src/loaders/Danbooru.ts diff --git a/package-lock.json b/package-lock.json index ab99f17..c70e372 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2176,7 +2176,8 @@ "ansi-regex": { "version": "2.1.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "aproba": { "version": "1.2.0", @@ -2197,12 +2198,14 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -2217,17 +2220,20 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -2344,7 +2350,8 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -2356,6 +2363,7 @@ "version": "1.0.0", "bundled": true, "dev": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -2370,6 +2378,7 @@ "version": "3.0.4", "bundled": true, "dev": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -2377,12 +2386,14 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "minipass": { "version": "2.3.5", "bundled": true, "dev": true, + "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -2401,6 +2412,7 @@ "version": "0.5.1", "bundled": true, "dev": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -2481,7 +2493,8 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -2493,6 +2506,7 @@ "version": "1.4.0", "bundled": true, "dev": true, + "optional": true, "requires": { "wrappy": "1" } @@ -2578,7 +2592,8 @@ "safe-buffer": { "version": "5.1.2", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "safer-buffer": { "version": "2.1.2", @@ -2614,6 +2629,7 @@ "version": "1.0.2", "bundled": true, "dev": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -2633,6 +2649,7 @@ "version": "3.0.1", "bundled": true, "dev": true, + "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -2676,12 +2693,14 @@ "wrappy": { "version": "1.0.2", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "yallist": { "version": "3.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true } } }, diff --git a/src/loaders/Danbooru.ts b/src/loaders/Danbooru.ts new file mode 100644 index 0000000..5217fb6 --- /dev/null +++ b/src/loaders/Danbooru.ts @@ -0,0 +1,27 @@ +import ILoader from "./ILoader" +import { SzuruPost, SzuruTag, SzuruCategory } from "../SzuruTypes"; + +export default class Danbooru implements ILoader { + canImport(location: Location): boolean { + return ( + location.host == "danbooru.donmai.us" || + location.host == "safebooru.donmai.us" + ); + } + + async grabPost(dom: Document): Promise { + let post = new SzuruPost(); + + post.source = dom.location.href; + + // Get image url + + + // If post has enough filled fields to be considered a valid post + if (post.imageUrl) { + return post; + } else { + return null; + } + } +} \ No newline at end of file diff --git a/src/loaders/index.ts b/src/loaders/index.ts index 9b8b191..bbb2fad 100644 --- a/src/loaders/index.ts +++ b/src/loaders/index.ts @@ -1 +1,2 @@ export { default as Gelbooru } from "./Gelbooru"; +export { default as Danbooru } from "./Danbooru"; diff --git a/src/popup/App.vue b/src/popup/App.vue index 3d4ad27..cd885a8 100644 --- a/src/popup/App.vue +++ b/src/popup/App.vue @@ -107,7 +107,7 @@ export default Vue.extend({ data() { return { szuru: null as SzuruWrapper | null, - post: null as SzuruPost | null, + post: new SzuruPost(), messages: [] as Message[] }; }, @@ -167,7 +167,7 @@ export default Vue.extend({ window.open(url); }, getTagClasses(tag: SzuruTag): string[] { - let classes: string[] = [] + let classes: string[] = []; if (tag.category) { classes.push("tag-" + tag.category.name); @@ -184,7 +184,7 @@ export default Vue.extend({ } }, getMessageClasses(message: Message) { - let classes: string[] = [] + let classes: string[] = []; switch (message.type) { case "error": @@ -204,7 +204,7 @@ export default Vue.extend({ mounted() { this.grabPost(); - SzuruWrapper.createFromConfig().then((x) => { + SzuruWrapper.createFromConfig().then(x => { if (x) { this.szuru = x; } else {