Add option to import a posts origional source instead of the current page url

pull/25/head v0.5.0
neobooru 2021-01-15 21:16:11 +01:00
parent c044a68a13
commit 8202e15887
5 changed files with 27 additions and 9 deletions

8
package-lock.json generated
View File

@ -1,6 +1,6 @@
{ {
"name": "szuru-chrome", "name": "szuru-chrome",
"version": "0.4.1", "version": "0.5.0",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {
@ -3342,9 +3342,9 @@
"dev": true "dev": true
}, },
"neo-scraper": { "neo-scraper": {
"version": "0.2.5", "version": "0.3.0",
"resolved": "https://registry.npmjs.org/neo-scraper/-/neo-scraper-0.2.5.tgz", "resolved": "https://registry.npmjs.org/neo-scraper/-/neo-scraper-0.3.0.tgz",
"integrity": "sha512-7O50a4o+GJJ/nWzf2K3kRvUjzxP0KIEVLpZEltCNxE9anCa/6buGaz45CxwveSzPSovEptjjq1JUG1F3G3sIvA==" "integrity": "sha512-lD0w66Ryub4YXPUyiWjzwIVwWycAmII4+6yd6/QptzBA7Tbavv4dHe1t9oZdR0w0LQJZD5y00r1UZnIIg4L0Ag=="
}, },
"nice-try": { "nice-try": {
"version": "1.0.5", "version": "1.0.5",

View File

@ -1,6 +1,6 @@
{ {
"name": "szuru-chrome", "name": "szuru-chrome",
"version": "0.4.1", "version": "0.5.0",
"description": "Import media from various sites into szurubooru.", "description": "Import media from various sites into szurubooru.",
"author": "neobooru", "author": "neobooru",
"license": "MIT", "license": "MIT",
@ -16,7 +16,7 @@
}, },
"dependencies": { "dependencies": {
"axios": "^0.21.1", "axios": "^0.21.1",
"neo-scraper": "^0.2.5", "neo-scraper": "^0.3.0",
"vue": "^2.6.11", "vue": "^2.6.11",
"webextension-polyfill": "^0.3.1" "webextension-polyfill": "^0.3.1"
}, },

View File

@ -10,6 +10,7 @@ export class Config {
importExistingTags: boolean = true; importExistingTags: boolean = true;
importAllTags: boolean = false; importAllTags: boolean = false;
importCommentary: boolean = false; importCommentary: boolean = false;
useOriginalSource: boolean = true;
autoSearchSimilar: boolean = false; autoSearchSimilar: boolean = false;
sites: Array<SzuruSiteConfig> = []; sites: Array<SzuruSiteConfig> = [];

View File

@ -27,6 +27,11 @@
<input type="checkbox" name="autoSearchSimilar" v-model="autoSearchSimilar" /> <input type="checkbox" name="autoSearchSimilar" v-model="autoSearchSimilar" />
</label> </label>
<br /> <br />
<label>
Use original image source when available
<input type="checkbox" name="useOriginalSource" v-model="useOriginalSource" />
</label>
<br />
<div class="settings-footer-buttons"> <div class="settings-footer-buttons">
<button @click="testConnection">Test connection</button> <button @click="testConnection">Test connection</button>
<button @click="saveSettings" class="primary">Save settings</button> <button @click="saveSettings" class="primary">Save settings</button>
@ -47,6 +52,7 @@ export default Vue.extend({
username: "", username: "",
authToken: "", authToken: "",
autoSearchSimilar: false, autoSearchSimilar: false,
useOriginalSource: false,
}; };
}, },
methods: { methods: {
@ -81,6 +87,7 @@ export default Vue.extend({
siteConfig.authToken = this.authToken; siteConfig.authToken = this.authToken;
config.sites = [siteConfig]; config.sites = [siteConfig];
config.autoSearchSimilar = this.autoSearchSimilar; config.autoSearchSimilar = this.autoSearchSimilar;
config.useOriginalSource = this.useOriginalSource;
await config.save(); await config.save();
}, },
@ -95,13 +102,19 @@ export default Vue.extend({
this.domain = config.sites[0].domain; this.domain = config.sites[0].domain;
this.username = config.sites[0].username; this.username = config.sites[0].username;
this.authToken = config.sites[0].authToken; this.authToken = config.sites[0].authToken;
this.autoSearchSimilar = config.autoSearchSimilar;
} }
this.autoSearchSimilar = config.autoSearchSimilar;
this.useOriginalSource = config.useOriginalSource;
}, },
}); });
</script> </script>
<style scoped> <style scoped>
label {
margin-bottom: 10px;
}
.settings-container { .settings-container {
margin: 0; margin: 0;
position: absolute; position: absolute;
@ -115,11 +128,10 @@ export default Vue.extend({
} }
.settings-header { .settings-header {
padding: 0 0 20px 0; margin-bottom: 20px;
} }
.settings-footer-buttons { .settings-footer-buttons {
padding: 20px 0 0 0;
float: right; float: right;
} }

View File

@ -147,6 +147,11 @@ export default Vue.extend({
for (var i in result.posts) { for (var i in result.posts) {
const vm = Object.assign(new ScrapedPostViewModel(), result.posts[i]); const vm = Object.assign(new ScrapedPostViewModel(), result.posts[i]);
vm.name = `[${result.engine}] Post ${parseInt(i) + 1}`; // parseInt() is required! vm.name = `[${result.engine}] Post ${parseInt(i) + 1}`; // parseInt() is required!
if (this.config?.useOriginalSource == false || vm.source == undefined) {
vm.source = vm.pageUrl;
}
this.posts.push(vm); this.posts.push(vm);
} }
} }