OSDN Git Service

WinGui:
[handbrake-jp/handbrake-jp-git.git] / win / C# / Functions / QueryGenerator.cs
index 7491036..03fa22c 100644 (file)
@@ -17,17 +17,17 @@ namespace Handbrake.Functions
         /// <summary>\r
         /// Generates a full CLI query for either encoding or previe encoeds if duration and preview are defined.\r
         /// </summary>\r
-        /// <param name="mainWindow"></param>\r
-        /// <param name="duration"></param>\r
-        /// <param name="preview"></param>\r
-        /// <returns></returns>\r
-        public string GenerateCLIQuery(frmMain mainWindow, int duration, string preview)\r
+        /// <param name="mainWindow">The Main Window</param>\r
+        /// <param name="mode">What Mode. (Point to Point Encoding)  Chapters, Seconds, Frames OR Preview Encode</param>\r
+        /// <param name="duration">time in seconds for preview mode</param>\r
+        /// <param name="preview"> --start-at-preview (int) </param>\r
+        /// <returns>CLI Query </returns>\r
+        public static string GenerateCLIQuery(frmMain mainWindow, int mode, int duration, string preview)\r
         {\r
             string query = "";\r
-\r
-            if (!string.IsNullOrEmpty(mainWindow.sourcePath))\r
-                if (mainWindow.sourcePath.Trim() != "Select \"Source\" to continue")\r
-                    query = " -i " + '"' + mainWindow.sourcePath + '"';\r
+            \r
+            if (!string.IsNullOrEmpty(mainWindow.sourcePath) && mainWindow.sourcePath.Trim() != "Select \"Source\" to continue")\r
+                query = " -i " + '"' + mainWindow.sourcePath + '"';\r
 \r
             if (mainWindow.drp_dvdtitle.Text != "")\r
             {\r
@@ -35,31 +35,46 @@ namespace Handbrake.Functions
                 query += " -t " + titleInfo[0];\r
             }\r
 \r
-            if (!Properties.Settings.Default.noDvdNav)\r
-                if (mainWindow.drop_angle.Items.Count != 0)\r
-                    query += " --angle " + mainWindow.drop_angle.SelectedItem;\r
+            if (!Properties.Settings.Default.noDvdNav && mainWindow.drop_angle.Items.Count != 0)\r
+                query += " --angle " + mainWindow.drop_angle.SelectedItem;\r
 \r
-\r
-            if (duration != 0 && preview != null) // Preivew Query\r
+            // Decide what part of the video we want to encode.\r
+            switch (mode)\r
             {\r
-                query += " --start-at-preview " + preview;\r
-                query += " --stop-at duration:" + duration + " ";\r
+                case 0: // Chapters\r
+                    if (mainWindow.drop_chapterFinish.Text == mainWindow.drop_chapterStart.Text && mainWindow.drop_chapterStart.Text != "")\r
+                        query += string.Format(" -c {0}", mainWindow.drop_chapterStart.Text);\r
+                    else if (mainWindow.drop_chapterStart.Text != "" && mainWindow.drop_chapterFinish.Text != "")\r
+                        query += string.Format(" -c {0}-{1}", mainWindow.drop_chapterStart.Text, mainWindow.drop_chapterFinish.Text);\r
+                    break;\r
+                case 1: // Seconds\r
+                    int start, end;\r
+                    int.TryParse(mainWindow.drop_chapterStart.Text, out start);\r
+                    int.TryParse(mainWindow.drop_chapterFinish.Text, out end);\r
+                    int calculatedDuration = end - start;\r
 \r
-                if (mainWindow.text_destination.Text != "")\r
-                    query += " -o " + '"' + mainWindow.text_destination.Text.Replace(".m", "_sample.m") + '"';\r
-            }\r
-            else // Non Preview Query\r
-            {\r
-                if (mainWindow.drop_chapterFinish.Text == mainWindow.drop_chapterStart.Text && mainWindow.drop_chapterStart.Text != "")\r
-                    query += " -c " + mainWindow.drop_chapterStart.Text;\r
-                else if (mainWindow.drop_chapterStart.Text == "Auto" && mainWindow.drop_chapterFinish.Text != "Auto")\r
-                    query += " -c " + "0-" + mainWindow.drop_chapterFinish.Text;\r
-                else if (mainWindow.drop_chapterStart.Text != "Auto" && mainWindow.drop_chapterFinish.Text != "Auto" && mainWindow.drop_chapterStart.Text != "")\r
-                    query += " -c " + mainWindow.drop_chapterStart.Text + "-" + mainWindow.drop_chapterFinish.Text;\r
-\r
-                if (mainWindow.text_destination.Text != "")\r
-                    query += " -o " + '"' + mainWindow.text_destination.Text + '"';\r
+                    query += string.Format(" --start-at duration:{0} --stop-at duration:{1}", mainWindow.drop_chapterStart.Text, calculatedDuration);\r
+                    break;\r
+                case 2: // Frames\r
+                    int.TryParse(mainWindow.drop_chapterStart.Text, out start);\r
+                    int.TryParse(mainWindow.drop_chapterFinish.Text, out end);\r
+                    calculatedDuration = end - start;\r
+\r
+                    query += string.Format(" --start-at frame:{0} --stop-at frame:{1}", mainWindow.drop_chapterStart.Text, calculatedDuration);\r
+                    break;\r
+                case 3: // Preview\r
+                    query += " --previews " + Properties.Settings.Default.previewScanCount + " ";\r
+                    query += " --start-at-preview " + preview;\r
+                    query += " --stop-at duration:" + duration + " ";\r
+\r
+                    if (mainWindow.text_destination.Text != "")\r
+                        query += string.Format(" -o \"{0}\" ", mainWindow.text_destination.Text.Replace(".m", "_sample.m"));\r
+                    break;\r
+                default:\r
+                    break;\r
             }\r
+            if (mode != 3)\r
+                query += string.Format(" -o \"{0}\" ", mainWindow.text_destination.Text);\r
 \r
             query += GenerateTabbedComponentsQuery(mainWindow);\r
 \r
@@ -167,7 +182,7 @@ namespace Handbrake.Functions
             #endregion\r
 \r
             #region Filters\r
-            query += mainWindow.Filters.getCLIQuery;\r
+            query += mainWindow.Filters.GetCLIQuery;\r
             #endregion\r
 \r
             #region Video Settings Tab\r
@@ -257,15 +272,15 @@ namespace Handbrake.Functions
 \r
                 // Audio Codec (-E)\r
                 if (row.SubItems[2].Text != String.Empty)\r
-                    codecs.Add(getAudioEncoder(row.SubItems[2].Text));\r
+                    codecs.Add(GetAudioEncoder(row.SubItems[2].Text));\r
 \r
                 // Audio Mixdown (-6)\r
                 if (row.SubItems[3].Text != String.Empty)\r
-                    mixdowns.Add(getMixDown(row.SubItems[3].Text));\r
+                    mixdowns.Add(GetMixDown(row.SubItems[3].Text));\r
 \r
                 // Sample Rate (-R)\r
                 if (row.SubItems[4].Text != String.Empty)\r
-                    samplerates.Add(row.SubItems[4].Text.Replace("Auto", "Auto"));\r
+                    samplerates.Add(row.SubItems[4].Text);\r
 \r
                 // Audio Bitrate (-B)\r
                 if (row.SubItems[5].Text != String.Empty)\r
@@ -369,14 +384,14 @@ namespace Handbrake.Functions
             #region Subtitles Tab\r
             if (mainWindow.Subtitles.lv_subList.Items.Count != 0) // If we have subtitle tracks\r
             {\r
-                IDictionary<string, string> langMap = Main.mapLanguages();\r
+                IDictionary<string, string> langMap = Main.MapLanguages();\r
 \r
                 // BitMap and CC's\r
                 string subtitleTracks = String.Empty;\r
                 string subtitleForced = String.Empty;\r
                 string subtitleBurn = String.Empty;\r
                 string subtitleDefault = String.Empty;\r
\r
+\r
                 // SRT\r
                 string srtFile = String.Empty;\r
                 string srtCodeset = String.Empty;\r
@@ -428,7 +443,7 @@ namespace Handbrake.Functions
                         trackID = tempSub[0];\r
 \r
                         if (item.Forced == "Yes")\r
-                            itemToAdd = trackID;\r
+                            itemToAdd = "scan";\r
 \r
                         if (itemToAdd != "")\r
                             subtitleForced += subtitleForced == "" ? itemToAdd : "," + itemToAdd;\r
@@ -498,7 +513,7 @@ namespace Handbrake.Functions
                                       ? Path.Combine(Path.GetTempPath(), dest_name + "-" + source_title + "-chapters.csv")\r
                                       : Path.Combine(Path.GetTempPath(), dest_name + "-chapters.csv");\r
 \r
-                    if (chapterCSVSave(mainWindow, path) == false)\r
+                    if (ChapterCSVSave(mainWindow, path) == false)\r
                         query += " -m ";\r
                     else\r
                         query += " --markers=" + "\"" + path + "\"";\r
@@ -527,7 +542,12 @@ namespace Handbrake.Functions
             return query;\r
         }\r
 \r
-        private static string getMixDown(string selectedAudio)\r
+        /// <summary>\r
+        /// Return the CLI Mixdown name\r
+        /// </summary>\r
+        /// <param name="selectedAudio">GUI mixdown name</param>\r
+        /// <returns>CLI mixdown name</returns>\r
+        private static string GetMixDown(string selectedAudio)\r
         {\r
             switch (selectedAudio)\r
             {\r
@@ -547,7 +567,13 @@ namespace Handbrake.Functions
                     return "auto";\r
             }\r
         }\r
-        private static string getAudioEncoder(string selectedEncoder)\r
+\r
+        /// <summary>\r
+        /// Get the CLI Audio Encoder name\r
+        /// </summary>\r
+        /// <param name="selectedEncoder">string The GUI Encode name</param>\r
+        /// <returns>string CLI encoder name</returns>\r
+        private static string GetAudioEncoder(string selectedEncoder)\r
         {\r
             switch (selectedEncoder)\r
             {\r
@@ -565,7 +591,14 @@ namespace Handbrake.Functions
                     return "";\r
             }\r
         }\r
-        private static Boolean chapterCSVSave(frmMain mainWindow, string filePathName)\r
+\r
+        /// <summary>\r
+        /// Create a CSV file with the data from the Main Window Chapters tab\r
+        /// </summary>\r
+        /// <param name="mainWindow">Main Window</param>\r
+        /// <param name="filePathName">Path to save the csv file</param>\r
+        /// <returns>True if successful </returns>\r
+        private static Boolean ChapterCSVSave(frmMain mainWindow, string filePathName)\r
         {\r
             try\r
             {\r
@@ -575,7 +608,7 @@ namespace Handbrake.Functions
                 {\r
                     csv += row.Cells[0].Value.ToString();\r
                     csv += ",";\r
-                    csv += row.Cells[1].Value.ToString();\r
+                    csv += row.Cells[1].Value.ToString().Replace(",","\\,");\r
                     csv += Environment.NewLine;\r
                 }\r
                 StreamWriter file = new StreamWriter(filePathName);\r