Mirrors/Crunchyroll-Downloader-v3.0
2
0
Fork 0
mirror of https://github.com/hama3254/Crunchyroll-Downloader-v3.0.git synced 2024-12-23 22:51:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

new naming sytem #645

Browse Source 
new naming sytem #645
This commit is contained in:
hama3254 2023-01-01 20:47:09 +01:00
parent 3effa5792a
commit bd2eacac4d
10 changed files with 1424 additions and 1154 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
.vs/Crunchyroll Downloader/v17/.suo
View File

Binary file not shown.

2
Crunchyroll Downloader/Anime_Add.vb
View File

@ -1052,7 +1052,7 @@ Public Class Anime_Add
Private Sub GroupBox1_VisibleChanged(sender As Object, e As EventArgs) Handles groupBox1.VisibleChanged
If Not TextBox2.Text = "Use Custom Name" Then
If Not TextBox2.Text = "Use Custom Name" And CBool(InStr(TextBox2.Text, "++")) = False Then
TextBox2.Text = "Use Custom Name"
End If
End Sub

3
Crunchyroll Downloader/App.config
View File

@ -135,6 +135,9 @@
<setting name="ErrorTolerance" serializeAs="String">
<value>0</value>
</setting>
<setting name="NameTemplate" serializeAs="String">
<value>Unused</value>
</setting>
</Crunchyroll_Downloader.My.MySettings>
</userSettings>
</configuration>

181
Crunchyroll Downloader/Main.vb
View File

@ -131,7 +131,7 @@ Public Class Main
Public Funimation_Grapp_RDY As Boolean = True
Public Grapp_non_cr_RDY As Boolean = True
Public Grapp_Abord As Boolean = False
Public CR_NameMethode As Integer = 0
Public NameBuilder As String = ""
Public LeadingZero As Integer = 1
Public MaxDL As Integer
Public ResoNotFoundString As String
@ -502,8 +502,20 @@ Public Class Main
MaxDL = My.Settings.SL_DL
CR_NameMethode = My.Settings.CR_NameMethode
'
If My.Settings.NameTemplate = "Unused" Then 'convert old stlye
If My.Settings.CR_NameMethode = 0 Then
NameBuilder = "AnimeTitle;Season;EpisodeNR;"
ElseIf My.Settings.CR_NameMethode = 1 Then
NameBuilder = "AnimeTitle;Season;EpisodeName;"
ElseIf My.Settings.CR_NameMethode = 2 Then
NameBuilder = "AnimeTitle;Season;EpisodeNR;EpisodeName;"
ElseIf My.Settings.CR_NameMethode = 3 Then
NameBuilder = "AnimeTitle;Season;EpisodeName;EpisodeNR;"
End If
Else
NameBuilder = My.Settings.NameTemplate
End If
ErrorTolerance = My.Settings.ErrorTolerance
@ -1241,7 +1253,8 @@ Public Class Main
CR_Anime_Staffel_int = CR_season_number
If TextBox2_Text = Nothing Or TextBox2_Text = "Use Custom Name" Then
If TextBox2_Text = Nothing Or TextBox2_Text = "Use Custom Name" Or CBool(InStr(TextBox2_Text, "++")) = True Then
If Season_Prefix = "[default season prefix]" Then
@ -1283,43 +1296,83 @@ Public Class Main
End If
If CR_NameMethode = 0 Then 'nummer
If CR_season_number = Nothing And CR_episode = Nothing Then
CR_FilenName = CR_series_title + " " + CR_title
ElseIf CR_episode = Nothing Then
CR_FilenName = CR_series_title + " " + CR_title
ElseIf CR_season_number = Nothing Then
CR_FilenName = CR_series_title + " " + CR_episode
Else
CR_FilenName = CR_series_title + " " + CR_season_number + " " + CR_episode
End If
ElseIf CR_NameMethode = 1 Then 'name
If CR_season_number = Nothing Then
CR_FilenName = CR_series_title + " " + CR_title
Else
CR_FilenName = CR_series_title + " " + CR_season_number + " " + CR_title
End If
ElseIf CR_NameMethode = 2 Then ' nummer - name
If CR_season_number = Nothing And CR_episode = Nothing Then
CR_FilenName = CR_series_title + " " + CR_title
ElseIf CR_season_number = Nothing Then
CR_FilenName = CR_series_title + " " + CR_episode + " " + CR_title
Else
CR_FilenName = CR_series_title + " " + CR_season_number + " " + CR_episode + " " + CR_title
End If
ElseIf CR_NameMethode = 3 Then ' name - nummer
If CR_season_number = Nothing And CR_episode = Nothing Then
CR_FilenName = CR_series_title + " " + CR_title
ElseIf CR_season_number = Nothing Then
CR_FilenName = CR_series_title + " " + CR_title + " " + CR_episode
Else
CR_FilenName = CR_series_title + " " + CR_title + " " + CR_season_number + " " + CR_episode
Dim NameParts As String() = NameBuilder.Split(New String() {";"}, System.StringSplitOptions.RemoveEmptyEntries)
For i As Integer = 0 To NameParts.Count - 1
If NameParts(i) = "AnimeTitle" Then
CR_FilenName = CR_FilenName + " " + CR_series_title
ElseIf NameParts(i) = "Season" Then
CR_FilenName = CR_FilenName + " " + CR_season_number
ElseIf NameParts(i) = "EpisodeNR" Then
CR_FilenName = CR_FilenName + " " + CR_episode
ElseIf NameParts(i) = "EpisodeName" Then
CR_FilenName = CR_FilenName + " " + CR_title
ElseIf NameParts(i) = "AnimeDub" Then
CR_FilenName = CR_FilenName + " RepDub"
ElseIf NameParts(i) = "AnimeSub" Then
CR_FilenName = CR_FilenName + " RepSub"
End If
Next
'If CR_NameMethode = 0 Then 'nummer
' If CR_season_number = Nothing And CR_episode = Nothing Then
' CR_FilenName = CR_series_title + " " + CR_title
' ElseIf CR_episode = Nothing Then
' CR_FilenName = CR_series_title + " " + CR_title
' ElseIf CR_season_number = Nothing Then
' CR_FilenName = CR_series_title + " " + CR_episode
' Else
' CR_FilenName = CR_series_title + " " + CR_season_number + " " + CR_episode
' End If
'ElseIf CR_NameMethode = 1 Then 'name
' If CR_season_number = Nothing Then
' CR_FilenName = CR_series_title + " " + CR_title
' Else
' CR_FilenName = CR_series_title + " " + CR_season_number + " " + CR_title
' End If
'ElseIf CR_NameMethode = 2 Then ' nummer - name
' If CR_season_number = Nothing And CR_episode = Nothing Then
' CR_FilenName = CR_series_title + " " + CR_title
' ElseIf CR_season_number = Nothing Then
' CR_FilenName = CR_series_title + " " + CR_episode + " " + CR_title
' Else
' CR_FilenName = CR_series_title + " " + CR_season_number + " " + CR_episode + " " + CR_title
' End If
'ElseIf CR_NameMethode = 3 Then ' name - nummer
' If CR_season_number = Nothing And CR_episode = Nothing Then
' CR_FilenName = CR_series_title + " " + CR_title
' ElseIf CR_season_number = Nothing Then
' CR_FilenName = CR_series_title + " " + CR_title + " " + CR_episode
' Else
' CR_FilenName = CR_series_title + " " + CR_title + " " + CR_season_number + " " + CR_episode
' End If
'End If
If CBool(InStr(TextBox2_Text, "++")) = True Then
Dim Backup_CR_FilenName As String = CR_FilenName
Try
Dim AddDef As String = "CRD"
Dim TestString As String = AddDef + TextBox2_Text + AddDef
Dim PrePost As String() = TestString.Split(New String() {"++"}, System.StringSplitOptions.RemoveEmptyEntries)
CR_FilenName = PrePost(0) + CR_FilenName + PrePost(1)
CR_FilenName = CR_FilenName.Replace(AddDef, "")
Catch ex As Exception
CR_FilenName = Backup_CR_FilenName
End Try
End If
#End Region
Else
CR_FilenName = RemoveExtraSpaces(String.Join(" ", TextBox2_Text.Split(invalids, StringSplitOptions.RemoveEmptyEntries)).TrimEnd("."c)).Replace(Chr(34), "").Replace("\", "").Replace("/", "") 'System.Text.RegularExpressions.Regex.Replace(TextBox2_Text, "[^\w\\-]", " "))
CR_FilenName = RemoveExtraSpaces(String.Join(" ", TextBox2_Text.Split(invalids, StringSplitOptions.RemoveEmptyEntries)).TrimEnd("."c)).Replace(Chr(34), "").Replace("\", "").Replace("/", "") 'System.Text.RegularExpressions.Regex.Replace(TextBox2_Text, "[^\w\\-]", " "))
End If
If KodiNaming = True Then
@ -1809,6 +1862,17 @@ Public Class Main
Next
End If
#End Region
#Region "Replace Sub/Dub in name"
If CBool(InStr(CR_FilenName, "RepDub")) Then
CR_FilenName = CR_FilenName.Replace("RepDub", HardSubValuesToDisplay(CR_audio_locale))
End If
If CBool(InStr(CR_FilenName, " RepSub")) Then
CR_FilenName = CR_FilenName.Replace(" RepSub", "")
End If
#End Region
#Region "Display Resolution"
@ -2626,13 +2690,46 @@ Public Class Main
FunimationEpisodeTitle = String.Join(" ", FunimationEpisodeTitle.Split(invalids, StringSplitOptions.RemoveEmptyEntries)).TrimEnd("."c).Replace(Chr(34), "").Replace("\", "").Replace("/", "")
FunimationDub = ConvertFunimationDub(DubFunimation) 'FunimationDub2(0)
Dim DefaultName As String = RemoveExtraSpaces(FunimationTitle + " " + FunimationSeason + " " + FunimationEpisode)
If CR_NameMethode = 1 Then
DefaultName = RemoveExtraSpaces(FunimationTitle + " " + FunimationSeason + " " + FunimationEpisodeTitle)
ElseIf CR_NameMethode = 2 Then
DefaultName = RemoveExtraSpaces(FunimationTitle + " " + FunimationSeason + " " + FunimationEpisode + " " + FunimationEpisodeTitle)
ElseIf CR_NameMethode = 3 Then
DefaultName = RemoveExtraSpaces(FunimationTitle + " " + FunimationEpisodeTitle + " " + FunimationSeason + " " + FunimationEpisode)
Dim NameParts As String() = NameBuilder.Split(New String() {";"}, System.StringSplitOptions.RemoveEmptyEntries)
For i As Integer = 0 To NameParts.Count - 1
If NameParts(i) = "AnimeTitle" Then
DefaultName = DefaultName + " " + FunimationTitle
ElseIf NameParts(i) = "Season" Then
DefaultName = DefaultName + " " + FunimationSeason
ElseIf NameParts(i) = "EpisodeNR" Then
DefaultName = DefaultName + " " + FunimationEpisode
ElseIf NameParts(i) = "EpisodeName" Then
DefaultName = DefaultName + " " + FunimationEpisodeTitle
ElseIf NameParts(i) = "AnimeDub" Then
DefaultName = DefaultName + " RepDub"
ElseIf NameParts(i) = "AnimeSub" Then
DefaultName = DefaultName + " RepSub"
End If
Next
If CBool(InStr(DefaultName, " RepDub")) Then
DefaultName = DefaultName.Replace(" RepDub", "")
End If
If CBool(InStr(DefaultName, " RepSub")) Then
DefaultName = DefaultName.Replace(" RepSub", "")
End If
'If CR_NameMethode = 1 Then
' DefaultName = RemoveExtraSpaces(FunimationTitle + " " + FunimationSeason + " " + FunimationEpisodeTitle)
'ElseIf CR_NameMethode = 2 Then
' DefaultName = RemoveExtraSpaces(FunimationTitle + " " + FunimationSeason + " " + FunimationEpisode + " " + FunimationEpisodeTitle)
'ElseIf CR_NameMethode = 3 Then
' DefaultName = RemoveExtraSpaces(FunimationTitle + " " + FunimationEpisodeTitle + " " + FunimationSeason + " " + FunimationEpisode)
'End If
DefaultName = DefaultName.Replace("&#x27;", "'")
'Dim DefaultPath As String = Pfad + "\" + DefaultName + VideoFormat
'DefaultPath = DefaultPath.Replace("\\", "\")

4
Crunchyroll Downloader/My Project/AssemblyInfo.vb
View File

@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("3.11.3")>
<Assembly: AssemblyFileVersion("3.11.3")>
<Assembly: AssemblyVersion("3.12")>
<Assembly: AssemblyFileVersion("3.12")>
<Assembly: NeutralResourcesLanguage("en")>

2025
Crunchyroll Downloader/My Project/Resources.Designer.vb generated
View File

File diff suppressed because it is too large Load Diff

12
Crunchyroll Downloader/My Project/Settings.Designer.vb generated
View File

@ -509,6 +509,18 @@ Namespace My
Me("ErrorTolerance") = value
End Set
End Property
<Global.System.Configuration.UserScopedSettingAttribute(), _
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
Global.System.Configuration.DefaultSettingValueAttribute("Unused")> _
Public Property NameTemplate() As String
Get
Return CType(Me("NameTemplate"),String)
End Get
Set
Me("NameTemplate") = value
End Set
End Property
End Class
End Namespace

3
Crunchyroll Downloader/My Project/Settings.settings
View File

@ -116,5 +116,8 @@
<Setting Name="ErrorTolerance" Type="System.Int32" Scope="User">
<Value Profile="(Default)">0</Value>
</Setting>
<Setting Name="NameTemplate" Type="System.String" Scope="User">
<Value Profile="(Default)">Unused</Value>
</Setting>
</Settings>
</SettingsFile>

254
Crunchyroll Downloader/einstellungen.Designer.vb generated
View File

@ -55,14 +55,17 @@ Partial Class Einstellungen
Me.MenuStrip1 = New System.Windows.Forms.MenuStrip()
Me.FFMPEG_CommandP1 = New System.Windows.Forms.ToolStripMenuItem()
Me.copy = New System.Windows.Forms.ToolStripMenuItem()
Me.nv_h264 = New System.Windows.Forms.ToolStripMenuItem()
Me.nv_hevc = New System.Windows.Forms.ToolStripMenuItem()
Me.CPU_h264 = New System.Windows.Forms.ToolStripMenuItem()
Me.CPU_h265 = New System.Windows.Forms.ToolStripMenuItem()
Me.CPU_AV1 = New System.Windows.Forms.ToolStripMenuItem()
Me.nv_h264 = New System.Windows.Forms.ToolStripMenuItem()
Me.nv_hevc = New System.Windows.Forms.ToolStripMenuItem()
Me.nv_AV1 = New System.Windows.Forms.ToolStripMenuItem()
Me.AMD_h264 = New System.Windows.Forms.ToolStripMenuItem()
Me.AMD_hevc = New System.Windows.Forms.ToolStripMenuItem()
Me.Intel_h264 = New System.Windows.Forms.ToolStripMenuItem()
Me.Intel_hevc = New System.Windows.Forms.ToolStripMenuItem()
Me.Intel_AV1 = New System.Windows.Forms.ToolStripMenuItem()
Me.FFMPEG_CommandP2 = New System.Windows.Forms.ToolStripMenuItem()
Me.ListP1 = New System.Windows.Forms.ToolStripMenuItem()
Me.ListP2 = New System.Windows.Forms.ToolStripMenuItem()
@ -119,7 +122,6 @@ Partial Class Einstellungen
Me.GroupBox12 = New System.Windows.Forms.GroupBox()
Me.DD_Episode_Prefix = New MetroFramework.Controls.MetroComboBox()
Me.DD_Season_Prefix = New MetroFramework.Controls.MetroComboBox()
Me.CR_Filename = New MetroFramework.Controls.MetroComboBox()
Me.MetroTabPage1 = New MetroFramework.Controls.MetroTabPage()
Me.GroupBox20 = New System.Windows.Forms.GroupBox()
Me.ChB_Chapters = New MetroFramework.Controls.MetroCheckBox()
@ -154,9 +156,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.Intel_AV1 = New System.Windows.Forms.ToolStripMenuItem()
Me.CPU_AV1 = New System.Windows.Forms.ToolStripMenuItem()
Me.nv_AV1 = New System.Windows.Forms.ToolStripMenuItem()
Me.TB_NameString = New MetroFramework.Controls.MetroTextBox()
Me.CB_EpisodeName = New MetroFramework.Controls.MetroCheckBox()
Me.CB_AnimeDub = New MetroFramework.Controls.MetroCheckBox()
Me.CB_EpisodeNR = New MetroFramework.Controls.MetroCheckBox()
Me.CB_AnimeSub = New MetroFramework.Controls.MetroCheckBox()
Me.CB_Season = New MetroFramework.Controls.MetroCheckBox()
Me.CB_Anime = New MetroFramework.Controls.MetroCheckBox()
CType(Me.pictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
Me.GroupBox14.SuspendLayout()
Me.SoftSubs.SuspendLayout()
@ -602,65 +608,86 @@ Partial Class Einstellungen
'copy
'
Me.copy.Name = "copy"
Me.copy.Size = New System.Drawing.Size(180, 22)
Me.copy.Size = New System.Drawing.Size(172, 22)
Me.copy.Text = "-c copy"
'
'nv_h264
'
Me.nv_h264.BackColor = System.Drawing.Color.YellowGreen
Me.nv_h264.Name = "nv_h264"
Me.nv_h264.Size = New System.Drawing.Size(180, 22)
Me.nv_h264.Text = "-c:v h264_nvenc "
'
'nv_hevc
'
Me.nv_hevc.BackColor = System.Drawing.Color.YellowGreen
Me.nv_hevc.Name = "nv_hevc"
Me.nv_hevc.Size = New System.Drawing.Size(180, 22)
Me.nv_hevc.Text = "-c:v hevc_nvenc"
'
'CPU_h264
'
Me.CPU_h264.BackColor = System.Drawing.Color.DarkGray
Me.CPU_h264.Name = "CPU_h264"
Me.CPU_h264.Size = New System.Drawing.Size(180, 22)
Me.CPU_h264.Size = New System.Drawing.Size(172, 22)
Me.CPU_h264.Text = "-c:v libx264"
'
'CPU_h265
'
Me.CPU_h265.BackColor = System.Drawing.Color.DarkGray
Me.CPU_h265.Name = "CPU_h265"
Me.CPU_h265.Size = New System.Drawing.Size(180, 22)
Me.CPU_h265.Size = New System.Drawing.Size(172, 22)
Me.CPU_h265.Text = "-c:v libx265"
'
'CPU_AV1
'
Me.CPU_AV1.BackColor = System.Drawing.Color.DarkGray
Me.CPU_AV1.Name = "CPU_AV1"
Me.CPU_AV1.Size = New System.Drawing.Size(172, 22)
Me.CPU_AV1.Text = "-c:v libsvtav1"
'
'nv_h264
'
Me.nv_h264.BackColor = System.Drawing.Color.YellowGreen
Me.nv_h264.Name = "nv_h264"
Me.nv_h264.Size = New System.Drawing.Size(172, 22)
Me.nv_h264.Text = "-c:v h264_nvenc "
'
'nv_hevc
'
Me.nv_hevc.BackColor = System.Drawing.Color.YellowGreen
Me.nv_hevc.Name = "nv_hevc"
Me.nv_hevc.Size = New System.Drawing.Size(172, 22)
Me.nv_hevc.Text = "-c:v hevc_nvenc"
'
'nv_AV1
'
Me.nv_AV1.BackColor = System.Drawing.Color.YellowGreen
Me.nv_AV1.Name = "nv_AV1"
Me.nv_AV1.Size = New System.Drawing.Size(172, 22)
Me.nv_AV1.Text = "-c:v av1_nvenc"
'
'AMD_h264
'
Me.AMD_h264.BackColor = System.Drawing.Color.Tomato
Me.AMD_h264.Name = "AMD_h264"
Me.AMD_h264.Size = New System.Drawing.Size(180, 22)
Me.AMD_h264.Size = New System.Drawing.Size(172, 22)
Me.AMD_h264.Text = "-c:v h264_amf"
'
'AMD_hevc
'
Me.AMD_hevc.BackColor = System.Drawing.Color.Tomato
Me.AMD_hevc.Name = "AMD_hevc"
Me.AMD_hevc.Size = New System.Drawing.Size(180, 22)
Me.AMD_hevc.Size = New System.Drawing.Size(172, 22)
Me.AMD_hevc.Text = "-c:v hevc_amf"
'
'Intel_h264
'
Me.Intel_h264.BackColor = System.Drawing.Color.CornflowerBlue
Me.Intel_h264.Name = "Intel_h264"
Me.Intel_h264.Size = New System.Drawing.Size(180, 22)
Me.Intel_h264.Size = New System.Drawing.Size(172, 22)
Me.Intel_h264.Text = "-c:v h264_qsv"
'
'Intel_hevc
'
Me.Intel_hevc.BackColor = System.Drawing.Color.CornflowerBlue
Me.Intel_hevc.Name = "Intel_hevc"
Me.Intel_hevc.Size = New System.Drawing.Size(180, 22)
Me.Intel_hevc.Size = New System.Drawing.Size(172, 22)
Me.Intel_hevc.Text = "-c:v hevc_qsv"
'
'Intel_AV1
'
Me.Intel_AV1.BackColor = System.Drawing.Color.CornflowerBlue
Me.Intel_AV1.Name = "Intel_AV1"
Me.Intel_AV1.Size = New System.Drawing.Size(172, 22)
Me.Intel_AV1.Text = "-c:v av1_qsv"
'
'FFMPEG_CommandP2
'
Me.FFMPEG_CommandP2.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ListP1, Me.ListP2, Me.ListP3})
@ -876,10 +903,10 @@ Partial Class Einstellungen
Me.TabPage1.HorizontalScrollbarBarColor = True
Me.TabPage1.HorizontalScrollbarHighlightOnWheel = False
Me.TabPage1.HorizontalScrollbarSize = 10
Me.TabPage1.Location = New System.Drawing.Point(4, 35)
Me.TabPage1.Location = New System.Drawing.Point(4, 44)
Me.TabPage1.Name = "TabPage1"
Me.TabPage1.Padding = New System.Windows.Forms.Padding(3)
Me.TabPage1.Size = New System.Drawing.Size(501, 528)
Me.TabPage1.Size = New System.Drawing.Size(501, 519)
Me.TabPage1.TabIndex = 0
Me.TabPage1.Text = " Main"
Me.TabPage1.VerticalScrollbar = True
@ -1134,7 +1161,7 @@ Partial Class Einstellungen
Me.TabControl1.FontWeight = MetroFramework.MetroTabControlWeight.Regular
Me.TabControl1.Location = New System.Drawing.Point(22, 60)
Me.TabControl1.Name = "TabControl1"
Me.TabControl1.SelectedIndex = 1
Me.TabControl1.SelectedIndex = 2
Me.TabControl1.Size = New System.Drawing.Size(509, 567)
Me.TabControl1.TabIndex = 0
Me.TabControl1.UseSelectable = True
@ -1163,7 +1190,7 @@ Partial Class Einstellungen
Me.GroupBox17.Controls.Add(Me.LeadingZeroDD)
Me.GroupBox17.Font = New System.Drawing.Font("Arial", 9.75!)
Me.GroupBox17.ForeColor = System.Drawing.Color.Black
Me.GroupBox17.Location = New System.Drawing.Point(5, 212)
Me.GroupBox17.Location = New System.Drawing.Point(5, 300)
Me.GroupBox17.Name = "GroupBox17"
Me.GroupBox17.Size = New System.Drawing.Size(490, 67)
Me.GroupBox17.TabIndex = 40
@ -1191,7 +1218,7 @@ Partial Class Einstellungen
Me.GroupBox3.Controls.Add(Me.CB_SoftSubSettings)
Me.GroupBox3.Font = New System.Drawing.Font("Arial", 9.75!)
Me.GroupBox3.ForeColor = System.Drawing.Color.Black
Me.GroupBox3.Location = New System.Drawing.Point(5, 285)
Me.GroupBox3.Location = New System.Drawing.Point(5, 380)
Me.GroupBox3.Name = "GroupBox3"
Me.GroupBox3.Size = New System.Drawing.Size(490, 129)
Me.GroupBox3.TabIndex = 52
@ -1234,9 +1261,9 @@ Partial Class Einstellungen
Me.GB_Filename_Pre.Controls.Add(Me.MetroLink1)
Me.GB_Filename_Pre.Font = New System.Drawing.Font("Arial", 9.75!)
Me.GB_Filename_Pre.ForeColor = System.Drawing.Color.Black
Me.GB_Filename_Pre.Location = New System.Drawing.Point(5, 144)
Me.GB_Filename_Pre.Location = New System.Drawing.Point(5, 230)
Me.GB_Filename_Pre.Name = "GB_Filename_Pre"
Me.GB_Filename_Pre.Size = New System.Drawing.Size(490, 62)
Me.GB_Filename_Pre.Size = New System.Drawing.Size(490, 65)
Me.GB_Filename_Pre.TabIndex = 22
Me.GB_Filename_Pre.TabStop = False
Me.GB_Filename_Pre.Text = "Filename Extras"
@ -1281,14 +1308,20 @@ Partial Class Einstellungen
'GroupBox12
'
Me.GroupBox12.BackColor = System.Drawing.Color.Transparent
Me.GroupBox12.Controls.Add(Me.CB_EpisodeName)
Me.GroupBox12.Controls.Add(Me.CB_AnimeDub)
Me.GroupBox12.Controls.Add(Me.CB_EpisodeNR)
Me.GroupBox12.Controls.Add(Me.CB_AnimeSub)
Me.GroupBox12.Controls.Add(Me.CB_Season)
Me.GroupBox12.Controls.Add(Me.CB_Anime)
Me.GroupBox12.Controls.Add(Me.TB_NameString)
Me.GroupBox12.Controls.Add(Me.DD_Episode_Prefix)
Me.GroupBox12.Controls.Add(Me.DD_Season_Prefix)
Me.GroupBox12.Controls.Add(Me.CR_Filename)
Me.GroupBox12.Font = New System.Drawing.Font("Arial", 9.75!)
Me.GroupBox12.ForeColor = System.Drawing.Color.Black
Me.GroupBox12.Location = New System.Drawing.Point(5, 11)
Me.GroupBox12.Name = "GroupBox12"
Me.GroupBox12.Size = New System.Drawing.Size(490, 127)
Me.GroupBox12.Size = New System.Drawing.Size(490, 215)
Me.GroupBox12.TabIndex = 21
Me.GroupBox12.TabStop = False
Me.GroupBox12.Text = "Filename"
@ -1302,7 +1335,7 @@ Partial Class Einstellungen
Me.DD_Episode_Prefix.IntegralHeight = False
Me.DD_Episode_Prefix.ItemHeight = 23
Me.DD_Episode_Prefix.Items.AddRange(New Object() {"[default episode prefix]"})
Me.DD_Episode_Prefix.Location = New System.Drawing.Point(248, 85)
Me.DD_Episode_Prefix.Location = New System.Drawing.Point(248, 165)
Me.DD_Episode_Prefix.Name = "DD_Episode_Prefix"
Me.DD_Episode_Prefix.Size = New System.Drawing.Size(225, 29)
Me.DD_Episode_Prefix.TabIndex = 10
@ -1317,26 +1350,12 @@ Partial Class Einstellungen
Me.DD_Season_Prefix.IntegralHeight = False
Me.DD_Season_Prefix.ItemHeight = 23
Me.DD_Season_Prefix.Items.AddRange(New Object() {"[default season prefix]"})
Me.DD_Season_Prefix.Location = New System.Drawing.Point(6, 85)
Me.DD_Season_Prefix.Location = New System.Drawing.Point(6, 165)
Me.DD_Season_Prefix.Name = "DD_Season_Prefix"
Me.DD_Season_Prefix.Size = New System.Drawing.Size(225, 29)
Me.DD_Season_Prefix.TabIndex = 9
Me.DD_Season_Prefix.UseSelectable = True
'
'CR_Filename
'
Me.CR_Filename.DropDownHeight = 250
Me.CR_Filename.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.CR_Filename.FormattingEnabled = True
Me.CR_Filename.IntegralHeight = False
Me.CR_Filename.ItemHeight = 23
Me.CR_Filename.Items.AddRange(New Object() {"[episode number]", "[episode name]", "[episode number] [episode name]", "[episode name] [episode number]"})
Me.CR_Filename.Location = New System.Drawing.Point(6, 35)
Me.CR_Filename.Name = "CR_Filename"
Me.CR_Filename.Size = New System.Drawing.Size(467, 29)
Me.CR_Filename.TabIndex = 8
Me.CR_Filename.UseSelectable = True
'
'MetroTabPage1
'
Me.MetroTabPage1.Controls.Add(Me.GroupBox20)
@ -1414,10 +1433,10 @@ Partial Class Einstellungen
Me.TabPage6.HorizontalScrollbarBarColor = True
Me.TabPage6.HorizontalScrollbarHighlightOnWheel = False
Me.TabPage6.HorizontalScrollbarSize = 10
Me.TabPage6.Location = New System.Drawing.Point(4, 35)
Me.TabPage6.Location = New System.Drawing.Point(4, 44)
Me.TabPage6.Name = "TabPage6"
Me.TabPage6.Padding = New System.Windows.Forms.Padding(3)
Me.TabPage6.Size = New System.Drawing.Size(501, 528)
Me.TabPage6.Size = New System.Drawing.Size(501, 519)
Me.TabPage6.TabIndex = 4
Me.TabPage6.Text = " Funimation"
Me.TabPage6.VerticalScrollbarBarColor = True
@ -1651,9 +1670,9 @@ Partial Class Einstellungen
Me.TabPage7.Controls.Add(Me.Label4)
Me.TabPage7.Controls.Add(Me.Label6)
Me.TabPage7.Controls.Add(Me.Label5)
Me.TabPage7.Location = New System.Drawing.Point(4, 35)
Me.TabPage7.Location = New System.Drawing.Point(4, 44)
Me.TabPage7.Name = "TabPage7"
Me.TabPage7.Size = New System.Drawing.Size(501, 528)
Me.TabPage7.Size = New System.Drawing.Size(501, 519)
Me.TabPage7.TabIndex = 5
Me.TabPage7.Text = " About "
'
@ -1785,26 +1804,110 @@ Partial Class Einstellungen
Me.Btn_Save.TabIndex = 9
Me.Btn_Save.UseVisualStyleBackColor = False
'
'Intel_AV1
'TB_NameString
'
Me.Intel_AV1.BackColor = System.Drawing.Color.CornflowerBlue
Me.Intel_AV1.Name = "Intel_AV1"
Me.Intel_AV1.Size = New System.Drawing.Size(180, 22)
Me.Intel_AV1.Text = "-c:v av1_qsv"
'
'CPU_AV1
'
Me.CPU_AV1.BackColor = System.Drawing.Color.DarkGray
Me.CPU_AV1.Name = "CPU_AV1"
Me.CPU_AV1.Size = New System.Drawing.Size(180, 22)
Me.CPU_AV1.Text = "-c:v libsvtav1"
'
'nv_AV1
Me.TB_NameString.CustomButton.Image = Nothing
Me.TB_NameString.CustomButton.Location = New System.Drawing.Point(439, 1)
Me.TB_NameString.CustomButton.Name = ""
Me.TB_NameString.CustomButton.Size = New System.Drawing.Size(27, 27)
Me.TB_NameString.CustomButton.Style = MetroFramework.MetroColorStyle.Blue
Me.TB_NameString.CustomButton.TabIndex = 1
Me.TB_NameString.CustomButton.Theme = MetroFramework.MetroThemeStyle.Light
Me.TB_NameString.CustomButton.UseSelectable = True
Me.TB_NameString.CustomButton.Visible = False
Me.TB_NameString.FontSize = MetroFramework.MetroTextBoxSize.Medium
Me.TB_NameString.Lines = New String(-1) {}
Me.TB_NameString.Location = New System.Drawing.Point(6, 35)
Me.TB_NameString.MaxLength = 32767
Me.TB_NameString.Name = "TB_NameString"
Me.TB_NameString.PasswordChar = Global.Microsoft.VisualBasic.ChrW(0)
Me.TB_NameString.ReadOnly = True
Me.TB_NameString.ScrollBars = System.Windows.Forms.ScrollBars.None
Me.TB_NameString.SelectedText = ""
Me.TB_NameString.SelectionLength = 0
Me.TB_NameString.SelectionStart = 0
Me.TB_NameString.ShortcutsEnabled = True
Me.TB_NameString.Size = New System.Drawing.Size(467, 29)
Me.TB_NameString.TabIndex = 21
Me.TB_NameString.TextAlign = System.Windows.Forms.HorizontalAlignment.Center
Me.TB_NameString.UseSelectable = True
Me.TB_NameString.WaterMarkColor = System.Drawing.Color.FromArgb(CType(CType(109, Byte), Integer), CType(CType(109, Byte), Integer), CType(CType(109, Byte), Integer))
Me.TB_NameString.WaterMarkFont = New System.Drawing.Font("Segoe UI", 12.0!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Pixel)
'
Me.nv_AV1.BackColor = System.Drawing.Color.YellowGreen
Me.nv_AV1.Name = "nv_AV1"
Me.nv_AV1.Size = New System.Drawing.Size(180, 22)
Me.nv_AV1.Text = "-c:v av1_nvenc"
'CB_EpisodeName
'
Me.CB_EpisodeName.AutoSize = True
Me.CB_EpisodeName.FontSize = MetroFramework.MetroCheckBoxSize.Medium
Me.CB_EpisodeName.ForeColor = System.Drawing.Color.Black
Me.CB_EpisodeName.Location = New System.Drawing.Point(153, 124)
Me.CB_EpisodeName.Name = "CB_EpisodeName"
Me.CB_EpisodeName.Size = New System.Drawing.Size(101, 19)
Me.CB_EpisodeName.TabIndex = 31
Me.CB_EpisodeName.Text = "Episode Title"
Me.CB_EpisodeName.UseSelectable = True
'
'CB_AnimeDub
'
Me.CB_AnimeDub.AutoSize = True
Me.CB_AnimeDub.FontSize = MetroFramework.MetroCheckBoxSize.Medium
Me.CB_AnimeDub.ForeColor = System.Drawing.Color.Black
Me.CB_AnimeDub.Location = New System.Drawing.Point(320, 86)
Me.CB_AnimeDub.Name = "CB_AnimeDub"
Me.CB_AnimeDub.Size = New System.Drawing.Size(125, 19)
Me.CB_AnimeDub.TabIndex = 29
Me.CB_AnimeDub.Text = "Audio Language"
Me.CB_AnimeDub.UseSelectable = True
'
'CB_EpisodeNR
'
Me.CB_EpisodeNR.AutoSize = True
Me.CB_EpisodeNR.FontSize = MetroFramework.MetroCheckBoxSize.Medium
Me.CB_EpisodeNR.ForeColor = System.Drawing.Color.Black
Me.CB_EpisodeNR.Location = New System.Drawing.Point(153, 86)
Me.CB_EpisodeNR.Name = "CB_EpisodeNR"
Me.CB_EpisodeNR.Size = New System.Drawing.Size(126, 19)
Me.CB_EpisodeNR.TabIndex = 28
Me.CB_EpisodeNR.Text = "Episode Number"
Me.CB_EpisodeNR.UseSelectable = True
'
'CB_AnimeSub
'
Me.CB_AnimeSub.AutoSize = True
Me.CB_AnimeSub.FontSize = MetroFramework.MetroCheckBoxSize.Medium
Me.CB_AnimeSub.ForeColor = System.Drawing.Color.Black
Me.CB_AnimeSub.Location = New System.Drawing.Point(320, 124)
Me.CB_AnimeSub.Name = "CB_AnimeSub"
Me.CB_AnimeSub.Size = New System.Drawing.Size(135, 19)
Me.CB_AnimeSub.TabIndex = 32
Me.CB_AnimeSub.Text = "Subtitle Language"
Me.CB_AnimeSub.UseSelectable = True
'
'CB_Season
'
Me.CB_Season.AutoSize = True
Me.CB_Season.FontSize = MetroFramework.MetroCheckBoxSize.Medium
Me.CB_Season.ForeColor = System.Drawing.Color.Black
Me.CB_Season.Location = New System.Drawing.Point(17, 124)
Me.CB_Season.Name = "CB_Season"
Me.CB_Season.Size = New System.Drawing.Size(122, 19)
Me.CB_Season.TabIndex = 30
Me.CB_Season.Text = "Season Number"
Me.CB_Season.UseSelectable = True
'
'CB_Anime
'
Me.CB_Anime.AutoSize = True
Me.CB_Anime.FontSize = MetroFramework.MetroCheckBoxSize.Medium
Me.CB_Anime.ForeColor = System.Drawing.Color.Black
Me.CB_Anime.Location = New System.Drawing.Point(17, 86)
Me.CB_Anime.Name = "CB_Anime"
Me.CB_Anime.Size = New System.Drawing.Size(100, 19)
Me.CB_Anime.TabIndex = 27
Me.CB_Anime.Text = "Series Name"
Me.CB_Anime.UseSelectable = True
'
'Einstellungen
'
@ -1857,6 +1960,7 @@ Partial Class Einstellungen
Me.GB_Filename_Pre.ResumeLayout(False)
Me.GB_Filename_Pre.PerformLayout()
Me.GroupBox12.ResumeLayout(False)
Me.GroupBox12.PerformLayout()
Me.MetroTabPage1.ResumeLayout(False)
Me.GroupBox20.ResumeLayout(False)
Me.GroupBox20.PerformLayout()
@ -1992,7 +2096,6 @@ Partial Class Einstellungen
Friend WithEvents LeadingZeroDD As MetroFramework.Controls.MetroComboBox
Friend WithEvents DD_Episode_Prefix As MetroFramework.Controls.MetroComboBox
Friend WithEvents DD_Season_Prefix As MetroFramework.Controls.MetroComboBox
Friend WithEvents CR_Filename As MetroFramework.Controls.MetroComboBox
Friend WithEvents GroupBox17 As GroupBox
Friend WithEvents GroupBox3 As GroupBox
Friend WithEvents LangNameType_DD As MetroFramework.Controls.MetroComboBox
@ -2013,4 +2116,11 @@ Partial Class Einstellungen
Friend WithEvents Intel_AV1 As ToolStripMenuItem
Friend WithEvents CPU_AV1 As ToolStripMenuItem
Friend WithEvents nv_AV1 As ToolStripMenuItem
Public WithEvents CB_EpisodeName As MetroFramework.Controls.MetroCheckBox
Public WithEvents CB_AnimeDub As MetroFramework.Controls.MetroCheckBox
Public WithEvents CB_EpisodeNR As MetroFramework.Controls.MetroCheckBox
Public WithEvents CB_AnimeSub As MetroFramework.Controls.MetroCheckBox
Public WithEvents CB_Season As MetroFramework.Controls.MetroCheckBox
Public WithEvents CB_Anime As MetroFramework.Controls.MetroCheckBox
Friend WithEvents TB_NameString As MetroFramework.Controls.MetroTextBox
End Class

94
Crunchyroll Downloader/einstellungen.vb
View File

@ -116,17 +116,8 @@ Public Class Einstellungen
' RB_pt.Checked = True
'End If
Next
If Main.CR_NameMethode = 0 Then
CR_Filename.SelectedIndex = 0
ElseIf Main.CR_NameMethode = 1 Then
CR_Filename.SelectedIndex = 1
ElseIf Main.CR_NameMethode = 2 Then
CR_Filename.SelectedIndex = 2
ElseIf Main.CR_NameMethode = 3 Then
CR_Filename.SelectedIndex = 3
Else
CR_Filename.SelectedIndex = 0
End If
'TB_NameString.Text = Main.NameBuilder
Me.Location = New Point(CInt(Main.Location.X + Main.Width / 2 - Me.Width / 2), CInt(Main.Location.Y + Main.Height / 2 - Me.Height / 2))
Try
@ -328,6 +319,29 @@ Public Class Einstellungen
CR_SoftSubDefault.SelectedItem = "[Disabled]"
End If
Dim NameParts As String() = Main.NameBuilder.Split(New String() {";"}, System.StringSplitOptions.RemoveEmptyEntries)
For i As Integer = 0 To NameParts.Count - 1
If NameParts(i) = "AnimeTitle" Then
CB_Anime.Checked = True
ElseIf NameParts(i) = "Season" Then
CB_Season.Checked = True
ElseIf NameParts(i) = "EpisodeNR" Then
CB_EpisodeNR.Checked = True
ElseIf NameParts(i) = "EpisodeName" Then
CB_EpisodeName.Checked = True
ElseIf NameParts(i) = "AnimeDub" Then
CB_AnimeDub.Checked = True
ElseIf NameParts(i) = "AnimeSub" Then
CB_AnimeSub.Checked = True
End If
Next
End Sub
Private Sub Btn_Save_Click(sender As Object, e As EventArgs) Handles Btn_Save.Click
@ -488,19 +502,8 @@ Public Class Einstellungen
End If
If CR_Filename.Text = "[episode number]" Then
Main.CR_NameMethode = 0
My.Settings.CR_NameMethode = Main.CR_NameMethode
ElseIf CR_Filename.Text = "[episode name]" Then
Main.CR_NameMethode = 1
My.Settings.CR_NameMethode = Main.CR_NameMethode
ElseIf CR_Filename.Text = "[episode number] [episode name]" Then
Main.CR_NameMethode = 2
My.Settings.CR_NameMethode = Main.CR_NameMethode
ElseIf CR_Filename.Text = "[episode name] [episode number]" Then
Main.CR_NameMethode = 3
My.Settings.CR_NameMethode = Main.CR_NameMethode
End If
Main.NameBuilder = TB_NameString.Text
If CB_Format.Text = "MKV" Then
Main.VideoFormat = ".mkv"
@ -1248,6 +1251,49 @@ Public Class Einstellungen
End If
End Sub
#Region "Build Name String"
Private Sub CB_Anime_CheckedChanged(sender As Object, e As EventArgs) Handles CB_Anime.CheckedChanged, CB_Season.CheckedChanged, CB_EpisodeNR.CheckedChanged, CB_EpisodeName.CheckedChanged, CB_AnimeDub.CheckedChanged, CB_AnimeSub.CheckedChanged
If CB_Anime.Checked = True And CBool(InStr(TB_NameString.Text, "AnimeTitle;")) = False Then
TB_NameString.AppendText("AnimeTitle;")
ElseIf CB_Anime.Checked = False Then
TB_NameString.Text = TB_NameString.Text.Replace("AnimeTitle;", "")
End If
If CB_Season.Checked = True And CBool(InStr(TB_NameString.Text, "Season;")) = False Then
TB_NameString.AppendText("Season;")
ElseIf CB_Season.Checked = False Then
TB_NameString.Text = TB_NameString.Text.Replace("Season;", "")
End If
If CB_EpisodeNR.Checked = True And CBool(InStr(TB_NameString.Text, "EpisodeNR;")) = False Then
TB_NameString.AppendText("EpisodeNR;")
ElseIf CB_EpisodeNR.Checked = False Then
TB_NameString.Text = TB_NameString.Text.Replace("EpisodeNR;", "")
End If
If CB_EpisodeName.Checked = True And CBool(InStr(TB_NameString.Text, "EpisodeName;")) = False Then
TB_NameString.AppendText("EpisodeName;")
ElseIf CB_EpisodeName.Checked = False Then
TB_NameString.Text = TB_NameString.Text.Replace("EpisodeName;", "")
End If
If CB_AnimeDub.Checked = True And CBool(InStr(TB_NameString.Text, "AnimeDub;")) = False Then
TB_NameString.AppendText("AnimeDub;")
ElseIf CB_AnimeDub.Checked = False Then
TB_NameString.Text = TB_NameString.Text.Replace("AnimeDub;", "")
End If
If CB_AnimeSub.Checked = True And CBool(InStr(TB_NameString.Text, "AnimeSub;")) = False Then
TB_NameString.AppendText("AnimeSub;")
ElseIf CB_AnimeSub.Checked = False Then
TB_NameString.Text = TB_NameString.Text.Replace("AnimeSub;", "")
End If
End Sub
#End Region
#End Region