diff --git a/res/static/img/home/transfers.webp b/res/static/img/home/remote_sync.webp similarity index 100% rename from res/static/img/home/transfers.webp rename to res/static/img/home/remote_sync.webp diff --git a/svelte/src/home_page/Showcase.svelte b/svelte/src/home_page/Showcase.svelte index cd9766a..fced299 100644 --- a/svelte/src/home_page/Showcase.svelte +++ b/svelte/src/home_page/Showcase.svelte @@ -26,10 +26,10 @@ const slides = [ text: `Follow the downloads and data transfer of every file, from the last day up to five years back.`, }, { - image: "transfers", - title: "Transfers", + image: "remote_sync", + title: "Remote sync", text: `Import from or export to S3, Backblaze B2, Azure, SFTP, FTP, - WebDAV or pixeldrain. Transfers run on our servers, so you can close the + WebDAV or pixeldrain. Syncs run on our servers, so you can close the page while they run.`, }, ] diff --git a/svelte/src/user_home/Router.svelte b/svelte/src/user_home/Router.svelte index 643e2ec..2e1c8be 100644 --- a/svelte/src/user_home/Router.svelte +++ b/svelte/src/user_home/Router.svelte @@ -12,7 +12,7 @@ import { get_user, type User } from "lib/NovaAPI"; import SharingSettings from "./SharingSettings.svelte"; import SubscriptionManage from "./SubscriptionManage.svelte"; import SubscriptionUsage from "./SubscriptionUsage.svelte"; -import Transfers from "./transfers/Transfers.svelte"; +import RemoteSync from "./remote_sync/RemoteSync.svelte"; let pages: Tab[] = [ { @@ -54,10 +54,10 @@ let pages: Tab[] = [ icon: "share", component: SharingSettings, }, { - path: "/user/transfers", - title: "Transfers", + path: "/user/remote_sync", + title: "Remote sync", icon: "sync_alt", - component: Transfers, + component: RemoteSync, }, { path: "/user/connect_app", title: "Apps", diff --git a/svelte/src/user_home/transfers/Transfers.svelte b/svelte/src/user_home/remote_sync/RemoteSync.svelte similarity index 77% rename from svelte/src/user_home/transfers/Transfers.svelte rename to svelte/src/user_home/remote_sync/RemoteSync.svelte index 8cde7ad..5078ba0 100644 --- a/svelte/src/user_home/transfers/Transfers.svelte +++ b/svelte/src/user_home/remote_sync/RemoteSync.svelte @@ -5,24 +5,24 @@ import { check_response, dict_to_form, get_endpoint } from "lib/NovaAPI"; import ProgressBar from "util/ProgressBar.svelte"; import { formatDataVolume, formatDate, formatDuration } from "util/Formatting"; import { user } from "lib/UserStore"; -import TransferForm from "./TransferForm.svelte"; -import { edit_transfer, form, secret_fields, service_of, type Transfer } from "./TransferLib.svelte"; +import RemoteSyncForm from "./RemoteSyncForm.svelte"; +import { edit_remote_sync, form, secret_fields, service_of, type RemoteSync } from "./RemoteSyncLib.svelte"; -let transfers: Transfer[] = $state([]) +let syncs: RemoteSync[] = $state([]) -// Polls every second while a transfer runs, the server saves the +// Polls every second while a sync runs, the server saves the // progress that often let mounted = true let timeout: ReturnType const load = async () => { clearTimeout(timeout) try { - transfers = await check_response(await fetch(get_endpoint() + "/user/transfer")) + syncs = await check_response(await fetch(get_endpoint() + "/user/remote_sync")) } catch (err) { - console.error("Failed to load transfers:", err) + console.error("Failed to load remote syncs:", err) } - if (mounted && transfers.some(t => t.status === "running")) { + if (mounted && syncs.some(t => t.status === "running")) { timeout = setTimeout(load, 1000) } } @@ -35,33 +35,33 @@ onMount(() => { } }) -const edit = (t: Transfer) => { - edit_transfer(t) - document.getElementById("transfer_form")?.scrollIntoView({ behavior: "smooth" }) +const edit = (t: RemoteSync) => { + edit_remote_sync(t) + document.getElementById("remote_sync_form")?.scrollIntoView({ behavior: "smooth" }) } -const restart = async (t: Transfer, body = {}) => { +const restart = async (t: RemoteSync, body = {}) => { try { await loading_run(async () => check_response( - await fetch(get_endpoint() + "/user/transfer/" + t.id + "/restart", { + await fetch(get_endpoint() + "/user/remote_sync/" + t.id + "/restart", { method: "POST", body: dict_to_form(body), }) )) } catch (err) { - alert("Failed to restart the transfer: " + (err.message ?? err)) + alert("Failed to restart the remote sync: " + (err.message ?? err)) return } asking = "" load() } -// A transfer without remembered credentials asks for them again. What the form +// A sync without remembered credentials asks for them again. What the form // still has for that service is filled in let asking = $state("") let secrets: { [name: string]: string } = $state({}) let remember_again = $state(false) -const ask = (t: Transfer) => { +const ask = (t: RemoteSync) => { const service = service_of(t) secrets = Object.fromEntries(secret_fields(service).map(f => [f.name, (form.options[service][f.name] as string) ?? ""] @@ -70,13 +70,13 @@ const ask = (t: Transfer) => { asking = t.id } -const remove = async (t: Transfer) => { +const remove = async (t: RemoteSync) => { try { await loading_run(async () => check_response( - await fetch(get_endpoint() + "/user/transfer/" + t.id, { method: "DELETE" }) + await fetch(get_endpoint() + "/user/remote_sync/" + t.id, { method: "DELETE" }) )) } catch (err) { - alert("Failed to remove the transfer: " + (err.message ?? err)) + alert("Failed to remove the remote sync: " + (err.message ?? err)) return } load() @@ -84,29 +84,29 @@ const remove = async (t: Transfer) => {
-

Transfers

+

Remote sync

- Copy files between Nova and another storage service. The transfer runs - on our servers, so you can close this page while it runs. A transfer + Copy files between Nova and another storage service. The sync runs + on our servers, so you can close this page while it runs. A sync which stopped can be started again, files which are already there are skipped.

{#if $user !== null && $user.subscription.id === ""}

- Transfers are available on paid plans. + Remote sync is available on paid plans. Upgrade

{:else} - + {/if} - {#each transfers as t (t.id)} + {#each syncs as t (t.id)} {@const name = t.directory_path || t.directory} {@const service = service_of(t)} -
+
@@ -149,7 +149,7 @@ const remove = async (t: Transfer) => { {t.stats.checks} of {t.stats.totalChecks}
- Transfer rate + RemoteSync rate {formatDataVolume(t.stats.speed, 3)}/s
@@ -166,8 +166,8 @@ const remove = async (t: Transfer) => { {#if asking === t.id}
{ e.preventDefault(); restart(t, { ...secrets, remember: remember_again }) }}> - - + + {#each secret_fields(service) as f (f.name)} {#if f.type === "textarea"} @@ -211,15 +211,15 @@ const remove = async (t: Transfer) => {