Add option to update tracking on manual mark as read

public/locales/en.json

@@ -1127,7 +1127,9 @@
         }
       },
       "label": {
-        "update_progress_reading": "Update progress after reading"
+        "update_progress_manual": "Update progress after manually marking as read",
+        "update_progress_reading": "Update progress after reading",
+        "update_progress_reading_description": "Does not work when marking multiple manga as read at once"
       },
       "title": {
         "settings": "Tracking settings",

src/components/chapter/ChapterActionMenuItems.tsx

@@ -23,6 +23,8 @@ import {
     ChapterAction,
     ChapterBookmarkInfo,
     ChapterDownloadInfo,
+    ChapterIdInfo,
+    ChapterMangaInfo,
     ChapterReadInfo,
     ChapterRealUrlInfo,
     Chapters,
@@ -38,7 +40,12 @@ import { useMetadataServerSettings } from '@/lib/metadata/metadataServerSettings
 type BaseProps = { onClose: () => void };
 
 type SingleModeProps = {
-    chapter: ChapterDownloadInfo & ChapterBookmarkInfo & ChapterReadInfo & ChapterRealUrlInfo;
+    chapter: ChapterIdInfo &
+        ChapterMangaInfo &
+        ChapterDownloadInfo &
+        ChapterBookmarkInfo &
+        ChapterReadInfo &
+        ChapterRealUrlInfo;
     allChapters: TChapter[];
     handleSelection?: SelectableCollectionReturnType<TChapter['id']>['handleSelection'];
     canBeDownloaded: boolean;
@@ -109,7 +116,7 @@ export const ChapterActionMenuItems = ({
             }
         }
 
-        const getChapters = (): (ChapterDownloadInfo & ChapterBookmarkInfo & ChapterReadInfo)[] => {
+        const getChapters = (): SingleModeProps['chapter'][] => {
             // select mode
             if (!chapter) {
                 return ChaptersWithMeta.getChapters(chaptersWithMeta);
@@ -139,6 +146,7 @@ export const ChapterActionMenuItems = ({
         Chapters.performAction(actualAction, Chapters.getIds(chapters), {
             chapters,
             wasManuallyMarkedAsRead: true,
+            trackProgressMangaId: chapters[0]?.mangaId,
         }).catch(defaultPromiseErrorHandler('ChapterActionMenuItems::performAction'));
         onClose();
     };

src/lib/data/Chapters.ts

@@ -9,7 +9,7 @@
 import { t as translate } from 'i18next';
 import gql from 'graphql-tag';
 import { DocumentNode } from '@apollo/client';
-import { ChapterOffset, TChapter, TranslationKey } from '@/typings.ts';
+import { ChapterOffset, TChapter, TManga, TranslationKey } from '@/typings.ts';
 import { makeToast } from '@/components/util/Toast.tsx';
 import { requestManager } from '@/lib/requests/RequestManager.ts';
 import { getMetadataServerSettings } from '@/lib/metadata/metadataServerSettings.ts';
@@ -78,6 +78,7 @@ export const actionToTranslationKey: {
 };
 
 export type ChapterIdInfo = Pick<TChapter, 'id'>;
+export type ChapterMangaInfo = Pick<TChapter, 'mangaId'>;
 export type ChapterDownloadInfo = ChapterIdInfo & Pick<TChapter, 'isDownloaded'>;
 export type ChapterBookmarkInfo = ChapterIdInfo & Pick<TChapter, 'isBookmarked'>;
 export type ChapterReadInfo = ChapterIdInfo & Pick<TChapter, 'isRead'>;
@@ -207,8 +208,10 @@ export class Chapters {
     static async markAsRead(
         chapters: (ChapterDownloadInfo & ChapterBookmarkInfo)[],
         wasManuallyMarkedAsRead: boolean = false,
+        trackProgressMangaId?: TManga['id'],
     ): Promise<void> {
-        const { deleteChaptersManuallyMarkedRead, deleteChaptersWithBookmark } = await getMetadataServerSettings();
+        const { deleteChaptersManuallyMarkedRead, deleteChaptersWithBookmark, updateProgressManualMarkRead } =
+            await getMetadataServerSettings();
         const chapterIdsToDelete =
             deleteChaptersManuallyMarkedRead && wasManuallyMarkedAsRead
                 ? Chapters.getIds(Chapters.getDeletable(chapters, deleteChaptersWithBookmark))
@@ -221,6 +224,8 @@ export class Chapters {
                     isRead: true,
                     lastPageRead: 0,
                     chapterIdsToDelete,
+                    trackProgressMangaId:
+                        updateProgressManualMarkRead && wasManuallyMarkedAsRead ? trackProgressMangaId : undefined,
                 }).response,
         );
     }
@@ -268,14 +273,17 @@ export class Chapters {
         chapterIds: number[],
         {
             wasManuallyMarkedAsRead,
+            trackProgressMangaId,
             chapters,
         }: Action extends 'mark_as_read'
             ? {
                   wasManuallyMarkedAsRead: boolean;
+                  trackProgressMangaId?: TManga['id'];
                   chapters: (ChapterDownloadInfo & ChapterBookmarkInfo & ChapterReadInfo)[];
               }
             : {
                   wasManuallyMarkedAsRead?: never;
+                  trackProgressMangaId?: never;
                   chapters?: never;
               },
     ): Promise<void> {
@@ -285,7 +293,7 @@ export class Chapters {
             case 'delete':
                 return Chapters.delete(chapterIds);
             case 'mark_as_read':
-                return Chapters.markAsRead(chapters!, wasManuallyMarkedAsRead!);
+                return Chapters.markAsRead(chapters!, wasManuallyMarkedAsRead!, trackProgressMangaId);
             case 'mark_as_unread':
                 return Chapters.markAsUnread(chapterIds);
             case 'bookmark':

src/lib/data/Mangas.ts

@@ -300,7 +300,7 @@ export class Mangas {
 
     static async markAsRead(mangaIds: number[], wasManuallyMarkedAsRead: boolean = false): Promise<void> {
         const chapters = await Mangas.getChapterIdsWithState(mangaIds, { isRead: false });
-        return Chapters.markAsRead(chapters, wasManuallyMarkedAsRead);
+        return Chapters.markAsRead(chapters, wasManuallyMarkedAsRead, mangaIds.length === 1 ? mangaIds[0] : undefined);
     }
 
     static async markAsUnread(mangaIds: number[]): Promise<void> {

src/lib/graphql/Fragments.ts

@@ -328,6 +328,7 @@ export const FULL_CHAPTER_FIELDS = gql`
         isRead
         lastPageRead
         lastReadAt
+        mangaId
         manga {
             id
             title

src/lib/graphql/mutations/ChapterMutation.ts

@@ -146,6 +146,7 @@ export const UPDATE_CHAPTER = gql`
 `;
 
 export const UPDATE_CHAPTERS = gql`
+    ${BASE_TRACK_RECORD_FIELDS}
     mutation UPDATE_CHAPTERS(
         $input: UpdateChaptersInput!
         $getBookmarked: Boolean!
@@ -153,6 +154,8 @@ export const UPDATE_CHAPTERS = gql`
         $getLastPageRead: Boolean!
         $chapterIdsToDelete: [Int!]!
         $deleteChapters: Boolean!
+        $mangaId: Int!
+        $trackProgress: Boolean!
     ) {
         updateChapters(input: $input) {
             clientMutationId
@@ -192,5 +195,10 @@ export const UPDATE_CHAPTERS = gql`
                 }
             }
         }
+        trackProgress(input: { mangaId: $mangaId }) @include(if: $trackProgress) {
+            trackRecords {
+                ...BASE_TRACK_RECORD_FIELDS
+            }
+        }
     }
 `;

src/lib/metadata/metadata.ts

@@ -48,6 +48,7 @@ const GLOBAL_METADATA_KEYS: AppMetadataKeys[] = [
 
     // tracking
     'updateProgressAfterReading',
+    'updateProgressManualMarkRead',
 ];
 
 /**

src/lib/metadata/metadataServerSettings.ts

@@ -44,6 +44,7 @@ export const getDefaultSettings = (): MetadataServerSettings => ({
 
     // tracking
     updateProgressAfterReading: true,
+    updateProgressManualMarkRead: false,
 });
 
 export const convertSettingsToMetadata = (

src/lib/requests/RequestManager.ts

@@ -287,6 +287,7 @@ import {
     TRACKER_UPDATE_BIND,
 } from '@/lib/graphql/mutations/TrackerMutation.ts';
 import { ControlledPromise } from '@/lib/ControlledPromise.ts';
+import { TManga } from '@/typings.ts';
 
 enum GQLMethod {
     QUERY = 'QUERY',
@@ -1942,10 +1943,10 @@ export class RequestManager {
 
     public updateChapters(
         ids: number[],
-        patch: UpdateChapterPatchInput & { chapterIdsToDelete?: number[] },
+        patch: UpdateChapterPatchInput & { chapterIdsToDelete?: number[]; trackProgressMangaId?: TManga['id'] },
         options?: MutationOptions<UpdateChaptersMutation, UpdateChaptersMutationVariables>,
     ): AbortableApolloMutationResponse<UpdateChaptersMutation> {
-        const { chapterIdsToDelete = [], ...updatePatch } = patch;
+        const { chapterIdsToDelete = [], trackProgressMangaId = -1, ...updatePatch } = patch;
 
         return this.doRequest<UpdateChaptersMutation, UpdateChaptersMutationVariables>(
             GQLMethod.MUTATION,
@@ -1957,6 +1958,8 @@ export class RequestManager {
                 getLastPageRead: patch.lastPageRead != null,
                 chapterIdsToDelete,
                 deleteChapters: !!chapterIdsToDelete.length,
+                mangaId: trackProgressMangaId,
+                trackProgress: trackProgressMangaId >= 0,
             },
             options,
         );

src/screens/settings/TrackingSettings.tsx

@@ -35,7 +35,7 @@ export const TrackingSettings = () => {
     }, [t]);
 
     const {
-        settings: { updateProgressAfterReading },
+        settings: { updateProgressAfterReading, updateProgressManualMarkRead },
     } = useMetadataServerSettings();
     const updateTrackingSettings = createUpdateMetadataServerSettings<keyof MetadataTrackingSettings>(() =>
         makeToast(t('global.error.label.failed_to_save_changes'), 'error'),
@@ -63,6 +63,17 @@ export const TrackingSettings = () => {
                         onChange={(e) => updateTrackingSettings('updateProgressAfterReading', e.target.checked)}
                     />
                 </ListItem>
+                <ListItem>
+                    <ListItemText
+                        primary={t('tracking.settings.label.update_progress_manual')}
+                        secondary={t('tracking.setting.label.update_progress_reading_description')}
+                    />
+                    <Switch
+                        edge="end"
+                        checked={updateProgressManualMarkRead}
+                        onChange={(e) => updateTrackingSettings('updateProgressManualMarkRead', e.target.checked)}
+                    />
+                </ListItem>
             </List>
             <List
                 subheader={

src/typings.ts

@@ -251,6 +251,7 @@ export type MetadataBrowseSettings = {
 
 export type MetadataTrackingSettings = {
     updateProgressAfterReading: boolean;
+    updateProgressManualMarkRead: boolean;
 };
 
 export type MetadataServerSettings = MetadataDownloadSettings &