Skip to content
This repository has been archived by the owner on Jul 13, 2024. It is now read-only.

Commit

Permalink
new naming sytem #645
Browse files Browse the repository at this point in the history 
new naming sytem #645
  • Loading branch information
@hama3254
hama3254 committed Jan 1, 2023
1 parent 3effa57 commit bd2eaca
Show file tree
Hide file tree
Showing 10 changed files with 1,427 additions and 1,157 deletions.
Binary file modified .vs/Crunchyroll Downloader/v17/.suo
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion Crunchyroll Downloader/Anime_Add.vb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions Crunchyroll Downloader/App.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 changes: 139 additions & 42 deletions Crunchyroll Downloader/Main.vb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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"

Expand Down Expand Up @@ -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("\\", "\")
Expand Down
4 changes: 2 additions & 2 deletions Crunchyroll Downloader/My Project/AssemblyInfo.vb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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")>
Loading

0 comments on commit bd2eaca

Please sign in to comment.