feat: Add remaining CCExtractor CLI options to GUI

cfsmp3 · claude · cfsmp3 · commit 47f05162f0a3 · 2025-12-21T20:57:32.000+01:00
Add support for the following CLI options: Medium priority: - --hcc: Hybrid closed captions (HardSubX) - --psm: Tesseract page segmentation mode (14 modes) - --ttxtforcelatin: Force Latin charset for Teletext - --font/--italics: SPUPNG font paths - --forceflush: Flush file buffer on write Low priority: - --screenfuls: Stop after N screenfuls - --unixts: Unix timestamp reference - --ucla: UCLA transcript format - --no-spupngocr: Disable SPUPNG OCR - -L/--list-tracks: List all tracks - --output-field: Select caption field (1/2/both) - --cc2: Process channel 2 - --tverbose: Teletext verbose mode - --customtxt: Custom transcript format 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
diff --git a/lib/bloc/process_bloc/process_bloc.dart b/lib/bloc/process_bloc/process_bloc.dart
@@ -62,8 +62,7 @@ class ProcessBloc extends Bloc<ProcessEvent, ProcessState> {
     _extractor
         .extractFile(
       file,
-      listenProgress: (progress) =>
-          add(ProcessFileExtractorProgress(progress)),
+      listenProgress: (progress) => add(ProcessFileExtractorProgress(progress)),
       listenOutput: (line) => add(ProcessFileExtractorOutput(line)),
       listenVideoDetails: (videoDetails) =>
           add(ProcessFileVideoDetails(videoDetails)),
@@ -86,8 +85,7 @@ class ProcessBloc extends Bloc<ProcessEvent, ProcessState> {
       location: location,
       tcpdesc: tcpdesc,
       tcppasswrd: tcppassword,
-      listenProgress: (progress) =>
-          add(ProcessFileExtractorProgress(progress)),
+      listenProgress: (progress) => add(ProcessFileExtractorProgress(progress)),
       listenOutput: (line) => add(ProcessFileExtractorOutput(line)),
       listenVideoDetails: (videoDetails) =>
           add(ProcessFileVideoDetails(videoDetails)),
@@ -105,8 +103,7 @@ class ProcessBloc extends Bloc<ProcessEvent, ProcessState> {
     _extractor
         .extractFilesInSplitMode(
       state.orignalList,
-      listenProgress: (progress) =>
-          add(ProcessFileExtractorProgress(progress)),
+      listenProgress: (progress) => add(ProcessFileExtractorProgress(progress)),
       listenOutput: (line) => add(ProcessFileExtractorOutput(line)),
       listenVideoDetails: (videoDetails) =>
           add(ProcessFileVideoDetails(videoDetails)),
diff --git a/lib/bloc/updater_bloc/updater_bloc.dart b/lib/bloc/updater_bloc/updater_bloc.dart
@@ -25,8 +25,7 @@ class UpdaterBloc extends Bloc<UpdaterEvent, UpdaterState> {
     http.Response response = await http.get(url);
     var data = jsonDecode(response.body);
     for (var i = 0; i < data.length; i++) {
-      if (event.currentVersion ==
-          data[i]['tag_name'].toString().substring(1)) {
+      if (event.currentVersion == data[i]['tag_name'].toString().substring(1)) {
         currentVersionIndex = i;
       }
     }
diff --git a/lib/models/settings_model.dart b/lib/models/settings_model.dart
@@ -122,6 +122,27 @@ class SettingsModel {
   String confThresh;
   String whiteThresh;
   bool splitMode;
+  bool hcc;
+  String psm;
+
+  // SPUPNG font options
+  String spupngFont;
+  String spupngItalicsFont;
+
+  // Buffering
+  bool forceflush;
+
+  // Additional options
+  String screenfuls;
+  String unixts;
+  bool ucla;
+  bool nospupngocr;
+  bool listTracks;
+  String outputField;
+  bool cc2;
+  bool tverbose;
+  String customtxt;
+  bool ttxtforcelatin;
   SettingsModel({
     this.out = 'auto/default',
     this.inp = 'auto/default',
@@ -219,6 +240,21 @@ class SettingsModel {
     this.confThresh = '',
     this.whiteThresh = '',
     this.splitMode = false,
+    this.hcc = false,
+    this.psm = 'auto/default',
+    this.spupngFont = '',
+    this.spupngItalicsFont = '',
+    this.forceflush = false,
+    this.screenfuls = '',
+    this.unixts = '',
+    this.ucla = false,
+    this.nospupngocr = false,
+    this.listTracks = false,
+    this.outputField = 'auto/default',
+    this.cc2 = false,
+    this.tverbose = false,
+    this.customtxt = '',
+    this.ttxtforcelatin = false,
   });
 
   static Map<String, String> get paramsLookUpMap {
@@ -317,6 +353,21 @@ class SettingsModel {
       'confThresh': '--conf-thresh',
       'whiteThresh': '--whiteness-thresh',
       'splitMode': '', // splitMode is not a ccx setting
+      'hcc': '--hcc',
+      'psm': '--psm',
+      'spupngFont': '--font',
+      'spupngItalicsFont': '--italics',
+      'forceflush': '--forceflush',
+      'screenfuls': '--screenfuls',
+      'unixts': '--unixts',
+      'ucla': '--ucla',
+      'nospupngocr': '--no-spupngocr',
+      'listTracks': '-L',
+      'outputField': '--output-field',
+      'cc2': '--cc2',
+      'tverbose': '--tverbose',
+      'customtxt': '--customtxt',
+      'ttxtforcelatin': '--ttxtforcelatin',
     };
   }
 
@@ -443,6 +494,21 @@ class SettingsModel {
     String? confThresh,
     String? whiteThresh,
     bool? splitMode,
+    bool? hcc,
+    String? psm,
+    String? spupngFont,
+    String? spupngItalicsFont,
+    bool? forceflush,
+    String? screenfuls,
+    String? unixts,
+    bool? ucla,
+    bool? nospupngocr,
+    bool? listTracks,
+    String? outputField,
+    bool? cc2,
+    bool? tverbose,
+    String? customtxt,
+    bool? ttxtforcelatin,
   }) {
     return SettingsModel(
       out: out ?? this.out,
@@ -544,6 +610,21 @@ class SettingsModel {
       confThresh: confThresh ?? this.confThresh,
       whiteThresh: whiteThresh ?? this.whiteThresh,
       splitMode: splitMode ?? this.splitMode,
+      hcc: hcc ?? this.hcc,
+      psm: psm ?? this.psm,
+      spupngFont: spupngFont ?? this.spupngFont,
+      spupngItalicsFont: spupngItalicsFont ?? this.spupngItalicsFont,
+      forceflush: forceflush ?? this.forceflush,
+      screenfuls: screenfuls ?? this.screenfuls,
+      unixts: unixts ?? this.unixts,
+      ucla: ucla ?? this.ucla,
+      nospupngocr: nospupngocr ?? this.nospupngocr,
+      listTracks: listTracks ?? this.listTracks,
+      outputField: outputField ?? this.outputField,
+      cc2: cc2 ?? this.cc2,
+      tverbose: tverbose ?? this.tverbose,
+      customtxt: customtxt ?? this.customtxt,
+      ttxtforcelatin: ttxtforcelatin ?? this.ttxtforcelatin,
     );
   }
 
@@ -645,6 +726,21 @@ class SettingsModel {
       'confThresh': confThresh,
       'whiteThresh': whiteThresh,
       'splitMode': splitMode,
+      'hcc': hcc,
+      'psm': psm,
+      'spupngFont': spupngFont,
+      'spupngItalicsFont': spupngItalicsFont,
+      'forceflush': forceflush,
+      'screenfuls': screenfuls,
+      'unixts': unixts,
+      'ucla': ucla,
+      'nospupngocr': nospupngocr,
+      'listTracks': listTracks,
+      'outputField': outputField,
+      'cc2': cc2,
+      'tverbose': tverbose,
+      'customtxt': customtxt,
+      'ttxtforcelatin': ttxtforcelatin,
     };
   }
 
@@ -746,12 +842,27 @@ class SettingsModel {
       confThresh: map['confThresh'],
       whiteThresh: map['whiteThresh'],
       splitMode: map['splitMode'],
+      hcc: map['hcc'] ?? false,
+      psm: map['psm'] ?? 'auto/default',
+      spupngFont: map['spupngFont'] ?? '',
+      spupngItalicsFont: map['spupngItalicsFont'] ?? '',
+      forceflush: map['forceflush'] ?? false,
+      screenfuls: map['screenfuls'] ?? '',
+      unixts: map['unixts'] ?? '',
+      ucla: map['ucla'] ?? false,
+      nospupngocr: map['nospupngocr'] ?? false,
+      listTracks: map['listTracks'] ?? false,
+      outputField: map['outputField'] ?? 'auto/default',
+      cc2: map['cc2'] ?? false,
+      tverbose: map['tverbose'] ?? false,
+      customtxt: map['customtxt'] ?? '',
+      ttxtforcelatin: map['ttxtforcelatin'] ?? false,
     );
   }
 
   @override
   String toString() {
-    return 'SettingsModel(out: $out, inp: $inp, outputfilename: $outputfilename, fixptsjumps: $fixptsjumps, append: $append, service: $service, outInterval: $outInterval, segmentonkeyonly: $segmentonkeyonly, goptime: $goptime, nogoptime: $nogoptime, fixpadding: $fixpadding, freqEs15: $freqEs15, stream: $stream, videoedited: $videoedited, usepicorder: $usepicorder, myth: $myth, nomyth: $nomyth, wtvconvertfix: $wtvconvertfix, wtvmpeg2: $wtvmpeg2, program_number: $program_number, autoprogram: $autoprogram, multiprogram: $multiprogram, streamtype: $streamtype, hauppauge: $hauppauge, mp4vidtrack: $mp4vidtrack, noautotimeref: $noautotimeref, noscte20: $noscte20, webvttcss: $webvttcss, analyzevideo: $analyzevideo, timestampMap: $timestampMap, nolevdist: $nolevdist, minlevdist: $minlevdist, maxlevdist: $maxlevdist, chapters: $chapters, bom: $bom, nobom: $nobom, encoder: $encoder, nofontcolor: $nofontcolor, nohtmlescape: $nohtmlescape, notypesetting: $notypesetting, trim: $trim, defaultcolor: $defaultcolor, sentencecap: $sentencecap, capFile: $capFile, kf: $kf, profanityFile: $profanityFile, splitbysentence: $splitbysentence, datets: $datets, sects: $sects, latrusmap: $latrusmap, xds: $xds, lf: $lf, df: $df, autodash: $autodash, xmltv: $xmltv, xmltvliveinterval: $xmltvliveinterval, xmltvoutputinterval: $xmltvoutputinterval, xmltvonlycurrent: $xmltvonlycurrent, sem: $sem, dvblang: $dvblang, mkvlang: $mkvlang, ocrlang: $ocrlang, quant: $quant, oem: $oem, bufferinput: $bufferinput, nobufferinput: $nobufferinput, buffersize: $buffersize, koc: $koc, dru: $dru, norollup: $norollup, rollUp: $rollUp, delay: $delay, startat: $startat, endat: $endat, codec: $codec, nocodec: $nocodec, startcreditstext: $startcreditstext, startcreditsnotbefore: $startcreditsnotbefore, startcreditsnotafter: $startcreditsnotafter, startcreditsforatleast: $startcreditsforatleast, startcreditsforatmost: $startcreditsforatmost, endcreditstext: $endcreditstext, endcreditsforatleast: $endcreditsforatleast, endcreditsforatmost: $endcreditsforatmost, tpage: $tpage, teletext: $teletext, noteletext: $noteletext, hardsubx: $hardsubx, tickertext: $tickertext, ocrMode: $ocrMode, subcolor: $subcolor, minSubDuration: $minSubDuration, detectItalics: $detectItalics, confThresh: $confThresh, whiteThresh: $whiteThresh, splitMode: $splitMode)';
+    return 'SettingsModel(out: $out, inp: $inp, outputfilename: $outputfilename, fixptsjumps: $fixptsjumps, append: $append, service: $service, outInterval: $outInterval, segmentonkeyonly: $segmentonkeyonly, goptime: $goptime, nogoptime: $nogoptime, fixpadding: $fixpadding, freqEs15: $freqEs15, stream: $stream, videoedited: $videoedited, usepicorder: $usepicorder, myth: $myth, nomyth: $nomyth, wtvconvertfix: $wtvconvertfix, wtvmpeg2: $wtvmpeg2, program_number: $program_number, autoprogram: $autoprogram, multiprogram: $multiprogram, streamtype: $streamtype, hauppauge: $hauppauge, mp4vidtrack: $mp4vidtrack, noautotimeref: $noautotimeref, noscte20: $noscte20, webvttcss: $webvttcss, analyzevideo: $analyzevideo, timestampMap: $timestampMap, nolevdist: $nolevdist, minlevdist: $minlevdist, maxlevdist: $maxlevdist, chapters: $chapters, bom: $bom, nobom: $nobom, encoder: $encoder, nofontcolor: $nofontcolor, nohtmlescape: $nohtmlescape, notypesetting: $notypesetting, trim: $trim, defaultcolor: $defaultcolor, sentencecap: $sentencecap, capFile: $capFile, kf: $kf, profanityFile: $profanityFile, splitbysentence: $splitbysentence, datets: $datets, sects: $sects, latrusmap: $latrusmap, xds: $xds, lf: $lf, df: $df, autodash: $autodash, xmltv: $xmltv, xmltvliveinterval: $xmltvliveinterval, xmltvoutputinterval: $xmltvoutputinterval, xmltvonlycurrent: $xmltvonlycurrent, sem: $sem, dvblang: $dvblang, mkvlang: $mkvlang, ocrlang: $ocrlang, quant: $quant, oem: $oem, bufferinput: $bufferinput, nobufferinput: $nobufferinput, buffersize: $buffersize, koc: $koc, dru: $dru, norollup: $norollup, rollUp: $rollUp, delay: $delay, startat: $startat, endat: $endat, codec: $codec, nocodec: $nocodec, startcreditstext: $startcreditstext, startcreditsnotbefore: $startcreditsnotbefore, startcreditsnotafter: $startcreditsnotafter, startcreditsforatleast: $startcreditsforatleast, startcreditsforatmost: $startcreditsforatmost, endcreditstext: $endcreditstext, endcreditsforatleast: $endcreditsforatleast, endcreditsforatmost: $endcreditsforatmost, tpage: $tpage, teletext: $teletext, noteletext: $noteletext, hardsubx: $hardsubx, tickertext: $tickertext, ocrMode: $ocrMode, subcolor: $subcolor, minSubDuration: $minSubDuration, detectItalics: $detectItalics, confThresh: $confThresh, whiteThresh: $whiteThresh, splitMode: $splitMode, hcc: $hcc, psm: $psm, spupngFont: $spupngFont, spupngItalicsFont: $spupngItalicsFont, forceflush: $forceflush, screenfuls: $screenfuls, unixts: $unixts, ucla: $ucla, nospupngocr: $nospupngocr, listTracks: $listTracks, outputField: $outputField, cc2: $cc2, tverbose: $tverbose, customtxt: $customtxt, ttxtforcelatin: $ttxtforcelatin)';
   }
 
   @override
@@ -854,7 +965,22 @@ class SettingsModel {
         other.detectItalics == detectItalics &&
         other.confThresh == confThresh &&
         other.whiteThresh == whiteThresh &&
-        other.splitMode == splitMode;
+        other.splitMode == splitMode &&
+        other.hcc == hcc &&
+        other.psm == psm &&
+        other.spupngFont == spupngFont &&
+        other.spupngItalicsFont == spupngItalicsFont &&
+        other.forceflush == forceflush &&
+        other.screenfuls == screenfuls &&
+        other.unixts == unixts &&
+        other.ucla == ucla &&
+        other.nospupngocr == nospupngocr &&
+        other.listTracks == listTracks &&
+        other.outputField == outputField &&
+        other.cc2 == cc2 &&
+        other.tverbose == tverbose &&
+        other.customtxt == customtxt &&
+        other.ttxtforcelatin == ttxtforcelatin;
   }
 
   @override
@@ -954,6 +1080,21 @@ class SettingsModel {
         detectItalics.hashCode ^
         confThresh.hashCode ^
         whiteThresh.hashCode ^
-        splitMode.hashCode;
+        splitMode.hashCode ^
+        hcc.hashCode ^
+        psm.hashCode ^
+        spupngFont.hashCode ^
+        spupngItalicsFont.hashCode ^
+        forceflush.hashCode ^
+        screenfuls.hashCode ^
+        unixts.hashCode ^
+        ucla.hashCode ^
+        nospupngocr.hashCode ^
+        listTracks.hashCode ^
+        outputField.hashCode ^
+        cc2.hashCode ^
+        tverbose.hashCode ^
+        customtxt.hashCode ^
+        ttxtforcelatin.hashCode;
   }
 }
diff --git a/lib/screens/settings/hardsubx_settings.dart b/lib/screens/settings/hardsubx_settings.dart
@@ -89,6 +89,21 @@ class HardSubxSettingsScreen extends StatelessWidget {
                           );
                     },
                   ),
+                  CustomSwitchListTile(
+                    title: 'HCC (Hybrid Closed Captions)',
+                    subtitle:
+                        'Use when file has both closed captions and burned-in subtitles',
+                    value: state.settingsModel.hcc,
+                    onTap: (value) {
+                      context.read<SettingsBloc>().add(
+                            SettingsUpdatedEvent(
+                              state.settingsModel.copyWith(
+                                hcc: value,
+                              ),
+                            ),
+                          );
+                    },
+                  ),
                   CustomDropDown(
                     title: 'OCR mode',
                     subtitle:
@@ -228,6 +243,22 @@ class HardSubxSettingsScreen extends StatelessWidget {
                           );
                     },
                   ),
+                  CustomDropDown(
+                    title: 'PSM (Page Segmentation Mode)',
+                    subtitle:
+                        'Select the page segmentation mode for Tesseract.',
+                    value: state.settingsModel.psm,
+                    items: dropdownListMap['psm']!.keys.toList(),
+                    onChanged: (String newValue) {
+                      context.read<SettingsBloc>().add(
+                            SettingsUpdatedEvent(
+                              state.settingsModel.copyWith(
+                                psm: newValue,
+                              ),
+                            ),
+                          );
+                    },
+                  ),
                   CustomTextField(
                     title: 'DVB lang',
                     subtitle:
diff --git a/lib/screens/settings/input_settings.dart b/lib/screens/settings/input_settings.dart
@@ -378,6 +378,35 @@ class InputSettingsScreen extends StatelessWidget {
                               );
                     },
                   ),
+                  CustomSwitchListTile(
+                    title: 'Force Latin charset',
+                    subtitle:
+                        'Force Latin G0 charset for Teletext, ignoring any Cyrillic designation in the stream.',
+                    value: state.settingsModel.ttxtforcelatin,
+                    onTap: (value) {
+                      context.read<SettingsBloc>().add(
+                            SettingsUpdatedEvent(
+                              state.settingsModel.copyWith(
+                                ttxtforcelatin: value,
+                              ),
+                            ),
+                          );
+                    },
+                  ),
+                  CustomSwitchListTile(
+                    title: 'Teletext verbose',
+                    subtitle: 'Enable teletext verbose mode for debugging.',
+                    value: state.settingsModel.tverbose,
+                    onTap: (value) {
+                      context.read<SettingsBloc>().add(
+                            SettingsUpdatedEvent(
+                              state.settingsModel.copyWith(
+                                tverbose: value,
+                              ),
+                            ),
+                          );
+                    },
+                  ),
                 ],
               ),
             ),
diff --git a/lib/screens/settings/output_settings.dart b/lib/screens/settings/output_settings.dart
diff --git a/lib/utils/constants.dart b/lib/utils/constants.dart

Original file line number	Diff line number	Diff line change
`@@ -25,8 +25,7 @@ class UpdaterBloc extends Bloc<UpdaterEvent, UpdaterState> {`
`25`	`25`	`http.Response response = await http.get(url);`
`26`	`26`	`var data = jsonDecode(response.body);`
`27`	`27`	`for (var i = 0; i < data.length; i++) {`
`28`		`- if (event.currentVersion ==`
`29`		`- data[i]['tag_name'].toString().substring(1)) {`
	`28`	`+ if (event.currentVersion == data[i]['tag_name'].toString().substring(1)) {`
`30`	`29`	`currentVersionIndex = i;`
`31`	`30`	`}`
`32`	`31`	`}`