Added two point alignment mods

slimcdk · web-flow · commit 3cb043480b11 · 2026-03-20T22:45:50.000-04:00
diff --git a/bazarr/api/subtitles/__init__.py b/bazarr/api/subtitles/__init__.py
@@ -2,9 +2,11 @@
 
 from .subtitles import api_ns_subtitles
 from .subtitles_info import api_ns_subtitles_info
+from .subtitles_contents import api_ns_subtitle_contents
 
 
 api_ns_list_subtitles = [
     api_ns_subtitles,
     api_ns_subtitles_info,
+    api_ns_subtitle_contents
 ]
diff --git a/bazarr/api/subtitles/subtitles_contents.py b/bazarr/api/subtitles/subtitles_contents.py
@@ -0,0 +1,82 @@
+# coding=utf-8
+import logging
+import srt
+
+from flask_restx import Resource, Namespace, reqparse, fields, marshal
+
+from ..utils import authenticate
+
+
+api_ns_subtitle_contents = Namespace('Subtitle Contents', description='Retrieve contents of subtitle file')
+
+
+@api_ns_subtitle_contents.route('subtitles/contents')
+class SubtitleNameContents(Resource):
+    get_request_parser = reqparse.RequestParser()
+    get_request_parser.add_argument('subtitlePath', type=str, required=True, help='Subtitle filepath')
+
+    time_modal = api_ns_subtitle_contents.model('time_modal', {
+        'hours': fields.Integer(),
+        'minutes': fields.Integer(),
+        'seconds': fields.Integer(),
+        'total_seconds': fields.Integer(),
+        'microseconds': fields.Integer(),
+    })
+
+    get_response_model = api_ns_subtitle_contents.model('SubtitlesContentsGetResponse', {
+        'index': fields.Integer(),
+        'content': fields.String(),
+        'proprietary': fields.String(),
+        'start': fields.Nested(time_modal),
+        'end': fields.Nested(time_modal),
+        # 'duration': fields.Nested(time_modal),
+    })
+
+    @authenticate
+    @api_ns_subtitle_contents.response(200, 'Success')
+    @api_ns_subtitle_contents.response(401, 'Not Authenticated')
+    @api_ns_subtitle_contents.doc(parser=get_request_parser)
+    def get(self):
+        """Retrieve subtitle file contents"""
+
+        args = self.get_request_parser.parse_args()
+        path = args.get('subtitlePath')
+
+        results = []
+
+        # Load the SRT content
+        with open(path, "r", encoding="utf-8") as f:
+            file_content = f.read()
+
+        # Map contents
+        for sub in srt.parse(file_content):
+
+            start_total_seconds = int(sub.start.total_seconds())
+            end_total_seconds = int(sub.end.total_seconds())
+            duration_timedelta = sub.end - sub.start
+
+            results.append(dict(
+                index=sub.index,
+                content=sub.content,
+                proprietary=sub.proprietary,
+                start=dict(
+                    hours = start_total_seconds // 3600,
+                    minutes = (start_total_seconds % 3600) // 60,
+                    seconds = start_total_seconds % 60,
+                    total_seconds=int(sub.start.total_seconds()),
+                    microseconds = sub.start.microseconds
+                ),
+                end=dict(
+                    hours = end_total_seconds // 3600,
+                    minutes = (end_total_seconds % 3600) // 60,
+                    seconds = end_total_seconds % 60,
+                    total_seconds=int(sub.end.total_seconds()),
+                    microseconds = sub.end.microseconds
+                ),
+                # duration=dict(
+                #     seconds=int(duration_timedelta.total_seconds()),
+                #     microseconds=duration_timedelta.microseconds
+                # ),
+            ))
+        
+        return marshal(results, self.get_response_model, envelope='data')
diff --git a/custom_libs/subzero/modification/__init__.py b/custom_libs/subzero/modification/__init__.py
@@ -2,5 +2,5 @@
 
 from __future__ import absolute_import
 from .registry import registry
-from .mods import hearing_impaired, ocr_fixes, fps, offset, common, color, emoji
+from .mods import hearing_impaired, ocr_fixes, fps, offset, common, color, emoji, two_point_fit
 from .main import SubtitleModifications, SubMod
diff --git a/custom_libs/subzero/modification/mods/two_point_fit.py b/custom_libs/subzero/modification/mods/two_point_fit.py
@@ -0,0 +1,29 @@
+# coding=utf-8
+
+from __future__ import absolute_import
+import logging
+
+from subzero.modification.mods import SubtitleModification
+from subzero.modification import registry
+
+logger = logging.getLogger(__name__)
+
+
+class TwoPointFit(SubtitleModification):
+    identifier = "two_point_fit"
+    description = "Use first and last sentences to linearly align timing of the subtitles"
+    exclusive = False
+    advanced = True
+    modifies_whole_file = True
+
+    def modify(self, content, debug=False, parent=None, **kwargs):
+
+        """
+        Place first sentence at 00:00:00 and scale until duration matches, then offset back
+        """
+
+        parent.f.shift(h=-int(kwargs.get("rh", 0)), m=-int(kwargs.get("rm", 0)), s=-int(kwargs.get("rs", 0)), ms=-int(kwargs.get("rms", 0)))
+        parent.f.transform_framerate(float(kwargs.get("from")), float(kwargs.get("to")))
+        parent.f.shift(h=int(kwargs.get("oh", 0)), m=int(kwargs.get("om", 0)), s=int(kwargs.get("os", 0)), ms=int(kwargs.get("oms", 0)))
+
+registry.register(TwoPointFit)
diff --git a/frontend/src/apis/hooks/subtitles.ts b/frontend/src/apis/hooks/subtitles.ts
@@ -146,6 +146,14 @@ export function useSubtitleInfos(names: string[]) {
   });
 }
 
+export function useSubtitleContents(subtitlePath: string) {
+  return useQuery({
+    queryKey: [QueryKeys.Subtitles, subtitlePath],
+    queryFn: () => api.subtitles.contents(subtitlePath),
+    staleTime: Infinity,
+  });
+}
+
 export function useRefTracksByEpisodeId(
   subtitlesPath: string,
   sonarrEpisodeId: number,
diff --git a/frontend/src/apis/raw/subtitles.ts b/frontend/src/apis/raw/subtitles.ts
@@ -37,6 +37,16 @@ class SubtitlesApi extends BaseApi {
   async modify(action: string, form: FormType.ModifySubtitle) {
     await this.patch("", form, { action });
   }
+
+  async contents(subtitlePath: string) {
+    const response = await this.get<DataWrapper<SubtitleContents.Line[]>>(
+      "/contents",
+      {
+        subtitlePath,
+      },
+    );
+    return response.data;
+  }
 }
 
 const subtitlesApi = new SubtitlesApi();
diff --git a/frontend/src/components/SubtitleToolsMenu.tsx b/frontend/src/components/SubtitleToolsMenu.tsx
@@ -1,6 +1,7 @@
 import { FunctionComponent, ReactElement, useCallback, useMemo } from "react";
 import { Divider, List, Menu, MenuProps, ScrollArea } from "@mantine/core";
 import {
+  faAlignJustify,
   faClock,
   faCode,
   faDeaf,
@@ -27,6 +28,7 @@ import { useModals } from "@/modules/modals";
 import { ModalComponent } from "@/modules/modals/WithModal";
 import { task } from "@/modules/task";
 import { SyncSubtitleModal } from "./forms/SyncSubtitleForm";
+import { TwoPointFitModal } from "./forms/TwoPointFit";
 
 export interface ToolOptions {
   key: string;
@@ -99,6 +101,12 @@ export function useTools() {
         name: "Adjust Times...",
         modal: TimeOffsetModal,
       },
+      {
+        key: "two_point_fit",
+        icon: faAlignJustify,
+        name: "Two-Point Fit...",
+        modal: TwoPointFitModal,
+      },
       {
         key: "translation",
         icon: faLanguage,
diff --git a/frontend/src/components/forms/TwoPointFit.tsx b/frontend/src/components/forms/TwoPointFit.tsx
diff --git a/frontend/src/types/api.d.ts b/frontend/src/types/api.d.ts
diff --git a/libs/pysubs2/ssafile.py b/libs/pysubs2/ssafile.py

Original file line number	Diff line number	Diff line change
`@@ -2,9 +2,11 @@`
`2`	`2`
`3`	`3`	`from .subtitles import api_ns_subtitles`
`4`	`4`	`from .subtitles_info import api_ns_subtitles_info`
	`5`	`+from .subtitles_contents import api_ns_subtitle_contents`
`5`	`6`
`6`	`7`
`7`	`8`	`api_ns_list_subtitles = [`
`8`	`9`	`api_ns_subtitles,`
`9`	`10`	`api_ns_subtitles_info,`
	`11`	`+ api_ns_subtitle_contents`
`10`	`12`	`]`