Changed Name to Kayla.NET and Fixes

Cryental · Cryental · commit 3ef240495d52 · 2020-09-23T17:12:34.000+06:00
diff --git a/Kayla.NET.sln b/Kayla.NET.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.30503.244
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SRTSubtitleConverter", "SRTSubtitleConverter\SRTSubtitleConverter.csproj", "{F9411F26-0791-40C3-954F-B18B97B414EB}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kayla.NET", "Kayla.NET\Kayla.NET.csproj", "{F9411F26-0791-40C3-954F-B18B97B414EB}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/Kayla.NET/Converters/ISubtitleConverter.cs b/Kayla.NET/Converters/ISubtitleConverter.cs
@@ -1,11 +1,10 @@
 ﻿using System.Collections.Generic;
-using SRTSubtitleConverter.Models;
+using Kayla.NET.Models;
 
-namespace SRTSubtitleConverter.Converters
+namespace Kayla.NET.Converters
 {
     public interface ISubtitleConverter
     {
-        string Command { get; set; }
         string FileExtension { get; set; }
         string Convert(List<SubtitleItem> data);
     }
diff --git a/Kayla.NET/Converters/MicroDVDConverter.cs b/Kayla.NET/Converters/MicroDVDConverter.cs
@@ -1,14 +1,13 @@
 ﻿using System;
 using System.Collections.Generic;
 using System.Text.RegularExpressions;
-using SRTSubtitleConverter.Models;
+using Kayla.NET.Models;
 
-namespace SRTSubtitleConverter.Converters
+namespace Kayla.NET.Converters
 {
     public class MicroDVDConverter : ISubtitleConverter
     {
         public readonly float DefaultFrameRate = 23.976f;
-        public string Command { get; set; } = "microdvd";
         public string FileExtension { get; set; } = ".sub";
 
         public string Convert(List<SubtitleItem> data)
diff --git a/Kayla.NET/Converters/SAMIConverter.cs b/Kayla.NET/Converters/SAMIConverter.cs
@@ -2,13 +2,12 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.RegularExpressions;
-using SRTSubtitleConverter.Models;
+using Kayla.NET.Models;
 
-namespace SRTSubtitleConverter.Converters
+namespace Kayla.NET.Converters
 {
     public class SAMIConverter : ISubtitleConverter
     {
-        public string Command { get; set; } = "sami";
         public string FileExtension { get; set; } = ".smi";
         public string Convert(List<SubtitleItem> data)
         {
diff --git a/Kayla.NET/Converters/SRTConverter.cs b/Kayla.NET/Converters/SRTConverter.cs
@@ -1,12 +1,11 @@
 ﻿using System;
 using System.Collections.Generic;
-using SRTSubtitleConverter.Models;
+using Kayla.NET.Models;
 
-namespace SRTSubtitleConverter.Converters
+namespace Kayla.NET.Converters
 {
     public class SRTConverter : ISubtitleConverter
     {
-        public string Command { get; set; } = "srt";
         public string FileExtension { get; set; } = ".srt";
 
         public string Convert(List<SubtitleItem> data)
diff --git a/Kayla.NET/Converters/SSAConverter.cs b/Kayla.NET/Converters/SSAConverter.cs
@@ -3,13 +3,12 @@
 using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
-using SRTSubtitleConverter.Models;
+using Kayla.NET.Models;
 
-namespace SRTSubtitleConverter.Converters
+namespace Kayla.NET.Converters
 {
     public class SSAConverter : ISubtitleConverter
     {
-        public string Command { get; set; } = "ssa";
         public string FileExtension { get; set; } = ".ass";
 
         public string Convert(List<SubtitleItem> data)
diff --git a/Kayla.NET/Converters/SubViewerConverter.cs b/Kayla.NET/Converters/SubViewerConverter.cs
@@ -0,0 +1,50 @@
+﻿using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Text.RegularExpressions;
+using Kayla.NET.Models;
+
+namespace Kayla.NET.Converters
+{
+    public class SubViewerConverter : ISubtitleConverter
+    {
+        public string FileExtension { get; set; } = ".sub";
+        public string Convert(List<SubtitleItem> data)
+        {
+            var finalString = "";
+
+            for (var i = 0; i < data.Count; i++)
+            {
+                if (string.IsNullOrEmpty(data[i].Text))
+                {
+                    continue;
+                }
+
+                var startTime = new TimeSpan(data[i].StartTime * 10000).ToString(@"hh\:mm\:ss\.ff");
+                var endTime = new TimeSpan(data[i].EndTime * 10000).ToString(@"hh\:mm\:ss\.ff");
+                var text = data[i].Text;
+                var format = $"{startTime},{endTime}\r\n{text}";
+
+                if (i != data.Count - 1)
+                {
+                    format += "\r\n\r\n";
+                }
+
+                finalString += format;
+            }
+
+            return $@"[INFORMATION]
+[TITLE]
+[AUTHOR]
+[SOURCE]
+[PRG]
+[FILEPATH]
+[DELAY]0
+[CD TRACK]0
+[COMMENT]
+[END INFORMATION]
+[SUBTITLE]
+{finalString}";
+        }
+    }
+}
diff --git a/Kayla.NET/Filters.cs b/Kayla.NET/Filters.cs
@@ -1,8 +1,8 @@
 ﻿using System.Collections.Generic;
 using System.Linq;
-using SRTSubtitleConverter.Models;
+using Kayla.NET.Models;
 
-namespace SRTSubtitleConverter
+namespace Kayla.NET
 {
     public static class Filters
     {
diff --git a/Kayla.NET/Kayla.NET.csproj b/Kayla.NET/Kayla.NET.csproj
@@ -7,13 +7,17 @@
 		<VersionPrefix>1.1.7</VersionPrefix>
 		<Authors>Cryental</Authors>
 		<Company>Volistx Team</Company>
-		<Product>SRTSubtitleConverter</Product>
+		<Product>Kayla.NET</Product>
 		<Copyright>Developed By @Cryental, GPLv3.0</Copyright>
 		<Description>This tool can quickly convert subtitles format from one format to SubRip (SRT) format.</Description>
 		<RuntimeIdentifiers>win-x64;osx.10.15-x64;ubuntu.18.04-x64</RuntimeIdentifiers>
 		<PublishSingleFile>true</PublishSingleFile>
 		<RuntimeIdentifier>win-x64</RuntimeIdentifier>
-		<Version>1.1.9</Version>
+		<Version>1.2.1</Version>
+		<PackageId>Kayla.NET</PackageId>
+		<RootNamespace>Kayla.NET</RootNamespace>
+		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+		<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
 	</PropertyGroup>
 
 	<ItemGroup>
diff --git a/Kayla.NET/Models/SubtitleItem.cs b/Kayla.NET/Models/SubtitleItem.cs
@@ -1,4 +1,4 @@
-﻿namespace SRTSubtitleConverter.Models
+﻿namespace Kayla.NET.Models
 {
     public class SubtitleItem
     {
diff --git a/Kayla.NET/Options.cs b/Kayla.NET/Options.cs
@@ -1,6 +1,6 @@
 ﻿using CommandLine;
 
-namespace SRTSubtitleConverter
+namespace Kayla.NET
 {
     public class Options
     {
@@ -10,6 +10,9 @@ public class Options
         [Option('o', "output", Required = true, HelpText = "Set the path to save the converted files.")]
         public string Output { get; set; }
 
+        [Option('f', "format", Required = false, HelpText = "Set the output format. The default value is SubRip. You can use following formats:\r\nMicroDVD (*.sub)\r\nSAMI (*.smi)\r\nSubStationAlpha (*.ass, *.ssa)\r\nSubViewer (*.sub)\r\nTimedText (*.xml, *.ttml)\r\nWebVTT (*.vtt)\r\nYtXml (*.xml)\r\nSubRip (*.srt)")]
+        public string Format { get; set; }
+
         [Option('b', "batch", Required = false,
             HelpText = "Set if you want to convert all supported files in a folder.")]
         public bool BatchProcess { get; set; }
diff --git a/Kayla.NET/Parsers/ISubtitleParser.cs b/Kayla.NET/Parsers/ISubtitleParser.cs
@@ -1,7 +1,7 @@
 ﻿using System.Collections.Generic;
-using SRTSubtitleConverter.Models;
+using Kayla.NET.Models;
 
-namespace SRTSubtitleConverter.Parsers
+namespace Kayla.NET.Parsers
 {
     public interface ISubtitleParser
     {
diff --git a/Kayla.NET/Parsers/MicroDVDParser.cs b/Kayla.NET/Parsers/MicroDVDParser.cs
@@ -5,10 +5,10 @@
 using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
-using SRTSubtitleConverter.Models;
+using Kayla.NET.Models;
 using UtfUnknown;
 
-namespace SRTSubtitleConverter.Parsers
+namespace Kayla.NET.Parsers
 {
     public class MicroDVDParser : ISubtitleParser
     {
diff --git a/Kayla.NET/Parsers/SAMIParser.cs b/Kayla.NET/Parsers/SAMIParser.cs
@@ -2,10 +2,10 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Text;
-using SRTSubtitleConverter.Models;
+using Kayla.NET.Models;
 using UtfUnknown;
 
-namespace SRTSubtitleConverter.Parsers
+namespace Kayla.NET.Parsers
 {
     public class SAMIParser : ISubtitleParser
     {
diff --git a/Kayla.NET/Parsers/SRTParser.cs b/Kayla.NET/Parsers/SRTParser.cs
@@ -4,10 +4,10 @@
 using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
-using SRTSubtitleConverter.Models;
+using Kayla.NET.Models;
 using UtfUnknown;
 
-namespace SRTSubtitleConverter.Parsers
+namespace Kayla.NET.Parsers
 {
     public class SRTParser : ISubtitleParser
     {
diff --git a/Kayla.NET/Parsers/SSAParser.cs b/Kayla.NET/Parsers/SSAParser.cs
@@ -3,10 +3,10 @@
 using System.IO;
 using System.Linq;
 using System.Text;
-using SRTSubtitleConverter.Models;
+using Kayla.NET.Models;
 using UtfUnknown;
 
-namespace SRTSubtitleConverter.Parsers
+namespace Kayla.NET.Parsers
 {
     public class SSAParser : ISubtitleParser
     {
diff --git a/Kayla.NET/Parsers/SubViewerParser.cs b/Kayla.NET/Parsers/SubViewerParser.cs
@@ -4,10 +4,10 @@
 using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
-using SRTSubtitleConverter.Models;
+using Kayla.NET.Models;
 using UtfUnknown;
 
-namespace SRTSubtitleConverter.Parsers
+namespace Kayla.NET.Parsers
 {
     public class SubViewerParser : ISubtitleParser
     {
diff --git a/Kayla.NET/Parsers/TTMLParser.cs b/Kayla.NET/Parsers/TTMLParser.cs
@@ -4,10 +4,10 @@
 using System.Linq;
 using System.Text;
 using System.Xml.Linq;
-using SRTSubtitleConverter.Models;
+using Kayla.NET.Models;
 using UtfUnknown;
 
-namespace SRTSubtitleConverter.Parsers
+namespace Kayla.NET.Parsers
 {
     public class TTMLParser : ISubtitleParser
     {
diff --git a/Kayla.NET/Parsers/VTTParser.cs b/Kayla.NET/Parsers/VTTParser.cs
@@ -4,10 +4,10 @@
 using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
-using SRTSubtitleConverter.Models;
+using Kayla.NET.Models;
 using UtfUnknown;
 
-namespace SRTSubtitleConverter.Parsers
+namespace Kayla.NET.Parsers
 {
     public class VTTParser : ISubtitleParser
     {
diff --git a/Kayla.NET/Parsers/YtXmlParser.cs b/Kayla.NET/Parsers/YtXmlParser.cs
@@ -5,10 +5,10 @@
 using System.Linq;
 using System.Text;
 using System.Xml;
-using SRTSubtitleConverter.Models;
+using Kayla.NET.Models;
 using UtfUnknown;
 
-namespace SRTSubtitleConverter.Parsers
+namespace Kayla.NET.Parsers
 {
     public class YtXmlParser : ISubtitleParser
     {
diff --git a/Kayla.NET/ProcessingHandler.cs b/Kayla.NET/ProcessingHandler.cs
@@ -2,40 +2,44 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Text;
-using SRTSubtitleConverter.Converters;
-using SRTSubtitleConverter.Parsers;
+using Kayla.NET.Converters;
+using Kayla.NET.Parsers;
 
-namespace SRTSubtitleConverter
+namespace Kayla.NET
 {
     public class ProcessingHandler
     {
-        private readonly Dictionary<string, ISubtitleParser> _supportedFormats =
+        private readonly Dictionary<string, ISubtitleParser> _supportedParsers =
             new Dictionary<string, ISubtitleParser>();
 
+        private readonly Dictionary<string, ISubtitleConverter> _supportedConverters =
+            new Dictionary<string, ISubtitleConverter>();
+
         public ProcessingHandler()
         {
-            _supportedFormats.Add("MicroDVD", new MicroDVDParser());
-            _supportedFormats.Add("SAMI", new SAMIParser());
-            _supportedFormats.Add("SubStation Alpha", new SSAParser());
-            _supportedFormats.Add("SubViewer 2.0", new SubViewerParser());
-            _supportedFormats.Add("Timed Text", new TTMLParser());
-            _supportedFormats.Add("WebVTT", new VTTParser());
-            _supportedFormats.Add("Youtube Subtitle XML", new YtXmlParser());
-            _supportedFormats.Add("SubRip", new SRTParser());
+            _supportedParsers.Add("MicroDVD", new MicroDVDParser());
+            _supportedParsers.Add("SAMI", new SAMIParser());
+            _supportedParsers.Add("SubStationAlpha", new SSAParser());
+            _supportedParsers.Add("SubViewer", new SubViewerParser());
+            _supportedParsers.Add("TimedText", new TTMLParser());
+            _supportedParsers.Add("WebVTT", new VTTParser());
+            _supportedParsers.Add("YtXml", new YtXmlParser());
+            _supportedParsers.Add("SubRip", new SRTParser());
+
+            _supportedConverters.Add("MicroDVD", new MicroDVDConverter());
+            _supportedConverters.Add("SAMI", new SAMIConverter());
+            _supportedConverters.Add("SubStationAlpha", new SSAConverter());
+            _supportedConverters.Add("SubViewer", new SubViewerConverter());
+            _supportedConverters.Add("SubRip", new SRTConverter());
         }
 
-        public bool ConvertToSRT(string inputPath, string outputPath, bool folderFlag = false)
+        public bool ConvertToSRT(string inputPath, string outputPath)
         {
             var finalResult = string.Empty;
 
             var outputFilePath = outputPath;
 
-            if (folderFlag)
-            {
-                outputFilePath = Path.Combine(outputPath, Path.GetFileNameWithoutExtension(inputPath) + ".srt");
-            }
-
-            foreach (var sf in _supportedFormats)
+            foreach (var sf in _supportedParsers)
             {
                 var extensions = sf.Value.FileExtension.Split('|');
 
@@ -50,7 +54,7 @@ public bool ConvertToSRT(string inputPath, string outputPath, bool folderFlag =
                             continue;
                         }
 
-                        var srtConverter = new SRTConverter();
+                        var srtConverter = new SubViewerConverter();
                         var result = srtConverter.Convert(parsedData);
 
                         if (!string.IsNullOrEmpty(result))
@@ -86,7 +90,7 @@ public bool ConvertBathToSRT(string inputPath, string outputPath)
                 var outputFilePath = Path.Combine(outputPath, Path.GetFileNameWithoutExtension(f.Name) + ".srt");
                 var finalResult = string.Empty;
 
-                foreach (var sf in _supportedFormats)
+                foreach (var sf in _supportedParsers)
                 {
                     var extensions = sf.Value.FileExtension.Split('|');
 
diff --git a/Kayla.NET/Program.cs b/Kayla.NET/Program.cs
@@ -3,7 +3,7 @@
 using System.Text;
 using CommandLine;
 
-namespace SRTSubtitleConverter
+namespace Kayla.NET
 {
     internal class Program
     {
diff --git a/Kayla.NET/Properties/launchSettings.json b/Kayla.NET/Properties/launchSettings.json
diff --git a/SRTSubtitleConverter/Properties/launchSettings.json b/SRTSubtitleConverter/Properties/launchSettings.json

Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,10 @@`
`1`	`1`	`using System.Collections.Generic;`
`2`		`-using SRTSubtitleConverter.Models;`
	`2`	`+using Kayla.NET.Models;`
`3`	`3`
`4`		`-namespace SRTSubtitleConverter.Converters`
	`4`	`+namespace Kayla.NET.Converters`
`5`	`5`	`{`
`6`	`6`	`public interface ISubtitleConverter`
`7`	`7`	`{`
`8`		`- string Command { get; set; }`
`9`	`8`	`string FileExtension { get; set; }`
`10`	`9`	`string Convert(List<SubtitleItem> data);`
`11`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,13 +2,12 @@`
`2`	`2`	`using System.Collections.Generic;`
`3`	`3`	`using System.Linq;`
`4`	`4`	`using System.Text.RegularExpressions;`
`5`		`-using SRTSubtitleConverter.Models;`
	`5`	`+using Kayla.NET.Models;`
`6`	`6`
`7`		`-namespace SRTSubtitleConverter.Converters`
	`7`	`+namespace Kayla.NET.Converters`
`8`	`8`	`{`
`9`	`9`	`public class SAMIConverter : ISubtitleConverter`
`10`	`10`	`{`
`11`		`- public string Command { get; set; } = "sami";`
`12`	`11`	`public string FileExtension { get; set; } = ".smi";`
`13`	`12`	`public string Convert(List<SubtitleItem> data)`
`14`	`13`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,11 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Collections.Generic;`
`3`		`-using SRTSubtitleConverter.Models;`
	`3`	`+using Kayla.NET.Models;`
`4`	`4`
`5`		`-namespace SRTSubtitleConverter.Converters`
	`5`	`+namespace Kayla.NET.Converters`
`6`	`6`	`{`
`7`	`7`	`public class SRTConverter : ISubtitleConverter`
`8`	`8`	`{`
`9`		`- public string Command { get; set; } = "srt";`
`10`	`9`	`public string FileExtension { get; set; } = ".srt";`
`11`	`10`
`12`	`11`	`public string Convert(List<SubtitleItem> data)`
Original file line number	Diff line number	Diff line change
`@@ -3,13 +3,12 @@`
`3`	`3`	`using System.Linq;`
`4`	`4`	`using System.Text;`
`5`	`5`	`using System.Text.RegularExpressions;`
`6`		`-using SRTSubtitleConverter.Models;`
	`6`	`+using Kayla.NET.Models;`
`7`	`7`
`8`		`-namespace SRTSubtitleConverter.Converters`
	`8`	`+namespace Kayla.NET.Converters`
`9`	`9`	`{`
`10`	`10`	`public class SSAConverter : ISubtitleConverter`
`11`	`11`	`{`
`12`		`- public string Command { get; set; } = "ssa";`
`13`	`12`	`public string FileExtension { get; set; } = ".ass";`
`14`	`13`
`15`	`14`	`public string Convert(List<SubtitleItem> data)`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`using System.Collections.Generic;`
`2`	`2`	`using System.Linq;`
`3`		`-using SRTSubtitleConverter.Models;`
	`3`	`+using Kayla.NET.Models;`
`4`	`4`
`5`		`-namespace SRTSubtitleConverter`
	`5`	`+namespace Kayla.NET`
`6`	`6`	`{`
`7`	`7`	`public static class Filters`
`8`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-namespace SRTSubtitleConverter.Models`
	`1`	`+namespace Kayla.NET.Models`
`2`	`2`	`{`
`3`	`3`	`public class SubtitleItem`
`4`	`4`	`{`