Merge pull request #6 from Sofronio/pr/4

0.0.3.4

Author: Sofronio

YouTubeTimeLineGenerator/Form1.Designer.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Data;
@@ -261,7 +261,17 @@ private void processXML()
                 }
             }
         }
+        private void processSingleword()
+        {
+            string patternSingleword = @"(.*\%(\n|\r|\r\n))(\w+)(\n|\r|\r\n)(\s(\n|\r|\r\n))";
+            //\w+$(\n|\r|\r\n)\s
+            //if (Regex.IsMatch(textBox_vtt.Text, patternSingleword))
+            //{
+            //    this.Text = "go!";
+            //}
+            textBox_vtt.Text = Regex.Replace(textBox_vtt.Text, patternSingleword, "$1$3</c>$4$5");
 
+        }
         private void processVTT()
         {
 
@@ -281,28 +291,20 @@ private void processVTT()
             //<(?<WordEnd>\d{2}:\d{2}:\d{2}.\d{3})?     get WordEnd     have 0 or one time "00:21:54.539", if it's the end, there would be no time;
             string patternContent = @"(?<Content>(\w+')?(\w+))(<\/?c.*?>)*<(?<WordEnd>\d{2}:\d{2}:\d{2}.\d{3})?";
 
+
+
             string LineStart = "";
             string LineEnd = "";
             string sContent = "";
             string sWordStart = "";
             string sWordEnd = "";
             int sPosition = 0;
 
-            //Find the position that timeline start.
-            int ContentStart = 0;
-            foreach (var text in textBox_vtt.Lines)
-            {
-                if (Regex.IsMatch(text, patternTime))
-                {
-                    break;
-                }
-                ContentStart++;
-            }
+            processSingleword();
 
-            //remove redundent spaces and returns.
-            for (int i = ContentStart; i < textBox_vtt.Lines.Count(); i = i + 8)
+            foreach (string rawLines in textBox_vtt.Lines)
             {
-                if (Regex.IsMatch(l, patternContent)) sContent += l + "\r\n";
+                if (Regex.IsMatch(rawLines, patternContent)) sContent += rawLines + "\r\n";
             }
 
             textBox_vttResult.Text = sContent;
@@ -334,6 +336,10 @@ private void processVTT()
                             sWordStart = sWordEnd;
                         }
                     }
+                    else
+                    {
+                        richTextBox_ass.AppendText(text);
+                    }
                 }
             }
         }
@@ -509,4 +515,4 @@ private void Form1_SizeChanged(object sender, EventArgs e)
 
         }
     }
-}
+}

YouTubeTimeLineGenerator/Form1.cs

@@ -119,11 +119,9 @@
   </resheader>
   <data name="richTextBox_ass.Text" xml:space="preserve">
     <value>Download VTT Auto-subtitles using youtube-dl. Find more: https://rg3.github.io/youtube-dl/
-VTT Usage: youtube-dl --skip-download --write-auto-sub --sub-format vtt http://youtube.com/xxxx
-XML Usage: Openup a YouTube video, then Press F12, type timedtext, then download the file.
-
-After the VTT file is loaded, click on the words to set the end of the sentence. The separator will be placed at the end of the word you clicked on.
-
+ - VTT Usage: youtube-dl --skip-download --write-auto-sub --sub-format vtt http://youtube.com/xxxx
+ - XML Usage: Openup a YouTube video, then Press F12, type timedtext, then download the file.
+ - After the VTT file is loaded, click on the words to set the end of the sentence. The separator will be placed at the end of the word you clicked on.
 If you find this useful, please consider supporting me. Alipay: xbox2xbox@gmail.com
 My website is http://sofronio.cn , and the latest version will be there. Have a good day.</value>
   </data>

YouTubeTimeLineGenerator/Form1.resx

@@ -12,7 +12,8 @@
     <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <PublishUrl>publish\</PublishUrl>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <PublishUrl>C:\Users\chen_\Desktop\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
     <UpdateEnabled>false</UpdateEnabled>
@@ -22,10 +23,10 @@
     <UpdatePeriodically>false</UpdatePeriodically>
     <UpdateRequired>false</UpdateRequired>
     <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationRevision>1</ApplicationRevision>
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
+    <PublishWizardCompleted>true</PublishWizardCompleted>
     <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -50,6 +51,18 @@
   <PropertyGroup>
     <ApplicationIcon>soso.ico</ApplicationIcon>
   </PropertyGroup>
+  <PropertyGroup>
+    <ManifestCertificateThumbprint>9E1E7DFA5E2CE6A9F5C9FC21AFAE6971BB79D489</ManifestCertificateThumbprint>
+  </PropertyGroup>
+  <PropertyGroup>
+    <ManifestKeyFile>YouTubeTimeLineGenerator_TemporaryKey.pfx</ManifestKeyFile>
+  </PropertyGroup>
+  <PropertyGroup>
+    <GenerateManifests>true</GenerateManifests>
+  </PropertyGroup>
+  <PropertyGroup>
+    <SignManifests>true</SignManifests>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -93,6 +106,7 @@
       <DependentUpon>Settings.settings</DependentUpon>
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
+    <None Include="YouTubeTimeLineGenerator_TemporaryKey.pfx" />
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
@@ -103,7 +117,7 @@
   <ItemGroup>
     <BootstrapperPackage Include=".NETFramework,Version=v4.5.2">
       <Visible>False</Visible>
-      <ProductName>Microsoft .NET Framework 4.5.2 %28x86 and x64%29</ProductName>
+      <ProductName>Microsoft .NET Framework 4.5.2 %28x86 和 x64%29</ProductName>
       <Install>true</Install>
     </BootstrapperPackage>
     <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">