Compare commits
30 Commits
release-1.
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
09f5ca3a99
|
|||
|
e8a804826a
|
|||
|
b8cef4d7b3
|
|||
|
|
fc88ee9a97 | ||
|
|
2054f4677c | ||
|
|
03c7b5e6d9 | ||
|
|
2493555faf | ||
|
|
2fb5d4ae0a | ||
|
|
d174113c53 | ||
|
|
e0b4e3edf0 | ||
|
|
683a456202 | ||
|
|
9a4c86870a | ||
|
|
bc5b9ccd16 | ||
|
|
6c16008aae | ||
|
|
b281052908 | ||
|
|
52619b1a9b | ||
|
|
a30c526a63 | ||
|
|
7fb55f5399 | ||
|
|
6220b6172e | ||
|
|
a9f7bca27c | ||
|
|
0ebeb46171 | ||
|
|
1fdbdf5185 | ||
|
|
109241e584 | ||
|
|
ec632b534b | ||
|
|
bc7cb721d3 | ||
|
|
5a5dc189fb | ||
|
|
7baf586d3b | ||
|
|
3e487caad9 | ||
|
|
44b8989f2e | ||
|
|
b4573fd955 |
28
.dockerignore
Normal file
28
.dockerignore
Normal file
@@ -0,0 +1,28 @@
|
||||
node_modules
|
||||
npm-debug.log*
|
||||
yarn-debug.log*
|
||||
yarn-error.log*
|
||||
.git
|
||||
.gitignore
|
||||
README.md
|
||||
.env
|
||||
.nyc_output
|
||||
coverage
|
||||
.nyc_output
|
||||
.coverage
|
||||
coverage.json
|
||||
*.lcov
|
||||
.cache
|
||||
.parcel-cache
|
||||
.next
|
||||
.nuxt
|
||||
dist
|
||||
build
|
||||
.DS_Store
|
||||
*.tgz
|
||||
*.tar.gz
|
||||
.vscode
|
||||
.idea
|
||||
*.swp
|
||||
*.swo
|
||||
*~
|
||||
64
.gitea/workflows/docker-build-push.yml
Normal file
64
.gitea/workflows/docker-build-push.yml
Normal file
@@ -0,0 +1,64 @@
|
||||
name: Build and Push Docker Image
|
||||
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- "main"
|
||||
tags:
|
||||
- "v*"
|
||||
workflow_dispatch:
|
||||
jobs:
|
||||
docker:
|
||||
runs-on: ubuntu-latest
|
||||
if: ${{ !contains(github.event.head_commit.message, '[skip ci]') }}
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
# Ensure full history and all tags are available
|
||||
fetch-depth: 0
|
||||
|
||||
- name: Set up QEMU (multi-arch)
|
||||
uses: docker/setup-qemu-action@v3
|
||||
|
||||
- name: Set up Docker Buildx
|
||||
uses: docker/setup-buildx-action@v3
|
||||
|
||||
- name: Docker meta
|
||||
id: meta
|
||||
uses: docker/metadata-action@v5
|
||||
with:
|
||||
images: gitea.suda.codes/${{ github.repository }}
|
||||
tags: |
|
||||
type=ref,event=tag
|
||||
|
||||
- name: Determine latest Git tag
|
||||
id: latest
|
||||
shell: bash
|
||||
run: |
|
||||
set -euo pipefail
|
||||
# Fetch tags in case the runner's mirror is stale
|
||||
git fetch --tags --force --quiet || true
|
||||
if tag=$(git describe --tags --abbrev=0 2>/dev/null); then
|
||||
echo "tag=$tag" >> "$GITHUB_OUTPUT"
|
||||
else
|
||||
# Fallback when no tags exist
|
||||
echo "tag=latest" >> "$GITHUB_OUTPUT"
|
||||
fi
|
||||
|
||||
- name: Log in to container registry
|
||||
uses: docker/login-action@v3
|
||||
with:
|
||||
registry: gitea.suda.codes
|
||||
username: ${{ secrets.REGISTRY_USERNAME }}
|
||||
password: ${{ secrets.REGISTRY_PASSWORD }}
|
||||
|
||||
- name: Build and push
|
||||
uses: docker/build-push-action@v6
|
||||
with:
|
||||
context: .
|
||||
push: true
|
||||
platforms: linux/amd64
|
||||
tags: |
|
||||
${{ steps.meta.outputs.tags }}
|
||||
gitea.suda.codes/${{ github.repository }}:${{ steps.latest.outputs.tag }}
|
||||
41
Dockerfile
Normal file
41
Dockerfile
Normal file
@@ -0,0 +1,41 @@
|
||||
FROM node:18-alpine AS base
|
||||
|
||||
# Install dependencies only when needed
|
||||
FROM base AS deps
|
||||
RUN apk add --no-cache libc6-compat
|
||||
WORKDIR /app
|
||||
|
||||
# Install dependencies based on the preferred package manager
|
||||
COPY package.json package-lock.json* ./
|
||||
RUN npm ci
|
||||
|
||||
# Rebuild the source code only when needed
|
||||
FROM base AS builder
|
||||
WORKDIR /app
|
||||
COPY --from=deps /app/node_modules ./node_modules
|
||||
COPY . .
|
||||
|
||||
# Build the application
|
||||
RUN npm run build
|
||||
|
||||
# Production image, copy all the files and run the app
|
||||
FROM base AS runner
|
||||
WORKDIR /app
|
||||
|
||||
ENV NODE_ENV=production
|
||||
|
||||
RUN addgroup --system --gid 1001 nodejs
|
||||
RUN adduser --system --uid 1001 svelte
|
||||
|
||||
COPY --from=builder --chown=svelte:nodejs /app/build ./build
|
||||
COPY --from=builder --chown=svelte:nodejs /app/package.json ./package.json
|
||||
COPY --from=builder --chown=svelte:nodejs /app/node_modules ./node_modules
|
||||
|
||||
USER svelte
|
||||
|
||||
EXPOSE 3000
|
||||
|
||||
ENV PORT=3000
|
||||
ENV HOSTNAME="0.0.0.0"
|
||||
|
||||
CMD ["npm", "start"]
|
||||
@@ -10,7 +10,7 @@ https://github.com/ZXY101/mokuro-reader/assets/39561296/45a214a8-3f69-461c-87d7-
|
||||
- Anki connect integration & image cropping
|
||||
- Installation and offline support
|
||||
|
||||
## Useage:
|
||||
## Usage:
|
||||
You can find the reader hosted [here](https://reader.mokuro.app/).
|
||||
|
||||
To import your manga, process it with mokuro and then upload your manga along with the generated `.mokuro` file.
|
||||
|
||||
38
docker-compose.yml
Normal file
38
docker-compose.yml
Normal file
@@ -0,0 +1,38 @@
|
||||
version: '3.8'
|
||||
|
||||
services:
|
||||
app:
|
||||
build: .
|
||||
ports:
|
||||
- "3000:3000"
|
||||
environment:
|
||||
- NODE_ENV=production
|
||||
- DATABASE_URL=postgresql://mokuro:password@postgres:5432/mokuro
|
||||
- HOSTNAME=0.0.0.0
|
||||
- PORT=3000
|
||||
depends_on:
|
||||
- postgres
|
||||
restart: unless-stopped
|
||||
networks:
|
||||
- mokuro-network
|
||||
|
||||
postgres:
|
||||
image: postgres:16-alpine
|
||||
environment:
|
||||
- POSTGRES_DB=mokuro
|
||||
- POSTGRES_USER=mokuro
|
||||
- POSTGRES_PASSWORD=password
|
||||
volumes:
|
||||
- postgres_data:/var/lib/postgresql/data
|
||||
ports:
|
||||
- "5432:5432"
|
||||
restart: unless-stopped
|
||||
networks:
|
||||
- mokuro-network
|
||||
|
||||
volumes:
|
||||
postgres_data:
|
||||
|
||||
networks:
|
||||
mokuro-network:
|
||||
driver: bridge
|
||||
980
package-lock.json
generated
980
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -1,11 +1,12 @@
|
||||
{
|
||||
"name": "z-reader",
|
||||
"version": "0.9.0",
|
||||
"version": "0.9.1",
|
||||
"private": true,
|
||||
"scripts": {
|
||||
"dev": "vite dev",
|
||||
"build": "vite build",
|
||||
"preview": "vite preview",
|
||||
"start": "node build",
|
||||
"check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json",
|
||||
"check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch",
|
||||
"lint": "prettier --plugin-search-dir . --check . && eslint .",
|
||||
@@ -37,12 +38,15 @@
|
||||
},
|
||||
"type": "module",
|
||||
"dependencies": {
|
||||
"@sveltejs/adapter-node": "^1.3.1",
|
||||
"@types/gapi": "^0.0.47",
|
||||
"@types/google.accounts": "^0.0.14",
|
||||
"@types/google.picker": "^0.0.42",
|
||||
"@vercel/analytics": "^1.1.0",
|
||||
"@zip.js/zip.js": "^2.7.20",
|
||||
"dexie": "^4.0.1-alpha.25",
|
||||
"panzoom": "^9.4.3",
|
||||
"pg": "^8.16.3",
|
||||
"svelte-easy-crop": "^2.0.1"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
<link rel="manifest" crossorigin="use-credentials" href="manifest.json" />
|
||||
<meta
|
||||
name="viewport"
|
||||
content="width=device-width, height=device-height,initial-scale=1, minimum-scale=1"
|
||||
content="width=device-width, height=device-height,initial-scale=1, minimum-scale=1, user-scalable=no"
|
||||
/>
|
||||
<script src="https://apis.google.com/js/api.js"></script>
|
||||
<script src="https://accounts.google.com/gsi/client"></script>
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
import { showSnackbar } from '$lib/util';
|
||||
import { writable } from 'svelte/store';
|
||||
import { blobToBase64 } from '.';
|
||||
import { blobToBase64, imageResize } from '.';
|
||||
import { Settings } from '$lib/settings';
|
||||
|
||||
type CropperModal = {
|
||||
open: boolean;
|
||||
@@ -34,7 +35,7 @@ function getRadianAngle(degreeValue: number) {
|
||||
|
||||
export type Pixels = { width: number; height: number; x: number; y: number }
|
||||
|
||||
export async function getCroppedImg(imageSrc: string, pixelCrop: Pixels, rotation = 0) {
|
||||
export async function getCroppedImg(imageSrc: string, pixelCrop: Pixels, settings: Settings, rotation = 0 ) {
|
||||
const image = await createImage(imageSrc);
|
||||
const canvas = new OffscreenCanvas(image.width, image.height);
|
||||
const ctx = canvas.getContext('2d');
|
||||
@@ -71,8 +72,9 @@ export async function getCroppedImg(imageSrc: string, pixelCrop: Pixels, rotatio
|
||||
Math.round(0 - safeArea / 2 + image.width * 0.5 - pixelCrop.x),
|
||||
Math.round(0 - safeArea / 2 + image.height * 0.5 - pixelCrop.y)
|
||||
);
|
||||
|
||||
const blob = await canvas.convertToBlob({ type: 'image/webp' });
|
||||
|
||||
await imageResize(canvas, ctx, settings.ankiConnectSettings.widthField, settings.ankiConnectSettings.heightField);
|
||||
const blob = await canvas.convertToBlob({ type: 'image/webp', quality: settings.ankiConnectSettings.qualityField });
|
||||
|
||||
return await blobToBase64(blob)
|
||||
}
|
||||
@@ -1,4 +1,4 @@
|
||||
import { settings } from "$lib/settings";
|
||||
import { Settings, settings } from "$lib/settings";
|
||||
import { showSnackbar } from "$lib/util"
|
||||
import { get } from "svelte/store";
|
||||
|
||||
@@ -50,20 +50,44 @@ export async function blobToBase64(blob: Blob) {
|
||||
});
|
||||
}
|
||||
|
||||
export async function imageToWebp(source: File) {
|
||||
export async function imageToWebp(source: File, settings: Settings) {
|
||||
const image = await createImageBitmap(source);
|
||||
const canvas = new OffscreenCanvas(image.width, image.height);
|
||||
const context = canvas.getContext("2d");
|
||||
|
||||
if (context) {
|
||||
context.drawImage(image, 0, 0);
|
||||
const blob = await canvas.convertToBlob({ type: 'image/webp' });
|
||||
await imageResize(canvas, context, settings.ankiConnectSettings.widthField, settings.ankiConnectSettings.heightField);
|
||||
const blob = await canvas.convertToBlob({ type: 'image/webp', quality: settings.ankiConnectSettings.qualityField });
|
||||
image.close();
|
||||
|
||||
return await blobToBase64(blob);
|
||||
}
|
||||
}
|
||||
|
||||
export async function imageResize(canvas: OffscreenCanvas, ctx: OffscreenCanvasRenderingContext2D, maxWidth: number, maxHeight: number): Promise<OffscreenCanvas> {
|
||||
return new Promise((resolve, reject) => {
|
||||
const widthRatio = maxWidth <= 0 ? 1 : maxWidth / canvas.width;
|
||||
const heightRatio = maxHeight <= 0 ? 1 : maxHeight / canvas.height;
|
||||
const ratio = Math.min(1, Math.min(widthRatio, heightRatio));
|
||||
|
||||
if (ratio < 1) {
|
||||
const newWidth = canvas.width * ratio;
|
||||
const newHeight = canvas.height * ratio;
|
||||
createImageBitmap(canvas, { resizeWidth: newWidth, resizeHeight: newHeight, resizeQuality: 'high' })
|
||||
.then((sprite) => {
|
||||
canvas.width = newWidth;
|
||||
canvas.height = newHeight;
|
||||
ctx.drawImage(sprite, 0, 0);
|
||||
resolve(canvas);
|
||||
})
|
||||
.catch((e) => reject(e));
|
||||
} else {
|
||||
resolve(canvas);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
export async function updateLastCard(imageData: string | null | undefined, sentence?: string) {
|
||||
const {
|
||||
overwriteImage,
|
||||
@@ -102,7 +126,7 @@ export async function updateLastCard(imageData: string | null | undefined, sente
|
||||
id,
|
||||
fields,
|
||||
picture: {
|
||||
filename: `_${id}.webp`,
|
||||
filename: `mokuro_${id}.webp`,
|
||||
data: imageData.split(';base64,')[1],
|
||||
fields: [pictureField],
|
||||
},
|
||||
|
||||
@@ -18,7 +18,9 @@
|
||||
class="object-contain sm:w-[250px] sm:h-[350px] bg-black border-gray-900 border"
|
||||
/>
|
||||
{/if}
|
||||
<p class="font-semibold">{manga.mokuroData.title}</p>
|
||||
<p class="font-semibold sm:w-[250px] line-clamp-1">
|
||||
{manga.mokuroData.title}
|
||||
</p>
|
||||
</div>
|
||||
</a>
|
||||
{/if}
|
||||
|
||||
@@ -37,7 +37,7 @@
|
||||
<div class="flex md:order-2 gap-5">
|
||||
<UserSettingsSolid class="hover:text-primary-700" on:click={openSettings} />
|
||||
<UploadSolid class="hover:text-primary-700" on:click={() => (uploadModalOpen = true)} />
|
||||
<!-- <CloudArrowUpOutline class="hover:text-primary-700" on:click={() => goto('/cloud')} /> -->
|
||||
<CloudArrowUpOutline class="hover:text-primary-700" on:click={() => goto('/cloud')} />
|
||||
</div>
|
||||
</Navbar>
|
||||
</div>
|
||||
|
||||
@@ -37,7 +37,7 @@
|
||||
async function onCrop() {
|
||||
if ($cropperStore?.image && pixels) {
|
||||
loading = true;
|
||||
const imageData = await getCroppedImg($cropperStore.image, pixels);
|
||||
const imageData = await getCroppedImg($cropperStore.image, pixels, $settings);
|
||||
updateLastCard(imageData, $cropperStore.sentence);
|
||||
close();
|
||||
}
|
||||
|
||||
@@ -35,17 +35,10 @@
|
||||
|
||||
<div
|
||||
draggable="false"
|
||||
style:width={`${window.innerWidth}px`}
|
||||
style:height={`${(window.innerWidth * page.img_height) / page.img_width}px`}
|
||||
style:width={`${page.img_width}px`}
|
||||
style:height={`${page.img_height}px`}
|
||||
style:background-image={url}
|
||||
class="relative"
|
||||
>
|
||||
<TextBoxes {page} {src} />
|
||||
</div>
|
||||
|
||||
<style>
|
||||
div {
|
||||
background-size: contain;
|
||||
background-repeat: no-repeat;
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -40,7 +40,7 @@
|
||||
showCropper(URL.createObjectURL(src));
|
||||
} else {
|
||||
promptConfirmation('Add image to last created anki card?', async () => {
|
||||
const imageData = await imageToWebp(src);
|
||||
const imageData = await imageToWebp(src, $settings);
|
||||
updateLastCard(imageData);
|
||||
});
|
||||
}
|
||||
|
||||
@@ -23,6 +23,7 @@
|
||||
import { getCharCount } from '$lib/util/count-chars';
|
||||
import QuickActions from './QuickActions.svelte';
|
||||
import { beforeNavigate } from '$app/navigation';
|
||||
import { onMount } from 'svelte';
|
||||
|
||||
// TODO: Refactor this whole mess
|
||||
export let volumeSettings: VolumeSettings;
|
||||
@@ -220,7 +221,17 @@
|
||||
}
|
||||
}
|
||||
|
||||
onMount(() => {
|
||||
if ($settings.defaultFullscreen) {
|
||||
document.documentElement.requestFullscreen();
|
||||
}
|
||||
});
|
||||
|
||||
beforeNavigate(() => {
|
||||
if (document.exitFullscreen) {
|
||||
document.exitFullscreen();
|
||||
}
|
||||
|
||||
if (volume) {
|
||||
const { charCount, lineCount } = getCharCount(pages, page);
|
||||
|
||||
@@ -329,14 +340,17 @@
|
||||
<div
|
||||
class="flex flex-row"
|
||||
class:flex-row-reverse={!volumeSettings.rightToLeft}
|
||||
style:filter={`invert(${$settings.invertColors ? 1 : 0})`}
|
||||
on:dblclick={onDoubleTap}
|
||||
role="none"
|
||||
id="manga-panel"
|
||||
>
|
||||
{#if showSecondPage()}
|
||||
<MangaPage page={pages[index + 1]} src={Object.values(volume?.files)[index + 1]} />
|
||||
{/if}
|
||||
<MangaPage page={pages[index]} src={Object.values(volume?.files)[index]} />
|
||||
{#key page}
|
||||
{#if showSecondPage()}
|
||||
<MangaPage page={pages[index + 1]} src={Object.values(volume?.files)[index + 1]} />
|
||||
{/if}
|
||||
<MangaPage page={pages[index]} src={Object.values(volume?.files)[index]} />
|
||||
{/key}
|
||||
</div>
|
||||
</Panzoom>
|
||||
</div>
|
||||
@@ -358,4 +372,4 @@
|
||||
<div class="fixed z-50 left-1/2 top-1/2">
|
||||
<Spinner />
|
||||
</div>
|
||||
{/if}
|
||||
{/if}
|
||||
@@ -9,20 +9,15 @@
|
||||
|
||||
$: textBoxes = page.blocks
|
||||
.map((block) => {
|
||||
const { img_height: imgh, img_width: imgw } = page;
|
||||
const img_height = (window.innerWidth * imgh) / imgw;
|
||||
const img_width = window.innerWidth;
|
||||
const { img_height, img_width } = page;
|
||||
const { box, font_size, lines, vertical } = block;
|
||||
|
||||
const resizeFactor = window.innerWidth / imgw;
|
||||
|
||||
let [_xmin, _ymin, _xmax, _ymax] = box;
|
||||
console.log(box);
|
||||
|
||||
const xmin = clamp(_xmin * resizeFactor, 0, img_width);
|
||||
const ymin = clamp(_ymin * resizeFactor, 0, img_height);
|
||||
const xmax = clamp(_xmax * resizeFactor, 0, img_width);
|
||||
const ymax = clamp(_ymax * resizeFactor, 0, img_height);
|
||||
const xmin = clamp(_xmin, 0, img_width);
|
||||
const ymin = clamp(_ymin, 0, img_height);
|
||||
const xmax = clamp(_xmax, 0, img_width);
|
||||
const ymax = clamp(_ymax, 0, img_height);
|
||||
|
||||
const width = xmax - xmin;
|
||||
const height = ymax - ymin;
|
||||
@@ -59,7 +54,7 @@
|
||||
showCropper(URL.createObjectURL(src), sentence);
|
||||
} else {
|
||||
promptConfirmation('Add image to last created anki card?', async () => {
|
||||
const imageData = await imageToWebp(src);
|
||||
const imageData = await imageToWebp(src, $settings);
|
||||
updateLastCard(imageData, sentence);
|
||||
});
|
||||
}
|
||||
|
||||
@@ -1,26 +0,0 @@
|
||||
<script lang="ts">
|
||||
import { volume } from '$lib/catalog';
|
||||
import MangaPage from '../Reader/MangaPage.svelte';
|
||||
|
||||
$: files = $volume ? Object.values($volume?.files).slice(0, 10) : [];
|
||||
$: pages = $volume?.mokuroData?.pages || [];
|
||||
|
||||
$: {
|
||||
const { innerWidth, innerHeight } = window;
|
||||
console.log(innerWidth, innerHeight);
|
||||
}
|
||||
</script>
|
||||
|
||||
<section>
|
||||
{#each files as file, i}
|
||||
<MangaPage src={file} page={pages[i]} />
|
||||
{/each}
|
||||
</section>
|
||||
|
||||
<style>
|
||||
section {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
}
|
||||
</style>
|
||||
@@ -13,6 +13,10 @@
|
||||
let pictureField = $settings.ankiConnectSettings.pictureField;
|
||||
let sentenceField = $settings.ankiConnectSettings.sentenceField;
|
||||
|
||||
let heightField = $settings.ankiConnectSettings.heightField;
|
||||
let widthField = $settings.ankiConnectSettings.widthField;
|
||||
let qualityField = $settings.ankiConnectSettings.qualityField;
|
||||
|
||||
let triggerMethod = $settings.ankiConnectSettings.triggerMethod;
|
||||
|
||||
const triggerOptions = [
|
||||
@@ -90,5 +94,40 @@
|
||||
/>
|
||||
</Label>
|
||||
</div>
|
||||
<hr>
|
||||
<h4>Quality Settings</h4>
|
||||
<Helper>Allows you to customize the file size stored on your devices</Helper>
|
||||
<div>
|
||||
<Label>Max Height (0 = Ignore; 200 Recommended):</Label>
|
||||
<Input
|
||||
{disabled}
|
||||
type="number"
|
||||
bind:value={heightField}
|
||||
on:change={() => {updateAnkiSetting('heightField', heightField); if (heightField < 0) heightField = 0;}}
|
||||
min={0}
|
||||
/>
|
||||
</div>
|
||||
<div>
|
||||
<Label>Max Width (0 = Ignore; 200 Recommended):</Label>
|
||||
<Input
|
||||
{disabled}
|
||||
type="number"
|
||||
bind:value={widthField}
|
||||
on:change={() => {updateAnkiSetting('widthField', widthField); if (widthField < 0) widthField = 0;}}
|
||||
min={0}
|
||||
/>
|
||||
</div>
|
||||
<div>
|
||||
<Label>Quality (Between 0 and 1; 0.5 Recommended):</Label>
|
||||
<Input
|
||||
{disabled}
|
||||
type="number"
|
||||
bind:value={qualityField}
|
||||
on:change={() => updateAnkiSetting('qualityField', qualityField)}
|
||||
min={0}
|
||||
max={1}
|
||||
step="0.1"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
</AccordionItem>
|
||||
|
||||
59
src/lib/components/Settings/CloudSync.svelte
Normal file
59
src/lib/components/Settings/CloudSync.svelte
Normal file
@@ -0,0 +1,59 @@
|
||||
<script lang="ts">
|
||||
import { AccordionItem, Button, Label, Input, Toggle } from 'flowbite-svelte';
|
||||
import { syncConfig, pullAll, pushAll } from '$lib/settings/sync';
|
||||
import { get } from 'svelte/store';
|
||||
|
||||
let keyLocal: string = get(syncConfig).key || '';
|
||||
|
||||
function saveKey() {
|
||||
syncConfig.update((cfg) => ({ ...cfg, key: keyLocal || null }));
|
||||
}
|
||||
|
||||
function toggleAuto() {
|
||||
syncConfig.update((cfg) => ({ ...cfg, auto: !cfg.auto }));
|
||||
}
|
||||
|
||||
function toggleNotifications() {
|
||||
syncConfig.update((cfg) => ({ ...cfg, notifications: !cfg.notifications }));
|
||||
}
|
||||
|
||||
async function onPull() {
|
||||
try {
|
||||
await pullAll();
|
||||
} catch (e) {}
|
||||
}
|
||||
|
||||
async function onPush() {
|
||||
try {
|
||||
await pushAll();
|
||||
} catch (e) {}
|
||||
}
|
||||
</script>
|
||||
|
||||
<AccordionItem>
|
||||
<span slot="header">Cloud Sync</span>
|
||||
<div class="flex flex-col gap-4">
|
||||
<div>
|
||||
<Label>Sync Key</Label>
|
||||
<div class="flex gap-2">
|
||||
<Input class="flex-1" bind:value={keyLocal} placeholder="Enter a shared key" />
|
||||
<Button on:click={saveKey}>Save</Button>
|
||||
</div>
|
||||
</div>
|
||||
<div class="flex items-center gap-3">
|
||||
<Toggle checked={get(syncConfig).auto} on:change={toggleAuto} />
|
||||
<Label>Auto Sync</Label>
|
||||
</div>
|
||||
<div class="flex items-center gap-3">
|
||||
<Toggle checked={get(syncConfig).notifications} on:change={toggleNotifications} />
|
||||
<Label>Show Sync Notifications</Label>
|
||||
</div>
|
||||
<div class="flex gap-2">
|
||||
<Button on:click={onPull} outline>Pull from cloud</Button>
|
||||
<Button on:click={onPush} outline>Push to cloud</Button>
|
||||
</div>
|
||||
<p class="text-sm opacity-80">Use the same sync key across devices to share progress and settings. Manga files remain local or in Google Drive.</p>
|
||||
</div>
|
||||
</AccordionItem>
|
||||
|
||||
|
||||
@@ -5,12 +5,6 @@
|
||||
|
||||
$: zoomModeValue = $settings.zoomDefault;
|
||||
$: fontSizeValue = $settings.fontSize;
|
||||
$: readerValue = $settings.reader || 'classic';
|
||||
|
||||
let readers = [
|
||||
{ value: 'classic', name: 'Classic' },
|
||||
{ value: 'v2', name: 'V2' }
|
||||
];
|
||||
|
||||
let zoomModes = [
|
||||
{ value: 'zoomFitToScreen', name: 'Fit to screen' },
|
||||
@@ -46,11 +40,6 @@
|
||||
}
|
||||
</script>
|
||||
|
||||
<div>
|
||||
<Label>Reader:</Label>
|
||||
<Select items={readers} value={readerValue} on:change={(e) => onSelectChange(e, 'reader')} />
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<Label>On page zoom:</Label>
|
||||
<Select
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
import { Toggle } from 'flowbite-svelte';
|
||||
|
||||
$: toggles = [
|
||||
{ key: 'defaultFullscreen', text: 'Open reader in fullscreen', value: $settings.defaultFullscreen },
|
||||
{ key: 'textEditable', text: 'Editable text', value: $settings.textEditable },
|
||||
{ key: 'textBoxBorders', text: 'Text box borders', value: $settings.textBoxBorders },
|
||||
{ key: 'displayOCR', text: 'OCR enabled', value: $settings.displayOCR },
|
||||
@@ -12,7 +13,8 @@
|
||||
{ key: 'bounds', text: 'Bounds', value: $settings.bounds },
|
||||
{ key: 'mobile', text: 'Mobile', value: $settings.mobile },
|
||||
{ key: 'showTimer', text: 'Show timer', value: $settings.showTimer },
|
||||
{ key: 'quickActions', text: 'Show quick actions', value: $settings.quickActions }
|
||||
{ key: 'quickActions', text: 'Show quick actions', value: $settings.quickActions },
|
||||
{ key: 'invertColors', text: 'Invert colors of the images', value: $settings.invertColors }
|
||||
] as { key: SettingsKey; text: string; value: any }[];
|
||||
</script>
|
||||
|
||||
|
||||
@@ -13,6 +13,7 @@
|
||||
import VolumeSettings from './Volume/VolumeSettings.svelte';
|
||||
import About from './About.svelte';
|
||||
import QuickAccess from './QuickAccess.svelte';
|
||||
import CloudSync from './CloudSync.svelte';
|
||||
import { beforeNavigate } from '$app/navigation';
|
||||
|
||||
let transitionParams = {
|
||||
@@ -33,7 +34,8 @@
|
||||
}
|
||||
|
||||
beforeNavigate((nav) => {
|
||||
if (!hidden) {
|
||||
// Only block navigation if settings drawer is open and we're trying to navigate away
|
||||
if (!hidden && nav.type !== 'popstate') {
|
||||
nav.cancel();
|
||||
hidden = true;
|
||||
}
|
||||
@@ -63,6 +65,7 @@
|
||||
<VolumeDefaults />
|
||||
{/if}
|
||||
<Profiles {onClose} />
|
||||
<CloudSync />
|
||||
<ReaderSettings />
|
||||
<AnkiConnectSettings />
|
||||
<CatalogSettings />
|
||||
|
||||
@@ -1 +1 @@
|
||||
export const READER_VERSION = '1.0.0'
|
||||
export const READER_VERSION = '0.9.1'
|
||||
77
src/lib/server/db.ts
Normal file
77
src/lib/server/db.ts
Normal file
@@ -0,0 +1,77 @@
|
||||
import { Pool } from 'pg';
|
||||
import { env } from '$env/dynamic/private';
|
||||
|
||||
let pool: Pool | undefined;
|
||||
|
||||
function getPool(): Pool {
|
||||
if (!pool) {
|
||||
const connectionString = env.DATABASE_URL;
|
||||
if (!connectionString) {
|
||||
throw new Error('DATABASE_URL is not set');
|
||||
}
|
||||
pool = new Pool({ connectionString, max: 5 });
|
||||
}
|
||||
return pool;
|
||||
}
|
||||
|
||||
export async function ensureSchema(): Promise<void> {
|
||||
const client = await getPool().connect();
|
||||
try {
|
||||
await client.query(
|
||||
`create table if not exists user_sync (
|
||||
sync_key text primary key,
|
||||
profiles jsonb,
|
||||
current_profile text,
|
||||
misc_settings jsonb,
|
||||
volumes jsonb,
|
||||
updated_at timestamptz default now()
|
||||
)`
|
||||
);
|
||||
} finally {
|
||||
client.release();
|
||||
}
|
||||
}
|
||||
|
||||
export type SyncRow = {
|
||||
sync_key: string;
|
||||
profiles: any | null;
|
||||
current_profile: string | null;
|
||||
misc_settings: any | null;
|
||||
volumes: any | null;
|
||||
updated_at: string;
|
||||
};
|
||||
|
||||
export async function getSyncRow(syncKey: string): Promise<SyncRow | null> {
|
||||
await ensureSchema();
|
||||
const { rows } = await getPool().query('select * from user_sync where sync_key = $1', [syncKey]);
|
||||
return rows[0] ?? null;
|
||||
}
|
||||
|
||||
export async function upsertSyncRow(
|
||||
syncKey: string,
|
||||
data: Partial<Omit<SyncRow, 'sync_key' | 'updated_at'>>
|
||||
): Promise<SyncRow> {
|
||||
await ensureSchema();
|
||||
const { rows } = await getPool().query(
|
||||
`insert into user_sync (sync_key, profiles, current_profile, misc_settings, volumes)
|
||||
values ($1, $2, $3, $4, $5)
|
||||
on conflict (sync_key) do update set
|
||||
profiles = coalesce(excluded.profiles, user_sync.profiles),
|
||||
current_profile = coalesce(excluded.current_profile, user_sync.current_profile),
|
||||
misc_settings = coalesce(excluded.misc_settings, user_sync.misc_settings),
|
||||
volumes = coalesce(excluded.volumes, user_sync.volumes),
|
||||
updated_at = now()
|
||||
returning *`,
|
||||
[
|
||||
syncKey,
|
||||
data.profiles ?? null,
|
||||
data.current_profile ?? null,
|
||||
data.misc_settings ?? null,
|
||||
data.volumes ?? null
|
||||
]
|
||||
);
|
||||
return rows[0];
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
export * from './volume-data'
|
||||
export * from './settings'
|
||||
export * from './misc'
|
||||
export * from './misc'
|
||||
export * from './sync'
|
||||
@@ -1,8 +1,6 @@
|
||||
import { browser } from '$app/environment';
|
||||
import { derived, get, writable } from 'svelte/store';
|
||||
|
||||
export type Readers = 'classic' | 'v2'
|
||||
|
||||
export type FontSize =
|
||||
| 'auto'
|
||||
| '9'
|
||||
@@ -30,6 +28,9 @@ export type AnkiConnectSettings = {
|
||||
enabled: boolean;
|
||||
pictureField: string;
|
||||
sentenceField: string;
|
||||
heightField: number;
|
||||
widthField: number;
|
||||
qualityField: number;
|
||||
cropImage: boolean;
|
||||
overwriteImage: boolean;
|
||||
grabSentence: boolean;
|
||||
@@ -43,7 +44,7 @@ export type VolumeDefaults = {
|
||||
}
|
||||
|
||||
export type Settings = {
|
||||
reader: Readers,
|
||||
defaultFullscreen: boolean;
|
||||
textEditable: boolean;
|
||||
textBoxBorders: boolean;
|
||||
displayOCR: boolean;
|
||||
@@ -59,6 +60,7 @@ export type Settings = {
|
||||
quickActions: boolean;
|
||||
fontSize: FontSize;
|
||||
zoomDefault: ZoomModes;
|
||||
invertColors: boolean;
|
||||
volumeDefaults: VolumeDefaults;
|
||||
ankiConnectSettings: AnkiConnectSettings;
|
||||
};
|
||||
@@ -70,7 +72,7 @@ export type AnkiSettingsKey = keyof AnkiConnectSettings;
|
||||
export type VolumeDefaultsKey = keyof VolumeDefaults;
|
||||
|
||||
const defaultSettings: Settings = {
|
||||
reader: 'classic',
|
||||
defaultFullscreen: false,
|
||||
displayOCR: true,
|
||||
textEditable: false,
|
||||
textBoxBorders: false,
|
||||
@@ -86,6 +88,7 @@ const defaultSettings: Settings = {
|
||||
quickActions: true,
|
||||
fontSize: 'auto',
|
||||
zoomDefault: 'zoomFitToScreen',
|
||||
invertColors: false,
|
||||
volumeDefaults: {
|
||||
singlePageView: false,
|
||||
rightToLeft: true,
|
||||
@@ -98,6 +101,9 @@ const defaultSettings: Settings = {
|
||||
overwriteImage: true,
|
||||
pictureField: 'Picture',
|
||||
sentenceField: 'Sentence',
|
||||
heightField: 0,
|
||||
widthField: 0,
|
||||
qualityField: 1,
|
||||
triggerMethod: 'both'
|
||||
}
|
||||
};
|
||||
@@ -229,4 +235,4 @@ export function copyProfile(profileToCopy: string, newName: string) {
|
||||
|
||||
export function changeProfile(profileId: string) {
|
||||
currentProfile.set(profileId)
|
||||
}
|
||||
}
|
||||
|
||||
109
src/lib/settings/sync.ts
Normal file
109
src/lib/settings/sync.ts
Normal file
@@ -0,0 +1,109 @@
|
||||
import { browser } from '$app/environment';
|
||||
import { derived, get, writable } from 'svelte/store';
|
||||
import { debounce, showSnackbar } from '$lib/util';
|
||||
import { currentProfile, profiles } from './settings';
|
||||
import { miscSettings } from './misc';
|
||||
import { volumes } from './volume-data';
|
||||
|
||||
export type SyncConfig = {
|
||||
key: string | null;
|
||||
auto: boolean;
|
||||
notifications: boolean;
|
||||
};
|
||||
|
||||
const stored = browser ? window.localStorage.getItem('syncConfig') : undefined;
|
||||
const initial: SyncConfig = stored ? JSON.parse(stored) : { key: null, auto: false, notifications: true };
|
||||
export const syncConfig = writable<SyncConfig>(initial);
|
||||
|
||||
syncConfig.subscribe((value) => {
|
||||
if (browser) {
|
||||
window.localStorage.setItem('syncConfig', JSON.stringify(value));
|
||||
}
|
||||
});
|
||||
|
||||
export const isSyncEnabled = derived(syncConfig, ($cfg) => Boolean($cfg.key));
|
||||
|
||||
async function callApi(method: 'GET' | 'POST', payload?: any) {
|
||||
if (!browser) return null;
|
||||
const url = method === 'GET' ? `/api/sync?key=${encodeURIComponent(get(syncConfig).key || '')}` : '/api/sync';
|
||||
const res = await fetch(url, {
|
||||
method,
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: method === 'POST' ? JSON.stringify(payload) : undefined
|
||||
});
|
||||
if (!res.ok) throw new Error(await res.text());
|
||||
return res.json();
|
||||
}
|
||||
|
||||
export async function pullAll() {
|
||||
const cfg = get(syncConfig);
|
||||
if (!cfg.key) throw new Error('No sync key configured');
|
||||
const data = await callApi('GET');
|
||||
if (!data) return;
|
||||
|
||||
if (data.profiles) {
|
||||
profiles.set(data.profiles);
|
||||
}
|
||||
if (data.current_profile) {
|
||||
currentProfile.set(data.current_profile);
|
||||
}
|
||||
if (data.misc_settings) {
|
||||
miscSettings.set(data.misc_settings);
|
||||
}
|
||||
if (data.volumes) {
|
||||
volumes.set(data.volumes);
|
||||
}
|
||||
if (cfg.notifications) {
|
||||
showSnackbar('Pulled from server');
|
||||
}
|
||||
}
|
||||
|
||||
export async function pushAll() {
|
||||
const cfg = get(syncConfig);
|
||||
if (!cfg.key) throw new Error('No sync key configured');
|
||||
|
||||
const payload = {
|
||||
key: cfg.key,
|
||||
profiles: get(profiles),
|
||||
current_profile: get(currentProfile),
|
||||
misc_settings: get(miscSettings),
|
||||
volumes: get(volumes)
|
||||
};
|
||||
await callApi('POST', payload);
|
||||
if (cfg.notifications) {
|
||||
showSnackbar('Pushed to server');
|
||||
}
|
||||
}
|
||||
|
||||
function setupAutoSync() {
|
||||
if (!browser) return;
|
||||
let unsubscribeFns: Array<() => void> = [];
|
||||
|
||||
function resubscribe() {
|
||||
unsubscribeFns.forEach((fn) => fn());
|
||||
unsubscribeFns = [];
|
||||
|
||||
if (!get(syncConfig).auto || !get(syncConfig).key) return;
|
||||
|
||||
const schedulePush = () => debounce(() => {
|
||||
pushAll().catch((error) => {
|
||||
console.error('Auto-sync failed:', error);
|
||||
});
|
||||
}, 300);
|
||||
|
||||
unsubscribeFns.push(profiles.subscribe(() => schedulePush()));
|
||||
unsubscribeFns.push(currentProfile.subscribe(() => schedulePush()));
|
||||
unsubscribeFns.push(miscSettings.subscribe(() => schedulePush()));
|
||||
unsubscribeFns.push(volumes.subscribe(() => schedulePush()));
|
||||
}
|
||||
|
||||
resubscribe();
|
||||
unsubscribeFns.push(syncConfig.subscribe(() => resubscribe()));
|
||||
}
|
||||
|
||||
if (browser) {
|
||||
setupAutoSync();
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
<slot />
|
||||
|
||||
<style>
|
||||
/* :global(body.reader) {
|
||||
:global(body.reader) {
|
||||
overflow: hidden !important;
|
||||
overscroll-behavior: contain;
|
||||
} */
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -4,7 +4,6 @@
|
||||
import Timer from '$lib/components/Reader/Timer.svelte';
|
||||
import { initializeVolume, settings, startCount, volumeSettings, volumes } from '$lib/settings';
|
||||
import { onMount } from 'svelte';
|
||||
import ReaderV2 from '$lib/components/ReaderV2/ReaderV2.svelte';
|
||||
|
||||
const volumeId = $page.params.volume;
|
||||
let count: undefined | number = undefined;
|
||||
@@ -27,9 +26,5 @@
|
||||
{#if $settings.showTimer}
|
||||
<Timer bind:count {volumeId} />
|
||||
{/if}
|
||||
{#if $settings.reader === 'classic'}
|
||||
<Reader volumeSettings={$volumeSettings[volumeId]} />
|
||||
{:else}
|
||||
<ReaderV2 />
|
||||
{/if}
|
||||
<Reader volumeSettings={$volumeSettings[volumeId]} />
|
||||
{/if}
|
||||
|
||||
29
src/routes/api/sync/+server.ts
Normal file
29
src/routes/api/sync/+server.ts
Normal file
@@ -0,0 +1,29 @@
|
||||
import type { RequestHandler } from '@sveltejs/kit';
|
||||
import { json } from '@sveltejs/kit';
|
||||
import { getSyncRow, upsertSyncRow } from '$lib/server/db';
|
||||
|
||||
export const GET: RequestHandler = async ({ url }) => {
|
||||
const syncKey = url.searchParams.get('key');
|
||||
if (!syncKey) {
|
||||
return json({ error: 'Missing key' }, { status: 400 });
|
||||
}
|
||||
|
||||
const row = await getSyncRow(syncKey);
|
||||
if (!row) {
|
||||
return json({ profiles: null, current_profile: null, misc_settings: null, volumes: null, updated_at: null });
|
||||
}
|
||||
return json(row);
|
||||
};
|
||||
|
||||
export const POST: RequestHandler = async ({ request }) => {
|
||||
const body = await request.json();
|
||||
const { key, profiles, current_profile, misc_settings, volumes } = body ?? {};
|
||||
if (!key) {
|
||||
return json({ error: 'Missing key' }, { status: 400 });
|
||||
}
|
||||
const row = await upsertSyncRow(key, { profiles, current_profile, misc_settings, volumes });
|
||||
return json(row);
|
||||
};
|
||||
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
import { processFiles } from '$lib/upload';
|
||||
import Loader from '$lib/components/Loader.svelte';
|
||||
import { formatBytes, showSnackbar, uploadFile } from '$lib/util';
|
||||
import { Button, Frame, Listgroup, ListgroupItem } from 'flowbite-svelte';
|
||||
import { Button, P, Progressbar } from 'flowbite-svelte';
|
||||
import { onMount } from 'svelte';
|
||||
import { promptConfirmation } from '$lib/util';
|
||||
import { GoogleSolid } from 'flowbite-svelte-icons';
|
||||
@@ -22,63 +22,70 @@
|
||||
const type = 'application/json';
|
||||
|
||||
let tokenClient: any;
|
||||
let zips: gapi.client.drive.File[];
|
||||
let loadingMessage = '';
|
||||
let accessToken = '';
|
||||
let gapiLoaded = false;
|
||||
let googleLoaded = false;
|
||||
|
||||
let readerFolderId = '';
|
||||
let volumeDataId = '';
|
||||
let profilesId = '';
|
||||
|
||||
async function fetchZips(folderId: string) {
|
||||
const { result } = await gapi.client.drive.files.list({
|
||||
q: `'${folderId}' in parents and (mimeType='${FOLDER_MIME_TYPE}' or (fileExtension='zip' or fileExtension='cbz'))`,
|
||||
fields: 'files(id, name, mimeType, size)'
|
||||
});
|
||||
let loadingMessage = '';
|
||||
let errorMessage = '';
|
||||
|
||||
if (!result.files) return;
|
||||
let completed = 0;
|
||||
let totalSize = 0;
|
||||
$: progress = Math.floor((completed / totalSize) * 100).toString();
|
||||
|
||||
let zipFiles: gapi.client.drive.File[] = [];
|
||||
|
||||
for (const file of result.files) {
|
||||
if (!file.id) continue;
|
||||
|
||||
if (file.mimeType === FOLDER_MIME_TYPE) {
|
||||
zipFiles = [...zipFiles, ...((await fetchZips(file.id)) || [])];
|
||||
} else {
|
||||
zipFiles.push(file);
|
||||
function xhrDownloadFileId(fileId: string) {
|
||||
return new Promise<Blob>((resolve, reject) => {
|
||||
if (!gapiLoaded || !gapi.auth.getToken()) {
|
||||
reject(new Error('Not authenticated'));
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
return zipFiles;
|
||||
}
|
||||
const { access_token } = gapi.auth.getToken();
|
||||
const xhr = new XMLHttpRequest();
|
||||
|
||||
async function downloadFile(fileId: string) {
|
||||
loadingMessage = 'Downloading from drive';
|
||||
completed = 0;
|
||||
totalSize = 0;
|
||||
|
||||
const { body, headers } = await gapi.client.drive.files.get({
|
||||
fileId,
|
||||
alt: 'media'
|
||||
xhr.open('GET', `https://www.googleapis.com/drive/v3/files/${fileId}?alt=media`);
|
||||
xhr.setRequestHeader('Authorization', `Bearer ${access_token}`);
|
||||
xhr.responseType = 'blob';
|
||||
|
||||
xhr.onprogress = ({ loaded, total }) => {
|
||||
loadingMessage = '';
|
||||
completed = loaded;
|
||||
totalSize = total;
|
||||
};
|
||||
|
||||
xhr.onabort = (event) => {
|
||||
console.warn(`xhr ${fileId}: download aborted at ${event.loaded} of ${event.total}`);
|
||||
showSnackbar('Download failed');
|
||||
reject(new Error('Download aborted'));
|
||||
};
|
||||
|
||||
xhr.onerror = (event) => {
|
||||
console.error(`xhr ${fileId}: download error at ${event.loaded} of ${event.total}`);
|
||||
showSnackbar('Download failed');
|
||||
reject(new Error('Error downloading file'));
|
||||
};
|
||||
|
||||
xhr.onload = () => {
|
||||
completed = 0;
|
||||
totalSize = 0;
|
||||
resolve(xhr.response);
|
||||
};
|
||||
|
||||
xhr.ontimeout = (event) => {
|
||||
console.warn(`xhr ${fileId}: download timeout after ${event.loaded} of ${event.total}`);
|
||||
showSnackbar('Download timed out');
|
||||
reject(new Error('Timout downloading file'));
|
||||
};
|
||||
|
||||
xhr.send();
|
||||
});
|
||||
|
||||
const type = headers?.['Content-Type'] || '';
|
||||
|
||||
const blob = new Blob([new Uint8Array(body.length).map((_, i) => body.charCodeAt(i))], {
|
||||
type
|
||||
});
|
||||
|
||||
const file = new File([blob], fileId + '.zip');
|
||||
|
||||
loadingMessage = 'Adding to catalog';
|
||||
|
||||
await processFiles([file]);
|
||||
loadingMessage = '';
|
||||
}
|
||||
|
||||
function onClick({ id, name }: gapi.client.drive.File) {
|
||||
if (id) {
|
||||
promptConfirmation(`Would you like to download and add ${name} to your collection?`, () => {
|
||||
downloadFile(id);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
async function connectDrive(resp?: any) {
|
||||
@@ -86,50 +93,64 @@
|
||||
throw resp;
|
||||
}
|
||||
|
||||
accessToken = resp?.access_token;
|
||||
loadingMessage = 'Connecting to drive';
|
||||
|
||||
const { result: readerFolderRes } = await gapi.client.drive.files.list({
|
||||
q: `mimeType='application/vnd.google-apps.folder' and name='${READER_FOLDER}'`,
|
||||
fields: 'files(id)'
|
||||
});
|
||||
|
||||
if (readerFolderRes.files?.length === 0) {
|
||||
const { result: createReaderFolderRes } = await gapi.client.drive.files.create({
|
||||
resource: { mimeType: FOLDER_MIME_TYPE, name: READER_FOLDER },
|
||||
fields: 'id'
|
||||
try {
|
||||
const { result: readerFolderRes } = await gapi.client.drive.files.list({
|
||||
q: `mimeType='application/vnd.google-apps.folder' and name='${READER_FOLDER}'`,
|
||||
fields: 'files(id)'
|
||||
});
|
||||
|
||||
readerFolderId = createReaderFolderRes.id || '';
|
||||
} else {
|
||||
const id = readerFolderRes.files?.[0]?.id || '';
|
||||
zips = [...((await fetchZips(id)) || [])];
|
||||
if (readerFolderRes.files?.length === 0) {
|
||||
const { result: createReaderFolderRes } = await gapi.client.drive.files.create({
|
||||
resource: { mimeType: FOLDER_MIME_TYPE, name: READER_FOLDER },
|
||||
fields: 'id'
|
||||
});
|
||||
|
||||
readerFolderId = id || '';
|
||||
readerFolderId = createReaderFolderRes.id || '';
|
||||
} else {
|
||||
const id = readerFolderRes.files?.[0]?.id || '';
|
||||
readerFolderId = id || '';
|
||||
}
|
||||
|
||||
const { result: volumeDataRes } = await gapi.client.drive.files.list({
|
||||
q: `'${readerFolderId}' in parents and name='${VOLUME_DATA_FILE}'`,
|
||||
fields: 'files(id, name)'
|
||||
});
|
||||
|
||||
if (volumeDataRes.files?.length !== 0) {
|
||||
volumeDataId = volumeDataRes.files?.[0].id || '';
|
||||
}
|
||||
|
||||
const { result: profilesRes } = await gapi.client.drive.files.list({
|
||||
q: `'${readerFolderId}' in parents and name='${PROFILES_FILE}'`,
|
||||
fields: 'files(id, name)'
|
||||
});
|
||||
|
||||
if (profilesRes.files?.length !== 0) {
|
||||
profilesId = profilesRes.files?.[0].id || '';
|
||||
}
|
||||
|
||||
loadingMessage = '';
|
||||
errorMessage = '';
|
||||
|
||||
if (accessToken) {
|
||||
showSnackbar('Connected to Google Drive');
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('Error connecting to Drive:', error);
|
||||
errorMessage = 'Failed to connect to Google Drive. Please check your credentials.';
|
||||
loadingMessage = '';
|
||||
}
|
||||
|
||||
const { result: volumeDataRes } = await gapi.client.drive.files.list({
|
||||
q: `'${readerFolderId}' in parents and name='${VOLUME_DATA_FILE}'`,
|
||||
fields: 'files(id, name)'
|
||||
});
|
||||
|
||||
if (volumeDataRes.files?.length !== 0) {
|
||||
volumeDataId = volumeDataRes.files?.[0].id || '';
|
||||
}
|
||||
|
||||
const { result: profilesRes } = await gapi.client.drive.files.list({
|
||||
q: `'${readerFolderId}' in parents and name='${PROFILES_FILE}'`,
|
||||
fields: 'files(id, name)'
|
||||
});
|
||||
|
||||
if (profilesRes.files?.length !== 0) {
|
||||
profilesId = profilesRes.files?.[0].id || '';
|
||||
}
|
||||
|
||||
loadingMessage = '';
|
||||
showSnackbar('Connected to Google Drive');
|
||||
}
|
||||
|
||||
function signIn() {
|
||||
if (!gapiLoaded || !googleLoaded) {
|
||||
errorMessage = 'Google APIs not loaded yet. Please wait and try again.';
|
||||
return;
|
||||
}
|
||||
|
||||
if (gapi.client.getToken() === null) {
|
||||
tokenClient.requestAccessToken({ prompt: 'consent' });
|
||||
} else {
|
||||
@@ -138,37 +159,99 @@
|
||||
}
|
||||
|
||||
onMount(() => {
|
||||
gapi.load('client', async () => {
|
||||
await gapi.client.init({
|
||||
apiKey: API_KEY,
|
||||
discoveryDocs: [DISCOVERY_DOC]
|
||||
// Check if environment variables are set
|
||||
if (!CLIENT_ID || !API_KEY) {
|
||||
errorMessage = 'Google Drive integration not configured. Please set VITE_GDRIVE_CLIENT_ID and VITE_GDRIVE_API_KEY environment variables.';
|
||||
return;
|
||||
}
|
||||
|
||||
// Load Google APIs
|
||||
if (typeof gapi !== 'undefined') {
|
||||
gapiLoaded = true;
|
||||
gapi.load('client', async () => {
|
||||
try {
|
||||
await gapi.client.init({
|
||||
apiKey: API_KEY,
|
||||
discoveryDocs: [DISCOVERY_DOC]
|
||||
});
|
||||
} catch (error) {
|
||||
console.error('Error initializing gapi client:', error);
|
||||
errorMessage = 'Failed to initialize Google Drive client.';
|
||||
}
|
||||
});
|
||||
|
||||
if (gapi.client.getToken() !== null) {
|
||||
loadingMessage = 'Connecting to drive';
|
||||
connectDrive();
|
||||
}
|
||||
});
|
||||
gapi.load('picker', () => {});
|
||||
} else {
|
||||
errorMessage = 'Google APIs not loaded. Please check your internet connection.';
|
||||
}
|
||||
|
||||
tokenClient = google.accounts.oauth2.initTokenClient({
|
||||
client_id: CLIENT_ID,
|
||||
scope: SCOPES,
|
||||
callback: connectDrive
|
||||
});
|
||||
if (typeof google !== 'undefined') {
|
||||
googleLoaded = true;
|
||||
tokenClient = google.accounts.oauth2.initTokenClient({
|
||||
client_id: CLIENT_ID,
|
||||
scope: SCOPES,
|
||||
callback: connectDrive
|
||||
});
|
||||
} else {
|
||||
errorMessage = 'Google OAuth not loaded. Please check your internet connection.';
|
||||
}
|
||||
});
|
||||
|
||||
function createPicker() {
|
||||
if (!googleLoaded || !accessToken) {
|
||||
showSnackbar('Not connected to Google Drive');
|
||||
return;
|
||||
}
|
||||
|
||||
const docsView = new google.picker.DocsView(google.picker.ViewId.DOCS)
|
||||
.setMimeTypes('application/zip,application/x-zip-compressed')
|
||||
.setMode(google.picker.DocsViewMode.LIST)
|
||||
.setIncludeFolders(true)
|
||||
.setParent(readerFolderId);
|
||||
|
||||
const picker = new google.picker.PickerBuilder()
|
||||
.addView(docsView)
|
||||
.setOAuthToken(accessToken)
|
||||
.setAppId(CLIENT_ID)
|
||||
.setDeveloperKey(API_KEY)
|
||||
.enableFeature(google.picker.Feature.NAV_HIDDEN)
|
||||
.setCallback(pickerCallback)
|
||||
.build();
|
||||
picker.setVisible(true);
|
||||
}
|
||||
|
||||
async function pickerCallback(data: google.picker.ResponseObject) {
|
||||
try {
|
||||
if (data[google.picker.Response.ACTION] == google.picker.Action.PICKED) {
|
||||
loadingMessage = 'Downloading from drive...';
|
||||
const docs = data[google.picker.Response.DOCUMENTS];
|
||||
const blob = await xhrDownloadFileId(docs[0].id);
|
||||
|
||||
loadingMessage = 'Adding to catalog...';
|
||||
|
||||
const file = new File([blob], docs[0].name);
|
||||
|
||||
await processFiles([file]);
|
||||
loadingMessage = '';
|
||||
}
|
||||
} catch (error) {
|
||||
showSnackbar('Something went wrong');
|
||||
loadingMessage = '';
|
||||
console.error(error);
|
||||
}
|
||||
}
|
||||
|
||||
async function onUploadVolumeData() {
|
||||
const metadata = {
|
||||
mimeType: type,
|
||||
name: VOLUME_DATA_FILE,
|
||||
parents: [volumeDataId ? null : readerFolderId]
|
||||
};
|
||||
const { access_token } = gapi.auth.getToken();
|
||||
|
||||
loadingMessage = 'Uploading volume data';
|
||||
|
||||
const res = await uploadFile({
|
||||
accessToken: access_token,
|
||||
accessToken,
|
||||
fileId: volumeDataId,
|
||||
metadata,
|
||||
localStorageId: 'volumes',
|
||||
@@ -178,7 +261,9 @@
|
||||
volumeDataId = res.id;
|
||||
loadingMessage = '';
|
||||
|
||||
showSnackbar('Volume data uploaded');
|
||||
if (volumeDataId) {
|
||||
showSnackbar('Volume data uploaded');
|
||||
}
|
||||
}
|
||||
|
||||
async function onUploadProfiles() {
|
||||
@@ -187,12 +272,11 @@
|
||||
name: PROFILES_FILE,
|
||||
parents: [profilesId ? null : readerFolderId]
|
||||
};
|
||||
const { access_token } = gapi.auth.getToken();
|
||||
|
||||
loadingMessage = 'Uploading profiles';
|
||||
|
||||
const res = await uploadFile({
|
||||
accessToken: access_token,
|
||||
accessToken,
|
||||
fileId: profilesId,
|
||||
metadata,
|
||||
localStorageId: 'profiles',
|
||||
@@ -202,7 +286,9 @@
|
||||
profilesId = res.id;
|
||||
loadingMessage = '';
|
||||
|
||||
showSnackbar('Profiles uploaded');
|
||||
if (profilesId) {
|
||||
showSnackbar('Profiles uploaded');
|
||||
}
|
||||
}
|
||||
|
||||
async function onDownloadVolumeData() {
|
||||
@@ -253,15 +339,31 @@
|
||||
</svelte:head>
|
||||
|
||||
<div class="p-2 h-[90svh]">
|
||||
{#if loadingMessage}
|
||||
{#if errorMessage}
|
||||
<div class="bg-red-900/20 border border-red-700 rounded-lg p-4 mb-4">
|
||||
<p class="text-red-400">{errorMessage}</p>
|
||||
</div>
|
||||
{/if}
|
||||
|
||||
{#if loadingMessage || completed > 0}
|
||||
<Loader>
|
||||
{loadingMessage}
|
||||
{#if completed > 0}
|
||||
<P>{formatBytes(completed)} / {formatBytes(totalSize)}</P>
|
||||
<Progressbar {progress} />
|
||||
{:else}
|
||||
{loadingMessage}
|
||||
{/if}
|
||||
</Loader>
|
||||
{:else if zips}
|
||||
<div class="flex flex-col gap-2">
|
||||
<div class="flex justify-between items-center gap-2 flex-col sm:flex-row">
|
||||
<h2 class="text-2xl font-semibold text-center">Google Drive:</h2>
|
||||
<div class="flex flex-col sm:flex-row gap-2 sm:w-auto w-full">
|
||||
{:else if accessToken}
|
||||
<div class="flex justify-between items-center gap-6 flex-col">
|
||||
<h2 class="text-3xl font-semibold text-center pt-2">Google Drive:</h2>
|
||||
<p class="text-center">
|
||||
Add your zipped manga files to the <span class="text-primary-700">{READER_FOLDER}</span> folder
|
||||
in your Google Drive.
|
||||
</p>
|
||||
<div class="flex flex-col gap-4 w-full max-w-3xl">
|
||||
<Button color="blue" on:click={createPicker}>Download manga</Button>
|
||||
<div class="flex-col gap-2 flex">
|
||||
<Button
|
||||
color="dark"
|
||||
on:click={() => promptConfirmation('Upload volume data?', onUploadVolumeData)}
|
||||
@@ -277,6 +379,8 @@
|
||||
Download volume data
|
||||
</Button>
|
||||
{/if}
|
||||
</div>
|
||||
<div class="flex-col gap-2 flex">
|
||||
<Button
|
||||
color="dark"
|
||||
on:click={() => promptConfirmation('Upload profiles?', onUploadProfiles)}
|
||||
@@ -294,44 +398,22 @@
|
||||
{/if}
|
||||
</div>
|
||||
</div>
|
||||
<div class="flex gap-2 justify-center flex-wrap">
|
||||
{#if zips.length > 0}
|
||||
<Listgroup active class="w-full">
|
||||
{#each zips as zip}
|
||||
<Frame
|
||||
on:click={() => onClick(zip)}
|
||||
rounded
|
||||
border
|
||||
class="divide-y divide-gray-200 dark:divide-gray-600"
|
||||
>
|
||||
<ListgroupItem normalClass="py-4">
|
||||
<div class="flex flex-col gap-2">
|
||||
<h2 class="font-semibold">{zip.name}</h2>
|
||||
<p>{formatBytes(parseInt(zip.size || '0'))}</p>
|
||||
</div>
|
||||
</ListgroupItem>
|
||||
</Frame>
|
||||
{/each}
|
||||
</Listgroup>
|
||||
{:else}
|
||||
<div class="h-[70svh] items-center justify-center flex">
|
||||
<p class="text-center">
|
||||
Add your zip files to the <span class="text-primary-700">{READER_FOLDER}</span> folder
|
||||
in your Google Drive.
|
||||
</p>
|
||||
</div>
|
||||
{/if}
|
||||
</div>
|
||||
</div>
|
||||
{:else}
|
||||
<button
|
||||
class="w-full border rounded-lg border-slate-600 p-10 border-opacity-50 hover:bg-slate-800"
|
||||
on:click={signIn}
|
||||
>
|
||||
<div class="flex sm:flex-row flex-col gap-2 items-center justify-center">
|
||||
<GoogleSolid size="lg" />
|
||||
<h2 class="text-lg">Connect to Google Drive</h2>
|
||||
</div>
|
||||
</button>
|
||||
<div class="flex justify-center pt-0 sm:pt-32">
|
||||
<button
|
||||
class="w-full border rounded-lg border-slate-600 p-10 border-opacity-50 hover:bg-slate-800 max-w-3xl"
|
||||
on:click={signIn}
|
||||
disabled={!gapiLoaded || !googleLoaded}
|
||||
>
|
||||
<div class="flex sm:flex-row flex-col gap-2 items-center justify-center">
|
||||
<GoogleSolid size="lg" />
|
||||
<h2 class="text-lg">Connect to Google Drive</h2>
|
||||
</div>
|
||||
</button>
|
||||
{#if !gapiLoaded || !googleLoaded}
|
||||
<p class="text-sm text-gray-400 mt-2">Loading Google APIs...</p>
|
||||
{/if}
|
||||
</div>
|
||||
{/if}
|
||||
</div>
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
import { promptConfirmation, showSnackbar } from '$lib/util';
|
||||
import { P, Progressbar } from 'flowbite-svelte';
|
||||
import { onMount } from 'svelte';
|
||||
export const BASE_URL = 'https://www.mokuro.moe/manga';
|
||||
export const BASE_URL = $page.url.searchParams.get('source') || 'https://mokuro.moe/manga';
|
||||
|
||||
const manga = $page.url.searchParams.get('manga');
|
||||
const volume = $page.url.searchParams.get('volume');
|
||||
|
||||
@@ -53,7 +53,7 @@
|
||||
],
|
||||
"start_url": "/",
|
||||
"background_color": "#030712",
|
||||
"display": "standalone",
|
||||
"display": "fullscreen",
|
||||
"scope": "/",
|
||||
"theme_color": "#030712",
|
||||
"description": "Reader for Mokuro processed manga"
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import adapter from '@sveltejs/adapter-auto';
|
||||
import adapter from '@sveltejs/adapter-node';
|
||||
import { vitePreprocess } from '@sveltejs/kit/vite';
|
||||
|
||||
/** @type {import('@sveltejs/kit').Config} */
|
||||
|
||||
Reference in New Issue
Block a user