Change encodeRisuSave function to encodeRisuSaveLegacy

This commit is contained in:
kwaroran
2024-10-26 21:47:00 +09:00
parent 532de96c77
commit 41176350ca
6 changed files with 17 additions and 17 deletions

View File

@@ -1,7 +1,7 @@
import { BaseDirectory, readFile, readDir, writeFile } from "@tauri-apps/plugin-fs"; import { BaseDirectory, readFile, readDir, writeFile } from "@tauri-apps/plugin-fs";
import { alertError, alertNormal, alertStore, alertWait } from "../alert"; import { alertError, alertNormal, alertStore, alertWait } from "../alert";
import { LocalWriter, forageStorage, isTauri } from "../globalApi"; import { LocalWriter, forageStorage, isTauri } from "../globalApi";
import { decodeRisuSave, encodeRisuSave } from "../storage/risuSave"; import { decodeRisuSave, encodeRisuSaveLegacy } from "../storage/risuSave";
import { getDatabase, setDatabaseLite } from "../storage/database.svelte"; import { getDatabase, setDatabaseLite } from "../storage/database.svelte";
import { relaunch } from "@tauri-apps/plugin-process"; import { relaunch } from "@tauri-apps/plugin-process";
import { sleep } from "../util"; import { sleep } from "../util";
@@ -68,7 +68,7 @@ export async function SaveLocalBackup(){
} }
} }
const dbData = encodeRisuSave(getDatabase(), 'compression') const dbData = encodeRisuSaveLegacy(getDatabase(), 'compression')
alertWait(`Saving local Backup... (Saving database)`) alertWait(`Saving local Backup... (Saving database)`)

View File

@@ -6,7 +6,7 @@ import { language } from "../../lang";
import { relaunch } from '@tauri-apps/plugin-process'; import { relaunch } from '@tauri-apps/plugin-process';
import { sleep } from "../util"; import { sleep } from "../util";
import { hubURL } from "../characterCards"; import { hubURL } from "../characterCards";
import { decodeRisuSave, encodeRisuSave } from "../storage/risuSave"; import { decodeRisuSave, encodeRisuSaveLegacy } from "../storage/risuSave";
export async function checkDriver(type:'save'|'load'|'loadtauri'|'savetauri'|'reftoken'){ export async function checkDriver(type:'save'|'load'|'loadtauri'|'savetauri'|'reftoken'){
const CLIENT_ID = '580075990041-l26k2d3c0nemmqiu3d3aag01npfrkn76.apps.googleusercontent.com'; const CLIENT_ID = '580075990041-l26k2d3c0nemmqiu3d3aag01npfrkn76.apps.googleusercontent.com';
@@ -176,7 +176,7 @@ async function backupDrive(ACCESS_TOKEN:string) {
} }
} }
const dbData = encodeRisuSave(getDatabase(), 'compression') const dbData = encodeRisuSaveLegacy(getDatabase(), 'compression')
alertStore.set({ alertStore.set({
type: "wait", type: "wait",
@@ -345,7 +345,7 @@ async function loadDrive(ACCESS_TOKEN:string, mode: 'backup'|'sync'):Promise<voi
} }
} }
db.didFirstSetup = true db.didFirstSetup = true
const dbData = encodeRisuSave(db, 'compression') const dbData = encodeRisuSaveLegacy(db, 'compression')
if(isTauri){ if(isTauri){
await writeFile('database/database.bin', dbData, {baseDir: BaseDirectory.AppData}) await writeFile('database/database.bin', dbData, {baseDir: BaseDirectory.AppData})

View File

@@ -24,7 +24,7 @@ import { hasher } from "./parser.svelte";
import { characterURLImport, hubURL } from "./characterCards"; import { characterURLImport, hubURL } from "./characterCards";
import { defaultJailbreak, defaultMainPrompt, oldJailbreak, oldMainPrompt } from "./storage/defaultPrompts"; import { defaultJailbreak, defaultMainPrompt, oldJailbreak, oldMainPrompt } from "./storage/defaultPrompts";
import { loadRisuAccountData } from "./drive/accounter"; import { loadRisuAccountData } from "./drive/accounter";
import { decodeRisuSave, encodeRisuSave } from "./storage/risuSave"; import { decodeRisuSave, encodeRisuSaveLegacy } from "./storage/risuSave";
import { AutoStorage } from "./storage/autoStorage"; import { AutoStorage } from "./storage/autoStorage";
import { updateAnimationSpeed } from "./gui/animation"; import { updateAnimationSpeed } from "./gui/animation";
import { updateColorScheme, updateTextThemeAndCSS } from "./gui/colorscheme"; import { updateColorScheme, updateTextThemeAndCSS } from "./gui/colorscheme";
@@ -350,18 +350,18 @@ export async function saveDb(){
} }
db.saveTime = Math.floor(Date.now() / 1000) db.saveTime = Math.floor(Date.now() / 1000)
if(isTauri){ if(isTauri){
const dbData = encodeRisuSave(db) const dbData = encodeRisuSaveLegacy(db)
await writeFile('database/database.bin', dbData, {baseDir: BaseDirectory.AppData}); await writeFile('database/database.bin', dbData, {baseDir: BaseDirectory.AppData});
await writeFile(`database/dbbackup-${(Date.now()/100).toFixed()}.bin`, dbData, {baseDir: BaseDirectory.AppData}); await writeFile(`database/dbbackup-${(Date.now()/100).toFixed()}.bin`, dbData, {baseDir: BaseDirectory.AppData});
} }
else{ else{
if(!forageStorage.isAccount){ if(!forageStorage.isAccount){
const dbData = encodeRisuSave(db) const dbData = encodeRisuSaveLegacy(db)
await forageStorage.setItem('database/database.bin', dbData) await forageStorage.setItem('database/database.bin', dbData)
await forageStorage.setItem(`database/dbbackup-${(Date.now()/100).toFixed()}.bin`, dbData) await forageStorage.setItem(`database/dbbackup-${(Date.now()/100).toFixed()}.bin`, dbData)
} }
if(forageStorage.isAccount){ if(forageStorage.isAccount){
const dbData = encodeRisuSave(db, 'compression') const dbData = encodeRisuSaveLegacy(db, 'compression')
const z:Database = decodeRisuSave(dbData) const z:Database = decodeRisuSave(dbData)
if(z.formatversion){ if(z.formatversion){
await forageStorage.setItem('database/database.bin', dbData) await forageStorage.setItem('database/database.bin', dbData)
@@ -455,7 +455,7 @@ export async function loadData() {
await mkdir('assets', {baseDir: BaseDirectory.AppData}) await mkdir('assets', {baseDir: BaseDirectory.AppData})
} }
if(!await exists('database/database.bin', {baseDir: BaseDirectory.AppData})){ if(!await exists('database/database.bin', {baseDir: BaseDirectory.AppData})){
await writeFile('database/database.bin', encodeRisuSave({}), {baseDir: BaseDirectory.AppData}); await writeFile('database/database.bin', encodeRisuSaveLegacy({}), {baseDir: BaseDirectory.AppData});
} }
try { try {
const decoded = decodeRisuSave(await readFile('database/database.bin',{baseDir: BaseDirectory.AppData})) const decoded = decodeRisuSave(await readFile('database/database.bin',{baseDir: BaseDirectory.AppData}))
@@ -485,7 +485,7 @@ export async function loadData() {
else{ else{
let gotStorage:Uint8Array = await forageStorage.getItem('database/database.bin') as unknown as Uint8Array let gotStorage:Uint8Array = await forageStorage.getItem('database/database.bin') as unknown as Uint8Array
if(checkNullish(gotStorage)){ if(checkNullish(gotStorage)){
gotStorage = encodeRisuSave({}) gotStorage = encodeRisuSaveLegacy({})
await forageStorage.setItem('database/database.bin', gotStorage) await forageStorage.setItem('database/database.bin', gotStorage)
} }
try { try {
@@ -512,7 +512,7 @@ export async function loadData() {
if(await forageStorage.checkAccountSync()){ if(await forageStorage.checkAccountSync()){
let gotStorage:Uint8Array = await forageStorage.getItem('database/database.bin') as unknown as Uint8Array let gotStorage:Uint8Array = await forageStorage.getItem('database/database.bin') as unknown as Uint8Array
if(checkNullish(gotStorage)){ if(checkNullish(gotStorage)){
gotStorage = encodeRisuSave({}) gotStorage = encodeRisuSaveLegacy({})
await forageStorage.setItem('database/database.bin', gotStorage) await forageStorage.setItem('database/database.bin', gotStorage)
} }
try { try {

View File

@@ -4,7 +4,7 @@ import { hubURL } from "../characterCards"
import localforage from "localforage" import localforage from "localforage"
import { alertLogin, alertStore, alertWait } from "../alert" import { alertLogin, alertStore, alertWait } from "../alert"
import { forageStorage, getUnpargeables } from "../globalApi" import { forageStorage, getUnpargeables } from "../globalApi"
import { encodeRisuSave } from "./risuSave" import { encodeRisuSaveLegacy } from "./risuSave"
import { v4 } from "uuid" import { v4 } from "uuid"
import { language } from "src/lang" import { language } from "src/lang"
@@ -136,7 +136,7 @@ export async function unMigrationAccount() {
} }
db.account = null db.account = null
await MigrationStorage.setItem('database/database.bin', encodeRisuSave(db)) await MigrationStorage.setItem('database/database.bin', encodeRisuSaveLegacy(db))
alertStore.set({ alertStore.set({
type: "none", type: "none",

View File

@@ -5,7 +5,7 @@ import { OpfsStorage } from "./opfsStorage"
import { alertInput, alertSelect, alertStore } from "../alert" import { alertInput, alertSelect, alertStore } from "../alert"
import { getDatabase, type Database } from "./database.svelte" import { getDatabase, type Database } from "./database.svelte"
import { AccountStorage } from "./accountStorage" import { AccountStorage } from "./accountStorage"
import { decodeRisuSave, encodeRisuSave } from "./risuSave"; import { decodeRisuSave, encodeRisuSaveLegacy } from "./risuSave";
import { language } from "src/lang" import { language } from "src/lang"
import { MobileStorage } from "./mobileStorage" import { MobileStorage } from "./mobileStorage"
import { Capacitor } from "@capacitor/core" import { Capacitor } from "@capacitor/core"
@@ -88,7 +88,7 @@ export class AutoStorage{
} }
const dba = replaceDbResources(db, replaced) const dba = replaceDbResources(db, replaced)
const comp = encodeRisuSave(dba, 'compression') const comp = encodeRisuSaveLegacy(dba, 'compression')
//try decoding //try decoding
try { try {
const z:Database = decodeRisuSave(comp) const z:Database = decodeRisuSave(comp)

View File

@@ -14,7 +14,7 @@ const unpackr = new Unpackr({
const magicHeader = new Uint8Array([0, 82, 73, 83, 85, 83, 65, 86, 69, 0, 7]); const magicHeader = new Uint8Array([0, 82, 73, 83, 85, 83, 65, 86, 69, 0, 7]);
const magicCompressedHeader = new Uint8Array([0, 82, 73, 83, 85, 83, 65, 86, 69, 0, 8]); const magicCompressedHeader = new Uint8Array([0, 82, 73, 83, 85, 83, 65, 86, 69, 0, 8]);
export function encodeRisuSave(data:any, compression:'noCompression'|'compression' = 'noCompression'){ export function encodeRisuSaveLegacy(data:any, compression:'noCompression'|'compression' = 'noCompression'){
let encoded:Uint8Array = packr.encode(data) let encoded:Uint8Array = packr.encode(data)
if(compression === 'compression'){ if(compression === 'compression'){
encoded = fflate.compressSync(encoded) encoded = fflate.compressSync(encoded)