akai/readest
2
1
Fork 1
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

Fix bugs caused by code refactoring

Browse Source
This commit is contained in:
chrox
2024-10-13 01:07:43 +02:00
parent 552d9472fc
commit ec627aaa67
7 changed files with 56 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.vscode/settings.json
Vendored
+1 -1
View File
@@ -2,6 +2,6 @@
"typescript.tsdk": "node_modules/typescript/lib",
"rust-analyzer.linkedProjects": [
"packages/tauri/Cargo.toml",
"apps/digest-app/src-tauri/Cargo.toml"
"apps/readest-app/src-tauri/Cargo.toml"
],
}
apps/readest-app/package.json
+1 -1
View File
@@ -35,7 +35,7 @@
"zustand": "5.0.0-rc.2"
},
"devDependencies": {
"@tauri-apps/cli": "2.0.2",
"@tauri-apps/cli": "2.0.3",
"@types/node": "^20",
"@types/react": "^18",
"@types/react-dom": "^18",
apps/readest-app/src-tauri/capabilities/default.json
+1 -1
View File
@@ -19,7 +19,7 @@
"identifier": "fs:scope-appdata-recursive",
"allow": [
{
"path": "$APPDATA/DigestLibrary/**/*"
"path": "$APPDATA/Readest/**/*"
}
],
"deny": []
apps/readest-app/src-tauri/icons/icon.icns
BIN
View File
Binary file not shown.
apps/readest-app/src/app/page.tsx
+2 -1
View File
@@ -36,7 +36,7 @@ const LibraryPage = () => {
});
});
});
}, [envConfig]);
}, [envConfig, getAppService]);
const importBooks = async (files: [string | File]) => {
setLoading(true);
@@ -44,6 +44,7 @@ const LibraryPage = () => {
await appService?.importBook(file, libraryBooks);
setLibraryBooks(libraryBooks);
}
appService?.saveLibraryBooks(libraryBooks);
setLoading(false);
};
apps/readest-app/src/services/nativeAppService.ts
+1 -1
View File
@@ -142,7 +142,7 @@ export class NativeAppService extends BaseAppService {
}
async getInitBooksDir(): Promise<string> {
return join(appDataDir ? await appDataDir() : await documentDir(), LOCAL_BOOKS_SUBDIR);
return join(isMobile ? await appDataDir() : await documentDir(), LOCAL_BOOKS_SUBDIR);
}
async selectDirectory(title: string): Promise<string> {
pnpm-lock.yaml
Generated
+46 -45
View File
@@ -82,8 +82,8 @@ importers:
version: 5.0.0-rc.2(@types/react@18.3.8)(react@18.3.1)
devDependencies:
'@tauri-apps/cli':
specifier: 2.0.2
version: 2.0.2
specifier: 2.0.3
version: 2.0.3
'@types/node':
specifier: ^20
version: 20.16.6
@@ -309,72 +309,72 @@ packages:
'@tauri-apps/api@2.0.2':
resolution: {integrity: sha512-3wSwmG+1kr6WrgAFKK5ijkNFPp8TT3FLj3YHUb5EwMO+3FxX4uWlfSWkeeBy+Kc1RsKzugtYLuuya+98Flj+3w==}
'@tauri-apps/cli-darwin-arm64@2.0.2':
resolution: {integrity: sha512-B+/a8Q6wAqmB4A4HVeK0oQP5TdQGKW60ZLOI9O2ktH2HPr9ETr3XkwXPuJ2uAOuGEgtRZHBgFOIgG000vMnKlg==}
'@tauri-apps/cli-darwin-arm64@2.0.3':
resolution: {integrity: sha512-jIsbxGWS+As1ZN7umo90nkql/ZAbrDK0GBT6UsgHSz5zSwwArICsZFFwE1pLZip5yoiV5mn3TGG2c1+v+0puzQ==}
engines: {node: '>= 10'}
cpu: [arm64]
os: [darwin]
'@tauri-apps/cli-darwin-x64@2.0.2':
resolution: {integrity: sha512-kaurhn6XT4gAVCPAQSSHl/CHFxTS0ljc47N7iGTSlYJ03sCWPRZeNuVa/bn6rolz9MA2JfnRnFqB1pUL6jzp9Q==}
'@tauri-apps/cli-darwin-x64@2.0.3':
resolution: {integrity: sha512-ROITHtLTA1muyrwgyuwyasmaLCGtT4as/Kd1kerXaSDtFcYrnxiM984ZD0+FDUEDl5BgXtYa/sKKkKQFjgmM0A==}
engines: {node: '>= 10'}
cpu: [x64]
os: [darwin]
'@tauri-apps/cli-linux-arm-gnueabihf@2.0.2':
resolution: {integrity: sha512-bVrofjlacMxmGMcqK18iBW05tsZXOd19/MnqruFFcHSVjvkGGIXHMtUbMXnZNXBPkHDsnfytNtkY9SZGfCFaBA==}
'@tauri-apps/cli-linux-arm-gnueabihf@2.0.3':
resolution: {integrity: sha512-bQ3EZwCFfrLg/ZQ2I8sLuifSxESz4TP56SleTkKsPtTIZgNnKpM88PRDz4neiRroHVOq8NK0X276qi9LjGcXPw==}
engines: {node: '>= 10'}
cpu: [arm]
os: [linux]
'@tauri-apps/cli-linux-arm64-gnu@2.0.2':
resolution: {integrity: sha512-7XCBn0TTBVQGnV42dXcbHPLg/9W8kJoVzuliIozvNGyRWxfXqDbQYzpI48HUQG3LgHMabcw8+pVZAfGhevLrCA==}
'@tauri-apps/cli-linux-arm64-gnu@2.0.3':
resolution: {integrity: sha512-aLfAA8P9OTErVUk3sATxtXqpAtlfDPMPp4fGjDysEELG/MyekGhmh2k/kG/i32OdPeCfO+Nr37wJksARJKubGw==}
engines: {node: '>= 10'}
cpu: [arm64]
os: [linux]
libc: [glibc]
'@tauri-apps/cli-linux-arm64-musl@2.0.2':
resolution: {integrity: sha512-1xi2SreGVlpAL68MCsDUY63rdItUdPZreXIAcOVqvUehcJRYOa1XGSBhrV0YXRgZeh0AtKC19z6PRzcv4rosZA==}
'@tauri-apps/cli-linux-arm64-musl@2.0.3':
resolution: {integrity: sha512-I4MVD7nf6lLLRmNQPpe5beEIFM6q7Zkmh77ROA5BNu/+vHNL5kiTMD+bmd10ZL2r753A6pO7AvqkIxcBuIl0tg==}
engines: {node: '>= 10'}
cpu: [arm64]
os: [linux]
libc: [musl]
'@tauri-apps/cli-linux-x64-gnu@2.0.2':
resolution: {integrity: sha512-WVjwYzPWFqZVg1fx6KSU5w47Q0VbMyaCp34qs5EcS8EIU0/RnofdzqUoOYqvgGVgNgoz7Pj5dXK2SkS8BHXMmA==}
'@tauri-apps/cli-linux-x64-gnu@2.0.3':
resolution: {integrity: sha512-C6Jkx2zZGKkoi+sg5FK9GoH/0EvAaOgrZfF5azV5EALGba46g7VpWcZgp9zFUd7K2IzTi+0OOY8TQ2OVfKZgew==}
engines: {node: '>= 10'}
cpu: [x64]
os: [linux]
libc: [glibc]
'@tauri-apps/cli-linux-x64-musl@2.0.2':
resolution: {integrity: sha512-h5miE2mctgaQNn/BbG9o1pnJcrx+VGBi2A6JFqGu934lFgSV5+s28M8Gc8AF2JgFH4hQV4IuMkeSw8Chu5Dodg==}
'@tauri-apps/cli-linux-x64-musl@2.0.3':
resolution: {integrity: sha512-qi4ghmTfSAl+EEUDwmwI9AJUiOLNSmU1RgiGgcPRE+7A/W+Am9UnxYySAiRbB/gJgTl9sj/pqH5Y9duP1/sqHg==}
engines: {node: '>= 10'}
cpu: [x64]
os: [linux]
libc: [musl]
'@tauri-apps/cli-win32-arm64-msvc@2.0.2':
resolution: {integrity: sha512-2b8oO0+dYonahG5PfA/zoq0zlafLclfmXgqoWDZ++UiPtQHJNpNeEQ8GWbSFKGHQ494Jo6jHvazOojGRE1kqAg==}
'@tauri-apps/cli-win32-arm64-msvc@2.0.3':
resolution: {integrity: sha512-UXxHkYmFesC97qVmZre4vY7oDxRDtC2OeKNv0bH+iSnuUp/ROxzJYGyaelnv9Ybvgl4YVqDCnxgB28qMM938TA==}
engines: {node: '>= 10'}
cpu: [arm64]
os: [win32]
'@tauri-apps/cli-win32-ia32-msvc@2.0.2':
resolution: {integrity: sha512-axgICLunFi0To3EibdCBgbST5RocsSmtM4c04+CbcX8WQQosJ9ziWlCSrrOTRr+gJERAMSvEyVUS98f6bWMw9A==}
'@tauri-apps/cli-win32-ia32-msvc@2.0.3':
resolution: {integrity: sha512-D+xoaa35RGlkXDpnL5uDTpj29untuC5Wp6bN9snfgFDagD0wnFfC8+2ZQGu16bD0IteWqDI0OSoIXhNvy+F+wg==}
engines: {node: '>= 10'}
cpu: [ia32]
os: [win32]
'@tauri-apps/cli-win32-x64-msvc@2.0.2':
resolution: {integrity: sha512-JR17cM6+DyExZRgpXr2/DdqvcFYi/EKvQt8dI5R1/uQoesWd8jeNnrU7c1FG1Zmw9+pTzDztsNqEKsrNq2sNIg==}
'@tauri-apps/cli-win32-x64-msvc@2.0.3':
resolution: {integrity: sha512-eWV9XWb4dSYHXl13OtYWLjX1JHphUEkHkkGwJrhr8qFBm7RbxXxQvrsUEprSi51ug/dwJenjJgM4zR8By4htfw==}
engines: {node: '>= 10'}
cpu: [x64]
os: [win32]
'@tauri-apps/cli@2.0.2':
resolution: {integrity: sha512-R4ontHZvXORArERAHIidp5zRfZEshZczTiK+poslBv7AGKpQZoMw+E49zns7mOmP64i2Cq9Ci0pJvi4Rm8Okzw==}
'@tauri-apps/cli@2.0.3':
resolution: {integrity: sha512-JwEyhc5BAVpn4E8kxzY/h7+bVOiXQdudR1r3ODMfyyumZBfgIWqpD/WuTcPq6Yjchju1BSS+80jAE/oYwI/RKg==}
engines: {node: '>= 10'}
hasBin: true
@@ -1320,6 +1320,7 @@ packages:
eslint@8.57.1:
resolution: {integrity: sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==}
engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
deprecated: This version is no longer supported. Please see https://eslint.org/version-support for other options.
hasBin: true
esniff@2.0.1:
@@ -3055,48 +3056,48 @@ snapshots:
'@tauri-apps/api@2.0.2': {}
'@tauri-apps/cli-darwin-arm64@2.0.2':
'@tauri-apps/cli-darwin-arm64@2.0.3':
optional: true
'@tauri-apps/cli-darwin-x64@2.0.2':
'@tauri-apps/cli-darwin-x64@2.0.3':
optional: true
'@tauri-apps/cli-linux-arm-gnueabihf@2.0.2':
'@tauri-apps/cli-linux-arm-gnueabihf@2.0.3':
optional: true
'@tauri-apps/cli-linux-arm64-gnu@2.0.2':
'@tauri-apps/cli-linux-arm64-gnu@2.0.3':
optional: true
'@tauri-apps/cli-linux-arm64-musl@2.0.2':
'@tauri-apps/cli-linux-arm64-musl@2.0.3':
optional: true
'@tauri-apps/cli-linux-x64-gnu@2.0.2':
'@tauri-apps/cli-linux-x64-gnu@2.0.3':
optional: true
'@tauri-apps/cli-linux-x64-musl@2.0.2':
'@tauri-apps/cli-linux-x64-musl@2.0.3':
optional: true
'@tauri-apps/cli-win32-arm64-msvc@2.0.2':
'@tauri-apps/cli-win32-arm64-msvc@2.0.3':
optional: true
'@tauri-apps/cli-win32-ia32-msvc@2.0.2':
'@tauri-apps/cli-win32-ia32-msvc@2.0.3':
optional: true
'@tauri-apps/cli-win32-x64-msvc@2.0.2':
'@tauri-apps/cli-win32-x64-msvc@2.0.3':
optional: true
'@tauri-apps/cli@2.0.2':
'@tauri-apps/cli@2.0.3':
optionalDependencies:
'@tauri-apps/cli-darwin-arm64': 2.0.2
'@tauri-apps/cli-darwin-x64': 2.0.2
'@tauri-apps/cli-linux-arm-gnueabihf': 2.0.2
'@tauri-apps/cli-linux-arm64-gnu': 2.0.2
'@tauri-apps/cli-linux-arm64-musl': 2.0.2
'@tauri-apps/cli-linux-x64-gnu': 2.0.2
'@tauri-apps/cli-linux-x64-musl': 2.0.2
'@tauri-apps/cli-win32-arm64-msvc': 2.0.2
'@tauri-apps/cli-win32-ia32-msvc': 2.0.2
'@tauri-apps/cli-win32-x64-msvc': 2.0.2
'@tauri-apps/cli-darwin-arm64': 2.0.3
'@tauri-apps/cli-darwin-x64': 2.0.3
'@tauri-apps/cli-linux-arm-gnueabihf': 2.0.3
'@tauri-apps/cli-linux-arm64-gnu': 2.0.3
'@tauri-apps/cli-linux-arm64-musl': 2.0.3
'@tauri-apps/cli-linux-x64-gnu': 2.0.3
'@tauri-apps/cli-linux-x64-musl': 2.0.3
'@tauri-apps/cli-win32-arm64-msvc': 2.0.3
'@tauri-apps/cli-win32-ia32-msvc': 2.0.3
'@tauri-apps/cli-win32-x64-msvc': 2.0.3
'@tauri-apps/plugin-dialog@2.0.0':
dependencies: