Added new parameter /nolanguageinfilename

chripede · Oct 5, 2010 · 608422f · 608422f
1 parent 7ad3e82
commit 608422f
Show file tree

Hide file tree

Showing 3 changed files with 161 additions and 148 deletions.
diff --git a/VrokSubConsole/Classes.cs b/VrokSubConsole/Classes.cs
@@ -3,7 +3,8 @@
 using CookComputing.XmlRpc;
 using System.IO;
 using System;
-namespace OSDbClient
+
+namespace VrokSub
 {
 
     public class imdbdata
@@ -135,19 +136,27 @@ public class MovieFile
         public string oldSubtitle { get; set; }
         public imdbdata imdbinfo { get; set; }
         public string oldSubtitleLang { get; set; }
-        public string GetSubtitleFileName()
+
+        public string GetSubtitleFileName(bool noLanguageInFilename)
         {
-            return Path.GetDirectoryName(filename) + "\\" + Path.GetFileNameWithoutExtension(filename) + "." + subRes.ISO639 + "." + subRes.SubFormat;
+            var path = Path.GetDirectoryName(filename) + "\\" + Path.GetFileNameWithoutExtension(filename);
+
+            if (!noLanguageInFilename)
+                path += "." + subRes.ISO639;
+
+            path += "." + subRes.SubFormat;
+
+            return path;
         }
 
         public string GetName()
         {
             return Path.GetFileNameWithoutExtension(filename);
         }
 
-        public void saveSubtitle(bool overwrite)
+        public void SaveSubtitle(bool overwrite, bool noLanguageInFilename)
         {
-            string filenameToWrite = GetSubtitleFileName();
+            string filenameToWrite = GetSubtitleFileName(noLanguageInFilename);
             if (File.Exists(filenameToWrite))
             {
                 if (overwrite)
@@ -159,7 +168,7 @@ public void saveSubtitle(bool overwrite)
                     return;
                 }
             }
-            FileStream fStream = new FileStream(GetSubtitleFileName(), FileMode.CreateNew);
+            FileStream fStream = new FileStream(GetSubtitleFileName(noLanguageInFilename), FileMode.CreateNew);
 
 			BinaryWriter bw = new BinaryWriter(fStream);
 
@@ -184,7 +193,7 @@ public void getOldSubtitle(List<string> subtitleFormats, List<langMap> theLangMa
                 if (file == filename) { continue; }
                 if (subtitleFormats.Contains(Path.GetExtension(file)))
                 {
-                    string l = Utils.parseLangCodeFromFile(file, theLangMap);
+                    string l = Utils.ParseLangCodeFromFile(file, theLangMap);
                     if (bestOldSubFile == "")
                     { 
                         bestOldSubFile = file;