Also don't share contentToken between instances + fixes

next v0.9-rc1
neobooru 2023-02-19 16:38:32 +01:00
parent 8a849a3ca4
commit 3c58c1a7f0
4 changed files with 19 additions and 14 deletions

View File

@ -9,7 +9,7 @@ import {
TagFields,
TemporaryFileUploadResult,
} from "./models";
import { PostDetails } from "~/models";
import { ScrapedPostDetails } from "~/models";
import { SzuruSiteConfig } from "~/config";
/**
@ -70,7 +70,7 @@ export default class SzurubooruApi {
return (await this.apiGet("tag-categories")).data;
}
async createPost(post: PostDetails): Promise<Post> {
async createPost(post: ScrapedPostDetails, contentToken?: string): Promise<Post> {
const obj = <any>{
tags: post.tags.map((x) => x.name),
safety: post.rating,
@ -78,8 +78,8 @@ export default class SzurubooruApi {
notes: post.notes,
};
if (post.contentToken) {
obj.contentToken = post.contentToken;
if (contentToken) {
obj.contentToken = contentToken;
} else {
obj.contentUrl = post.contentUrl;
}

View File

@ -38,7 +38,8 @@ async function uploadPost(data: PostUploadCommandData) {
new BrowserCommand("set_post_upload_info", new SetPostUploadInfoData(data.siteId, data.post.id, info))
);
const createdPost = await szuru.createPost(data.post);
const contentToken = data.post.instanceSpecificData[data.siteId]?.contentToken;
const createdPost = await szuru.createPost(data.post, contentToken);
info.state = "uploaded";
info.instancePostId = createdPost.id;

View File

@ -26,25 +26,29 @@ export class TagDetails {
}
export class InstanceSpecificData {
contentToken?: string;
genericError?: string;
reverseSearchResult?: SimpleImageSearchResult;
uploadState?: PostUploadInfo;
}
type MappedInstanceSpecificData = {
[key: string]: InstanceSpecificData;
};
export class ScrapedPostDetails {
id = window.crypto.randomUUID();
name = "";
tags: TagDetails[] = [];
notes: ScrapedNote[];
contentUrl: string;
contentToken?: string;
pageUrl: string;
contentType: ContentType;
rating: BooruTypes.SafetyRating;
source = "";
referrer?: string;
resolution?: [number, number];
instanceSpecificData = new Map<string, InstanceSpecificData>();
instanceSpecificData: MappedInstanceSpecificData = {};
constructor(post: ScrapedPost) {
this.contentUrl = post.contentUrl;

View File

@ -53,7 +53,7 @@ const szuru = computed(() => {
const instanceSpecificData = readonly(
computed(() => {
if (selectedPost.value && selectedSiteId.value) {
return selectedPost.value.instanceSpecificData.get(selectedSiteId.value);
return selectedPost.value.instanceSpecificData[selectedSiteId.value];
}
})
);
@ -124,7 +124,7 @@ async function grabPost() {
// Initialize instanceSpecificData with an empty object.
for (const site of config.sites) {
vm.instanceSpecificData.set(site.id, {});
vm.instanceSpecificData[site.id] = {};
}
posts.push(vm);
@ -229,8 +229,8 @@ async function clickFindSimilar() {
async function findSimilar(post: ScrapedPostDetails | undefined) {
if (!post || !szuru.value || !selectedSiteId.value) return;
const selectedInstance = szuru.value;
let instanceSpecificData = post.instanceSpecificData.get(selectedSiteId.value);
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!");
@ -249,7 +249,7 @@ async function findSimilar(post: ScrapedPostDetails | undefined) {
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.
post.contentToken = tmpRes.token;
instanceSpecificData.contentToken = tmpRes.token;
res = await selectedInstance.reverseSearchToken(tmpRes.token);
} else {
@ -398,7 +398,7 @@ onMounted(async () => {
const { postId, instanceId, info } = <SetPostUploadInfoData>cmd.data;
let post = posts.find((x) => x.id == postId);
if (post) {
let instanceSpecificData = post.instanceSpecificData.get(instanceId);
let instanceSpecificData = post.instanceSpecificData[instanceId];
if (instanceSpecificData) {
instanceSpecificData.uploadState = info;
}
@ -410,7 +410,7 @@ onMounted(async () => {
const { postId, instanceId, exactPostId } = <SetExactPostId>cmd.data;
let post = posts.find((x) => x.id == postId);
if (post && selectedPostId.value) {
let instanceSpecificData = post.instanceSpecificData.get(instanceId);
let instanceSpecificData = post.instanceSpecificData[instanceId];
if (instanceSpecificData) {
if (instanceSpecificData?.reverseSearchResult) {
instanceSpecificData.reverseSearchResult.exactPostId = exactPostId;