From 33be0da197a58cc7f2e9577c98aa715ea6ad23de Mon Sep 17 00:00:00 2001 From: hama3254 Date: Sat, 24 Jun 2023 23:50:39 +0200 Subject: [PATCH] add 'remove CC Style' option add 'remove CC Style' option #769 --- .vs/Crunchyroll Downloader/v17/.suo | Bin 212480 -> 184832 bytes Crunchyroll Downloader/App.config | 3 + Crunchyroll Downloader/CRD_List_Item.vb | 23 +++-- Crunchyroll Downloader/Main.vb | 44 ++++++---- .../My Project/Settings.Designer.vb | 12 +++ .../My Project/Settings.settings | 3 + .../einstellungen.Designer.vb | 81 +++++++++++------- Crunchyroll Downloader/einstellungen.resx | 3 + Crunchyroll Downloader/einstellungen.vb | 34 +++++++- 9 files changed, 147 insertions(+), 56 deletions(-) diff --git a/.vs/Crunchyroll Downloader/v17/.suo b/.vs/Crunchyroll Downloader/v17/.suo index 193bd126582d3ba7f524a0b9697c9f7f0ba59702..350412ec64fa1fb31d6a0acfc14b80c6ce6b9f50 100644 GIT binary patch delta 9651 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 Nrlhi~SgvLf{{ue<0Sy2E delta 25753 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 KbzDI;f&T}x@bW4E diff --git a/Crunchyroll Downloader/App.config b/Crunchyroll Downloader/App.config index 56e6715..2529a2f 100644 --- a/Crunchyroll Downloader/App.config +++ b/Crunchyroll Downloader/App.config @@ -168,6 +168,9 @@ False + + False + diff --git a/Crunchyroll Downloader/CRD_List_Item.vb b/Crunchyroll Downloader/CRD_List_Item.vb index cccdd10..3c06f47 100644 --- a/Crunchyroll Downloader/CRD_List_Item.vb +++ b/Crunchyroll Downloader/CRD_List_Item.vb @@ -1175,12 +1175,25 @@ Public Class CRD_List_Item InputData = AddScaledBorderAndShadow(InputData) End If + + If My.Settings.vttStyleRemove = True Then + If CBool(InStr(InputData, "WEBVTT")) And CBool(InStr(InputData, "STYLE")) Then + Dim VTT As String() = InputData.Split(New String() {"STYLE"}, System.StringSplitOptions.RemoveEmptyEntries) + Dim VTT0 As String() = VTT(1).Split(New String() {"}"}, System.StringSplitOptions.RemoveEmptyEntries) + InputData = VTT(0) + VTT(1).Replace("}", "").Replace(VTT0(0), "") + End If + If CBool(InStr(InputData, "WEBVTT")) Then + InputData = InputData.Replace("", "").Replace("", "") + End If + End If + + Using sink As New StreamWriter(SubsFile, False, utf8WithoutBom2) - sink.WriteLine(InputData) - End Using - 'replace url with local file - DL_URL = DL_URL.Replace(InputURL(0), SubsFile) - End If + sink.WriteLine(InputData) + End Using + 'replace url with local file + DL_URL = DL_URL.Replace(InputURL(0), SubsFile) + End If Catch ex As Exception Debug.WriteLine(ex.ToString) DL_URL = DL_URL_old diff --git a/Crunchyroll Downloader/Main.vb b/Crunchyroll Downloader/Main.vb index 346cecd..3ab0a2a 100644 --- a/Crunchyroll Downloader/Main.vb +++ b/Crunchyroll Downloader/Main.vb @@ -2092,28 +2092,34 @@ Public Class Main Next Catch ex As Exception End Try - If KeepCache = False Then + Try + + If KeepCache = False Then - Dim folderPath As String = Pfad - Dim files() As String = Directory.GetFiles(folderPath, "*", SearchOption.AllDirectories) + Dim folderPath As String = Pfad + Dim files() As String = Directory.GetFiles(folderPath, "*", SearchOption.AllDirectories) - For Each file As String In files - If CBool(InStr(file, "CRD-Temp-File-")) Then - 'MsgBox(file) - System.IO.File.Delete(file) - End If - Next - Try - Dim di As New System.IO.DirectoryInfo(Pfad) - For Each fi As System.IO.DirectoryInfo In di.EnumerateDirectories("*.*", System.IO.SearchOption.TopDirectoryOnly) - If CBool(InStr(fi.Name, "CRD-Temp-File-")) Then - System.IO.Directory.Delete(fi.FullName, True) + For Each file As String In files + If CBool(InStr(file, "CRD-Temp-File-")) Then + 'MsgBox(file) + System.IO.File.Delete(file) End If Next - Catch ex As Exception - End Try - End If + Try + Dim di As New System.IO.DirectoryInfo(Pfad) + For Each fi As System.IO.DirectoryInfo In di.EnumerateDirectories("*.*", System.IO.SearchOption.TopDirectoryOnly) + If CBool(InStr(fi.Name, "CRD-Temp-File-")) Then + System.IO.Directory.Delete(fi.FullName, True) + End If + Next + Catch ex As Exception + End Try + End If + + Catch ex As Exception + + End Try End Sub Private Sub RetryWithCachedFiles() @@ -4687,6 +4693,10 @@ Public Class Main End Sub + Private Sub Main_Closing(sender As Object, e As CancelEventArgs) Handles Me.Closing + + End Sub + #End Region End Class diff --git a/Crunchyroll Downloader/My Project/Settings.Designer.vb b/Crunchyroll Downloader/My Project/Settings.Designer.vb index ca033a6..55cf520 100644 --- a/Crunchyroll Downloader/My Project/Settings.Designer.vb +++ b/Crunchyroll Downloader/My Project/Settings.Designer.vb @@ -642,6 +642,18 @@ Namespace My Me("SubtitleMod1") = value End Set End Property + + _ + Public Property vttStyleRemove() As Boolean + Get + Return CType(Me("vttStyleRemove"),Boolean) + End Get + Set + Me("vttStyleRemove") = value + End Set + End Property End Class End Namespace diff --git a/Crunchyroll Downloader/My Project/Settings.settings b/Crunchyroll Downloader/My Project/Settings.settings index 4522381..39bfc60 100644 --- a/Crunchyroll Downloader/My Project/Settings.settings +++ b/Crunchyroll Downloader/My Project/Settings.settings @@ -149,5 +149,8 @@ False + + False + \ No newline at end of file diff --git a/Crunchyroll Downloader/einstellungen.Designer.vb b/Crunchyroll Downloader/einstellungen.Designer.vb index fd7745a..d336466 100644 --- a/Crunchyroll Downloader/einstellungen.Designer.vb +++ b/Crunchyroll Downloader/einstellungen.Designer.vb @@ -24,6 +24,7 @@ Partial Class Einstellungen Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() Me.ToolTip1 = New System.Windows.Forms.ToolTip(Me.components) + Me.CB_Mod1 = New MetroFramework.Controls.MetroCheckBox() Me.pictureBox1 = New System.Windows.Forms.PictureBox() Me.ToolTip2 = New System.Windows.Forms.ToolTip(Me.components) Me.GroupBox14 = New System.Windows.Forms.GroupBox() @@ -34,6 +35,7 @@ Partial Class Einstellungen Me.CB_CR_Harsubs = New MetroFramework.Controls.MetroComboBox() Me.DubMode = New MetroFramework.Controls.MetroCheckBox() Me.TabPage2 = New MetroFramework.Controls.MetroTabPage() + Me.GroupBox23 = New System.Windows.Forms.GroupBox() Me.GroupBox18 = New System.Windows.Forms.GroupBox() Me.ListViewAdd_True = New MetroFramework.Controls.MetroCheckBox() Me.GroupBox16 = New System.Windows.Forms.GroupBox() @@ -157,13 +159,13 @@ Partial Class Einstellungen Me.Label5 = New MetroFramework.Controls.MetroLabel() Me.BackgroundWorker1 = New System.ComponentModel.BackgroundWorker() Me.Btn_Save = New System.Windows.Forms.Button() - Me.GroupBox23 = New System.Windows.Forms.GroupBox() - Me.CB_Mod1 = New MetroFramework.Controls.MetroCheckBox() + Me.CB_vttStyle = New MetroFramework.Controls.MetroCheckBox() CType(Me.pictureBox1, System.ComponentModel.ISupportInitialize).BeginInit() Me.GroupBox14.SuspendLayout() Me.SoftSubs.SuspendLayout() Me.GB_SubLanguage.SuspendLayout() Me.TabPage2.SuspendLayout() + Me.GroupBox23.SuspendLayout() Me.GroupBox18.SuspendLayout() Me.GroupBox16.SuspendLayout() Me.GroupBox4.SuspendLayout() @@ -199,7 +201,6 @@ Partial Class Einstellungen Me.GroupBox8.SuspendLayout() Me.TabPage7.SuspendLayout() CType(Me.PictureBox7, System.ComponentModel.ISupportInitialize).BeginInit() - Me.GroupBox23.SuspendLayout() Me.SuspendLayout() ' 'ToolTip1 @@ -209,6 +210,20 @@ Partial Class Einstellungen Me.ToolTip1.IsBalloon = True Me.ToolTip1.ReshowDelay = 100 ' + 'CB_Mod1 + ' + Me.CB_Mod1.AutoSize = True + Me.CB_Mod1.FontSize = MetroFramework.MetroCheckBoxSize.Medium + Me.CB_Mod1.ForeColor = System.Drawing.Color.Black + Me.CB_Mod1.Location = New System.Drawing.Point(25, 21) + Me.CB_Mod1.Name = "CB_Mod1" + Me.CB_Mod1.Size = New System.Drawing.Size(305, 19) + Me.CB_Mod1.TabIndex = 5 + Me.CB_Mod1.Text = "add 'ScaledBorderAndShadow:yes' to subtitles" + Me.ToolTip1.SetToolTip(Me.CB_Mod1, "adds the 'ScaledBorderAndShadow:yes' to the subtitles see more on https://github." & + "com/hama3254/Crunchyroll-Downloader-v3.0/issues/764") + Me.CB_Mod1.UseSelectable = True + ' 'pictureBox1 ' Me.pictureBox1.BackColor = System.Drawing.Color.Transparent @@ -339,6 +354,20 @@ Partial Class Einstellungen Me.TabPage2.VerticalScrollbarSize = 10 Me.TabPage2.Visible = False ' + 'GroupBox23 + ' + Me.GroupBox23.BackColor = System.Drawing.Color.Transparent + Me.GroupBox23.Controls.Add(Me.CB_vttStyle) + Me.GroupBox23.Controls.Add(Me.CB_Mod1) + Me.GroupBox23.Font = New System.Drawing.Font("Arial", 9.75!) + Me.GroupBox23.ForeColor = System.Drawing.Color.Black + Me.GroupBox23.Location = New System.Drawing.Point(5, 350) + Me.GroupBox23.Name = "GroupBox23" + Me.GroupBox23.Size = New System.Drawing.Size(490, 60) + Me.GroupBox23.TabIndex = 51 + Me.GroupBox23.TabStop = False + Me.GroupBox23.Text = "Subtitle Mods" + ' 'GroupBox18 ' Me.GroupBox18.BackColor = System.Drawing.Color.Transparent @@ -1374,9 +1403,9 @@ Partial Class Einstellungen Me.MetroTabPage1.HorizontalScrollbarBarColor = True Me.MetroTabPage1.HorizontalScrollbarHighlightOnWheel = False Me.MetroTabPage1.HorizontalScrollbarSize = 10 - Me.MetroTabPage1.Location = New System.Drawing.Point(4, 44) + Me.MetroTabPage1.Location = New System.Drawing.Point(4, 35) Me.MetroTabPage1.Name = "MetroTabPage1" - Me.MetroTabPage1.Size = New System.Drawing.Size(501, 519) + Me.MetroTabPage1.Size = New System.Drawing.Size(501, 528) Me.MetroTabPage1.TabIndex = 7 Me.MetroTabPage1.Text = "Crunchyroll" Me.MetroTabPage1.VerticalScrollbarBarColor = True @@ -1852,32 +1881,19 @@ Partial Class Einstellungen Me.Btn_Save.TabIndex = 9 Me.Btn_Save.UseVisualStyleBackColor = False ' - 'GroupBox23 + 'CB_vttStyle ' - Me.GroupBox23.BackColor = System.Drawing.Color.Transparent - Me.GroupBox23.Controls.Add(Me.CB_Mod1) - Me.GroupBox23.Font = New System.Drawing.Font("Arial", 9.75!) - Me.GroupBox23.ForeColor = System.Drawing.Color.Black - Me.GroupBox23.Location = New System.Drawing.Point(5, 350) - Me.GroupBox23.Name = "GroupBox23" - Me.GroupBox23.Size = New System.Drawing.Size(490, 60) - Me.GroupBox23.TabIndex = 51 - Me.GroupBox23.TabStop = False - Me.GroupBox23.Text = "Subtitle Mods" - ' - 'CB_Mod1 - ' - Me.CB_Mod1.AutoSize = True - Me.CB_Mod1.FontSize = MetroFramework.MetroCheckBoxSize.Medium - Me.CB_Mod1.ForeColor = System.Drawing.Color.Black - Me.CB_Mod1.Location = New System.Drawing.Point(87, 25) - Me.CB_Mod1.Name = "CB_Mod1" - Me.CB_Mod1.Size = New System.Drawing.Size(305, 19) - Me.CB_Mod1.TabIndex = 5 - Me.CB_Mod1.Text = "add 'ScaledBorderAndShadow:yes' to subtitles" - Me.ToolTip1.SetToolTip(Me.CB_Mod1, "adds the 'ScaledBorderAndShadow:yes' to the subtitles see more on https://github." & - "com/hama3254/Crunchyroll-Downloader-v3.0/issues/764") - Me.CB_Mod1.UseSelectable = True + Me.CB_vttStyle.AutoSize = True + Me.CB_vttStyle.FontSize = MetroFramework.MetroCheckBoxSize.Medium + Me.CB_vttStyle.ForeColor = System.Drawing.Color.Black + Me.CB_vttStyle.Location = New System.Drawing.Point(349, 21) + Me.CB_vttStyle.Name = "CB_vttStyle" + Me.CB_vttStyle.Size = New System.Drawing.Size(126, 19) + Me.CB_vttStyle.TabIndex = 6 + Me.CB_vttStyle.Text = "remove CC Style" + Me.ToolTip1.SetToolTip(Me.CB_vttStyle, "fixing CRs mess of cc's https://github.com/hama3254/Crunchyroll-Downloader-v3.0/" & + "issues/769") + Me.CB_vttStyle.UseSelectable = True ' 'Einstellungen ' @@ -1902,6 +1918,8 @@ Partial Class Einstellungen Me.SoftSubs.ResumeLayout(False) Me.GB_SubLanguage.ResumeLayout(False) Me.TabPage2.ResumeLayout(False) + Me.GroupBox23.ResumeLayout(False) + Me.GroupBox23.PerformLayout() Me.GroupBox18.ResumeLayout(False) Me.GroupBox18.PerformLayout() Me.GroupBox16.ResumeLayout(False) @@ -1948,8 +1966,6 @@ Partial Class Einstellungen Me.GroupBox8.PerformLayout() Me.TabPage7.ResumeLayout(False) CType(Me.PictureBox7, System.ComponentModel.ISupportInitialize).EndInit() - Me.GroupBox23.ResumeLayout(False) - Me.GroupBox23.PerformLayout() Me.ResumeLayout(False) Me.PerformLayout() @@ -2091,4 +2107,5 @@ Partial Class Einstellungen Friend WithEvents CB_Cap As MetroFramework.Controls.MetroCheckBox Friend WithEvents GroupBox23 As GroupBox Friend WithEvents CB_Mod1 As MetroFramework.Controls.MetroCheckBox + Friend WithEvents CB_vttStyle As MetroFramework.Controls.MetroCheckBox End Class diff --git a/Crunchyroll Downloader/einstellungen.resx b/Crunchyroll Downloader/einstellungen.resx index e809bf5..f49b9b4 100644 --- a/Crunchyroll Downloader/einstellungen.resx +++ b/Crunchyroll Downloader/einstellungen.resx @@ -126,6 +126,9 @@ 118, 20 + + 118, 20 + 332, 20 diff --git a/Crunchyroll Downloader/einstellungen.vb b/Crunchyroll Downloader/einstellungen.vb index 235e251..005cc01 100644 --- a/Crunchyroll Downloader/einstellungen.vb +++ b/Crunchyroll Downloader/einstellungen.vb @@ -18,6 +18,7 @@ Public Class Einstellungen Public CR_SoftSubsTemp As New List(Of String) Dim TempCheckSubMod1 As Boolean = False + Dim TempVTTStyle As Boolean = False Private Sub Einstellungen_Load(sender As Object, e As EventArgs) Handles MyBase.Load @@ -38,6 +39,8 @@ Public Class Einstellungen CB_Mod1.Checked = My.Settings.SubtitleMod1 + CB_vtt.Checked = My.Settings.vttStyleRemove + TempTB.Text = Main.TempFolder LeadingZeroDD.SelectedIndex = Main.LeadingZero @@ -391,6 +394,7 @@ Public Class Einstellungen My.Settings.IgnoreSeason = CB_Ignore.SelectedIndex My.Settings.SubtitleMod1 = CB_Mod1.Checked + My.Settings.vttStyleRemove = CB_vttStyle.Checked If DubMode.Checked = True Then Main.DubMode = True @@ -1116,9 +1120,18 @@ Public Class Einstellungen If (CB_Merge.Text = "[merge disabled]") = False And DD_DLMode.Text = "Default - ffmpeg" Then CB_Mod1.Enabled = False CB_Mod1.Checked = False - Else + CB_vttStyle.Enabled = False + CB_vttStyle.Checked = False + ElseIf (CB_Merge.Text = "[merge disabled]") = True And DD_DLMode.Text = "Default - ffmpeg" Then CB_Mod1.Enabled = True CB_Mod1.Checked = TempCheckSubMod1 + CB_vttStyle.Enabled = False + CB_vttStyle.Checked = False + ElseIf (DD_DLMode.Text = "Default - ffmpeg") = False Then + CB_Mod1.Enabled = True + CB_Mod1.Checked = TempCheckSubMod1 + CB_vttStyle.Enabled = True + CB_vttStyle.Checked = TempVTTStyle End If End Sub @@ -1209,11 +1222,22 @@ Public Class Einstellungen If (CB_Merge.Text = "[merge disabled]") = False And DD_DLMode.Text = "Default - ffmpeg" Then CB_Mod1.Enabled = False CB_Mod1.Checked = False - Else + CB_vttStyle.Enabled = False + CB_vttStyle.Checked = False + ElseIf (CB_Merge.Text = "[merge disabled]") = True And DD_DLMode.Text = "Default - ffmpeg" Then CB_Mod1.Enabled = True CB_Mod1.Checked = TempCheckSubMod1 + CB_vttStyle.Enabled = False + CB_vttStyle.Checked = False + ElseIf (DD_DLMode.Text = "Default - ffmpeg") = False Then + CB_Mod1.Enabled = True + CB_Mod1.Checked = TempCheckSubMod1 + CB_vttStyle.Enabled = True + CB_vttStyle.Checked = TempVTTStyle End If + + End Sub Private Sub CB_Mod1_CheckedChanged(sender As Object, e As EventArgs) Handles CB_Mod1.CheckedChanged @@ -1223,6 +1247,12 @@ Public Class Einstellungen End Sub + Private Sub CB_vttStyle_CheckedChanged(sender As Object, e As EventArgs) Handles CB_vttStyle.CheckedChanged + If CB_vttStyle.Enabled = True Then + TempVTTStyle = CB_vttStyle.Checked + End If + End Sub + 'Private Sub CB_CR_Audio_Click(sender As Object, e As EventArgs) Handles CB_CR_Audio.Click