Merge pull request mipops#883 from ElderOrb/mipops#876

support output filename patterns in gui mipops#876
MediaArea · Jul 15, 2024 · d5aac4e · d5aac4e
2 parents 55e7852 + e6f4607
commit d5aac4e
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 4 deletions.
diff --git a/Source/GUI/dvrescue/dvrescue/SegmentDataView.qml b/Source/GUI/dvrescue/dvrescue/SegmentDataView.qml
@@ -353,5 +353,10 @@ Rectangle {
             display: "Video/Audio";
             property int minWidth: 200 + columnSpacing + timecodeMetrics.height * 2
         }
+
+        TableModelColumn {
+            display: "Filename Pattern"
+            property int minWidth: 300
+        }
     }
 }
diff --git a/Source/GUI/dvrescue/dvrescue/SegmentDataViewWithToolbar.qml b/Source/GUI/dvrescue/dvrescue/SegmentDataViewWithToolbar.qml
@@ -32,6 +32,7 @@ ColumnLayout {
     property string reportPath
     property string videoPath
     property string outputPath
+    property string pattern: patterns.currentText
 
     spacing: 0
 
@@ -102,6 +103,21 @@ ColumnLayout {
                 }
             }
 
+            ComboBoxEx {
+                id: patterns
+                sizeToContents: true
+                Layout.minimumWidth: modelWidth + 2*leftPadding + 2*rightPadding
+                model: [
+                    "%FILENAME%_part%PARTNO%",
+                    "%FILENAME%_%RECDATE%_%RECTIME%",
+                    "%FILENAME%_%PARTNO%_%TC%",
+                    "%FILENAME%_%RECDATE%-%RECTIME%_%TC%"
+                ]
+                onCurrentIndexChanged: {
+                    segmentationOptionsLayout.needsApply = true
+                }
+            }
+
             Button {
                 text: "Reset"
                 onClicked: {
@@ -173,7 +189,8 @@ ColumnLayout {
                 'Recording Time' : '',
                 'Recording Time: Jump/Repeat' : Qt.point(0, 0),
                 'Recording Marks' : Qt.point(0, 0),
-                'Video/Audio' : ''
+                'Video/Audio' : '',
+                'Filename Pattern' : ''
             }
 
             segmentDataView.model.appendRow(e);
@@ -250,7 +267,7 @@ ColumnLayout {
         }
 
         function populateSegmentData(reportPath, videoPath, outputPath, extraOpts) {
-            console.debug('populateSegmentData: reportPath = ', reportPath, 'outputPath = ', outputPath)
+            console.debug('populateSegmentData: reportPath = ', reportPath, 'videoPath = ', videoPath, 'outputPath = ', outputPath)
 
             segmentDataView.model.clear();
 
@@ -259,7 +276,7 @@ ColumnLayout {
                 videoPath = "/cygdrive/" + videoPath.replace(":", "");
             }
 
-            var extraParams = ['-v', '-X', packagerCtl.effectiveXmlStarletCmd]
+            var extraParams = ['-v', '-X', packagerCtl.effectiveXmlStarletCmd, '-O', pattern]
             var opts = [];
             if(recordingStartMarkers.checked)
                 opts.push('-s')
@@ -325,7 +342,8 @@ ColumnLayout {
                                                                                       'Recording Time: Jump/Repeat' : Qt.point(entry.recTimeJump, 0),
                                                                                       'Recording Marks' : Qt.point(entry.recStart, 0),
                                                                                       'Video/Audio' : videoAudio.join(' '),
-                                                                                      'FileName' : entry.segmentFileName ? entry.segmentFileName : i
+                                                                                      'FileName' : entry.segmentFileName ? entry.segmentFileName : i,
+                                                                                      'Filename Pattern' : entry.segmentFileName ? entry.segmentFileName : i
                                                                                   }
 
                                                                                   if(Qt.platform.os === "windows") {
@@ -334,6 +352,7 @@ ColumnLayout {
                                                                                       if(splittedWinPath.length !== 0) {
                                                                                         splittedWinPath[0] = splittedWinPath[0] + ':'
                                                                                         e.FileName = splittedWinPath.join('\\')
+                                                                                        e['Filename Pattern'] = e.FileName
                                                                                       }
                                                                                   }