From 204d909b0e375752960c4bda0d7afa6499ed9628 Mon Sep 17 00:00:00 2001 From: schroda <50052685+schroda@users.noreply.github.com> Date: Sat, 5 Oct 2024 22:31:21 +0200 Subject: [PATCH] Move download files into new folder --- src/App.tsx | 7 +++++-- src/modules/downloads/Downloads.types.ts | 14 ++++++++++++++ .../DeleteChaptersWhileReadingSetting.tsx | 0 .../downloads/components}/DownloadAheadSetting.tsx | 3 ++- .../downloads}/screens/DownloadQueue.tsx | 0 .../downloads/screens}/DownloadSettings.tsx | 7 ++++--- src/typings.ts | 8 +------- 7 files changed, 26 insertions(+), 13 deletions(-) create mode 100644 src/modules/downloads/Downloads.types.ts rename src/{components/settings/downloads => modules/downloads/components}/DeleteChaptersWhileReadingSetting.tsx (100%) rename src/{components/settings/downloads => modules/downloads/components}/DownloadAheadSetting.tsx (95%) rename src/{ => modules/downloads}/screens/DownloadQueue.tsx (100%) rename src/{screens/settings => modules/downloads/screens}/DownloadSettings.tsx (97%) diff --git a/src/App.tsx b/src/App.tsx index 2b3fb3aa..fbb71060 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -23,7 +23,7 @@ import { ErrorBoundary } from '@/modules/core/components/ErrorBoundary.tsx'; import { useNavBarContext } from '@/modules/navigation-bar/contexts/NavbarContext.tsx'; const { Browse } = loadable(() => import('@/modules/browse/screens/Browse.tsx'), lazyLoadFallback); -const { DownloadQueue } = loadable(() => import('@/screens/DownloadQueue'), lazyLoadFallback); +const { DownloadQueue } = loadable(() => import('@/modules/downloads/screens/DownloadQueue.tsx'), lazyLoadFallback); const { Library } = loadable(() => import('@/modules/library/screens/Library.tsx'), lazyLoadFallback); const { Manga } = loadable(() => import('@/modules/manga/screens/Manga.tsx'), lazyLoadFallback); const { Reader } = loadable(() => import('@/modules/reader/screens/Reader.tsx'), lazyLoadFallback); @@ -43,7 +43,10 @@ const { SourceConfigure } = loadable(() => import('@/modules/source/screens/Sour const { SourceMangas } = loadable(() => import('@/modules/source/screens/SourceMangas.tsx'), lazyLoadFallback); const { Updates } = loadable(() => import('@/screens/Updates'), lazyLoadFallback); const { LibrarySettings } = loadable(() => import('@/modules/library/screens/LibrarySettings.tsx'), lazyLoadFallback); -const { DownloadSettings } = loadable(() => import('@/screens/settings/DownloadSettings.tsx'), lazyLoadFallback); +const { DownloadSettings } = loadable( + () => import('@/modules/downloads/screens/DownloadSettings.tsx'), + lazyLoadFallback, +); const { ServerSettings } = loadable(() => import('@/screens/settings/ServerSettings.tsx'), lazyLoadFallback); const { BrowseSettings } = loadable(() => import('@/modules/browse/screens/BrowseSettings.tsx'), lazyLoadFallback); const { WebUISettings } = loadable(() => import('@/screens/settings/WebUISettings.tsx'), lazyLoadFallback); diff --git a/src/modules/downloads/Downloads.types.ts b/src/modules/downloads/Downloads.types.ts new file mode 100644 index 00000000..b03b69c5 --- /dev/null +++ b/src/modules/downloads/Downloads.types.ts @@ -0,0 +1,14 @@ +/* + * Copyright (C) Contributors to the Suwayomi project + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +export type MetadataDownloadSettings = { + deleteChaptersManuallyMarkedRead: boolean; + deleteChaptersWhileReading: number; + deleteChaptersWithBookmark: boolean; + downloadAheadLimit: number; +}; diff --git a/src/components/settings/downloads/DeleteChaptersWhileReadingSetting.tsx b/src/modules/downloads/components/DeleteChaptersWhileReadingSetting.tsx similarity index 100% rename from src/components/settings/downloads/DeleteChaptersWhileReadingSetting.tsx rename to src/modules/downloads/components/DeleteChaptersWhileReadingSetting.tsx diff --git a/src/components/settings/downloads/DownloadAheadSetting.tsx b/src/modules/downloads/components/DownloadAheadSetting.tsx similarity index 95% rename from src/components/settings/downloads/DownloadAheadSetting.tsx rename to src/modules/downloads/components/DownloadAheadSetting.tsx index 74e144fa..b262f942 100644 --- a/src/components/settings/downloads/DownloadAheadSetting.tsx +++ b/src/modules/downloads/components/DownloadAheadSetting.tsx @@ -14,8 +14,9 @@ import Switch from '@mui/material/Switch'; import { NumberSetting } from '@/modules/core/components/settings/NumberSetting.tsx'; import { getPersistedServerSetting, usePersistedValue } from '@/modules/core/hooks/usePersistedValue.tsx'; import { updateMetadataServerSettings } from '@/lib/metadata/metadataServerSettings.ts'; -import { MetadataDownloadSettings, MetadataServerSettings } from '@/typings.ts'; +import { MetadataServerSettings } from '@/typings.ts'; import { makeToast } from '@/lib/ui/Toast.ts'; +import { MetadataDownloadSettings } from '@/modules/downloads/Downloads.types.ts'; const MIN_LIMIT = 2; const MAX_LIMIT = 10; diff --git a/src/screens/DownloadQueue.tsx b/src/modules/downloads/screens/DownloadQueue.tsx similarity index 100% rename from src/screens/DownloadQueue.tsx rename to src/modules/downloads/screens/DownloadQueue.tsx diff --git a/src/screens/settings/DownloadSettings.tsx b/src/modules/downloads/screens/DownloadSettings.tsx similarity index 97% rename from src/screens/settings/DownloadSettings.tsx rename to src/modules/downloads/screens/DownloadSettings.tsx index bee4a87a..cc96edc8 100644 --- a/src/screens/settings/DownloadSettings.tsx +++ b/src/modules/downloads/screens/DownloadSettings.tsx @@ -15,15 +15,15 @@ import Switch from '@mui/material/Switch'; import ListSubheader from '@mui/material/ListSubheader'; import { TextSetting } from '@/modules/core/components/settings/text/TextSetting.tsx'; import { NavBarContext } from '@/modules/navigation-bar/contexts/NavbarContext.tsx'; -import { MetadataDownloadSettings, ServerSettings } from '@/typings.ts'; +import { ServerSettings } from '@/typings.ts'; import { requestManager } from '@/lib/requests/requests/RequestManager.ts'; -import { DownloadAheadSetting } from '@/components/settings/downloads/DownloadAheadSetting.tsx'; +import { DownloadAheadSetting } from '@/modules/downloads/components/DownloadAheadSetting.tsx'; import { createUpdateMetadataServerSettings, useMetadataServerSettings, } from '@/lib/metadata/metadataServerSettings.ts'; import { makeToast } from '@/lib/ui/Toast.ts'; -import { DeleteChaptersWhileReadingSetting } from '@/components/settings/downloads/DeleteChaptersWhileReadingSetting.tsx'; +import { DeleteChaptersWhileReadingSetting } from '@/modules/downloads/components/DeleteChaptersWhileReadingSetting.tsx'; import { CategoriesInclusionSetting } from '@/modules/category/components/CategoriesInclusionSetting.tsx'; import { NumberSetting } from '@/modules/core/components/settings/NumberSetting.tsx'; import { LoadingPlaceholder } from '@/modules/core/components/placeholder/LoadingPlaceholder.tsx'; @@ -31,6 +31,7 @@ import { EmptyViewAbsoluteCentered } from '@/modules/core/components/placeholder import { defaultPromiseErrorHandler } from '@/lib/DefaultPromiseErrorHandler.ts'; import { GetCategoriesSettingsQuery, GetCategoriesSettingsQueryVariables } from '@/lib/graphql/generated/graphql.ts'; import { GET_CATEGORIES_SETTINGS } from '@/lib/graphql/queries/CategoryQuery.ts'; +import { MetadataDownloadSettings } from '@/modules/downloads/Downloads.types.ts'; type DownloadSettingsType = Pick< ServerSettings, diff --git a/src/typings.ts b/src/typings.ts index a40c7372..cab09432 100644 --- a/src/typings.ts +++ b/src/typings.ts @@ -17,6 +17,7 @@ import { MetadataUpdateSettings } from '@/modules/app-updates/AppUpdateChecker.t import { MetadataThemeSettings } from '@/modules/theme/AppTheme.types.ts'; import { MetadataClientSettings } from '@/modules/device/Device.types.ts'; import { MetadataBrowseSettings } from '@/modules/browse/Browse.types.ts'; +import { MetadataDownloadSettings } from '@/modules/downloads/Downloads.types.ts'; export interface IMetadataMigration { appKeyPrefix?: { oldPrefix: string; newPrefix: string }; @@ -57,13 +58,6 @@ export type AppMetadataKeys = export type MetadataKeyValuePair = [AppMetadataKeys, AllowedMetadataValueTypes]; -export type MetadataDownloadSettings = { - deleteChaptersManuallyMarkedRead: boolean; - deleteChaptersWhileReading: number; - deleteChaptersWithBookmark: boolean; - downloadAheadLimit: number; -}; - export type MetadataServerSettings = MetadataDownloadSettings & MetadataLibrarySettings & MetadataClientSettings &