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

clean-up 'Legacy code'

Browse Source 
clean-up 'Legacy code'
This commit is contained in:
hama3254 2022-12-29 11:45:55 +01:00
parent 586a12d94d
commit e195c7d9c8
11 changed files with 327 additions and 479 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.

122
Crunchyroll Downloader/CRD-Classes.vb Normal file
View File

@ -0,0 +1,122 @@
Public Class CRD_Classes
End Class
#Region "funimation"
Public Class FunimationOverview
Public ID As String
Public Title As String
Public Slug As String
Public Sub New(ByVal Slug As String, ByVal ID As String, ByVal Title As String)
Me.ID = ID
Me.Title = Title
Me.Slug = Slug
End Sub
Public Overrides Function ToString() As String
Return String.Format("{0}, {1}, {2}", Me.Slug, Me.ID, Me.Title)
End Function
End Class
Public Class FunimationSubs
Public LangugageCode As String
Public Url As String
Public Format As String
Public Sub New(ByVal LangugageCode As String, ByVal Format As String, ByVal Url As String)
Me.Url = Url
Me.LangugageCode = LangugageCode
Me.Format = Format
End Sub
Public Overrides Function ToString() As String
Return String.Format("{0}, {1}, {2}", Me.LangugageCode, Me.Format, Me.Url)
End Function
End Class
Public Class FunimationStream
Public audioLanguage As String
Public Url As String
Public version As String
Public Primary As Boolean
Public Sub New(ByVal audioLanguage As String, ByVal version As String, ByVal Url As String, ByVal Primary As Boolean)
Me.Primary = Primary
Me.Url = Url
Me.audioLanguage = audioLanguage
Me.version = version
End Sub
Public Overrides Function ToString() As String
Return String.Format("{0}, {1}, {2}", Me.audioLanguage, Me.version, Me.Url)
End Function
End Class
#End Region
#Region "CR"
Public Class CR_Beta_Stream
'Public audioLanguage As String
Public Url As String
Public subLang As String
Public Format As String
'ByVal audioLanguage As String,
Public Sub New(ByVal subLang As String, ByVal Format As String, ByVal Url As String)
Me.subLang = subLang
Me.Url = Url
'Me.audioLanguage = audioLanguage
Me.Format = Format
End Sub
'Me.audioLanguage,
Public Overrides Function ToString() As String
Return String.Format("{0}, {1}, {2}", Me.subLang, Me.Format, Me.Url)
End Function
End Class
Public Class UrlJson
Public Url As String
Public Content As String
Public Sub New(ByVal Url As String, ByVal Content As String)
Me.Url = Url
Me.Content = Content
End Sub
Public Overrides Function ToString() As String
Return String.Format("{0}, {1}", Me.Url, Me.Content)
End Function
End Class
#End Region
Public Class ServerResponse
Public Type As String
Public Content As String
Public Sub New(ByVal Content As String, ByVal Type As String)
Me.Content = Content
Me.Type = Type
End Sub
Public Overrides Function ToString() As String
Return String.Format("{0}, {1}", Me.Content, Me.Type)
End Function
End Class
Public Class NameValuePair
Public Name As String
Public CR_Value As String
Public FM_Value As String
Public Sub New(ByVal Name As String, ByVal CR_Value As String, ByVal FM_Value As String)
Me.Name = Name
Me.CR_Value = CR_Value
Me.FM_Value = FM_Value
End Sub
Public Overrides Function ToString() As String
Return String.Format("{0}, {1}", Me.Name, Me.CR_Value, Me.FM_Value)
End Function
End Class

2
Crunchyroll Downloader/CRD_List_Item.Designer.vb generated
View File

@ -31,7 +31,6 @@ Partial Class CRD_List_Item
Me.Label_Reso = New MetroFramework.Controls.MetroLabel() Me.Label_Reso = New MetroFramework.Controls.MetroLabel()
Me.Label_Hardsub = New MetroFramework.Controls.MetroLabel() Me.Label_Hardsub = New MetroFramework.Controls.MetroLabel()
Me.Label_percent = New MetroFramework.Controls.MetroLabel() Me.Label_percent = New MetroFramework.Controls.MetroLabel()
Me.ToolTip1 = New System.Windows.Forms.ToolTip(Me.components)
Me.Timer2 = New System.Windows.Forms.Timer(Me.components) Me.Timer2 = New System.Windows.Forms.Timer(Me.components)
Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components)
Me.ViewInExplorerToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ViewInExplorerToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
@ -230,7 +229,6 @@ Partial Class CRD_List_Item
Friend WithEvents PB_Thumbnail As PictureBox Friend WithEvents PB_Thumbnail As PictureBox
Friend WithEvents bt_pause As PictureBox Friend WithEvents bt_pause As PictureBox
Friend WithEvents bt_del As PictureBox Friend WithEvents bt_del As PictureBox
Friend WithEvents ToolTip1 As ToolTip
Friend WithEvents Timer2 As Timer Friend WithEvents Timer2 As Timer
Friend WithEvents ContextMenuStrip1 As ContextMenuStrip Friend WithEvents ContextMenuStrip1 As ContextMenuStrip
Friend WithEvents ViewInExplorerToolStripMenuItem As ToolStripMenuItem Friend WithEvents ViewInExplorerToolStripMenuItem As ToolStripMenuItem

3
Crunchyroll Downloader/CRD_List_Item.resx
View File

@ -117,9 +117,6 @@
<resheader name="writer"> <resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader> </resheader>
<metadata name="ToolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>19, 12</value>
</metadata>
<metadata name="Timer2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="Timer2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>119, 14</value> <value>119, 14</value>
</metadata> </metadata>

21
Crunchyroll Downloader/CRD_List_Item.vb
View File

@ -406,33 +406,12 @@ Public Class CRD_List_Item
End If End If
End Sub End Sub
Public Sub SetToolTip(ByVal Text As String)
ToolTip1.SetToolTip(Me, Text)
End Sub
Private Sub Item_Load(sender As Object, e As EventArgs) Handles MyBase.Load Private Sub Item_Load(sender As Object, e As EventArgs) Handles MyBase.Load
Me.ContextMenuStrip = ContextMenuStrip1 '.ContextMenu Me.ContextMenuStrip = ContextMenuStrip1 '.ContextMenu
If Threads < 2 Then If Threads < 2 Then
Threads = 2 Threads = 2
End If End If
'bt_del.SetBounds(775, 10, 35, 29)
'bt_pause.SetBounds(740, 15, 25, 20)
'PB_Thumbnail.SetBounds(11, 20, 168, 95)
'PB_Thumbnail.BringToFront()
'Label_website.Location = New Point(195, 15)
'Label_Anime.Location = New Point(195, 37)
'Label_Reso.Location = New Point(195, 97)
'Label_Hardsub.Location = New Point(265, 97)
'Label_percent.SetBounds(432, 97, 378, 27)
'Label_percent.AutoSize = False
'ProgressBar1.SetBounds(195, 70, 601, 20)
'PictureBox5.Location = New Point(0, 136)
'PictureBox5.Height = 6
'MetroStyleManager1.Theme = Main.Manager.Theme
End Sub End Sub
Public Function GetTextBound() As Rectangle Public Function GetTextBound() As Rectangle

1
Crunchyroll Downloader/Crunchyroll Downloader.vbproj
View File

@ -149,6 +149,7 @@
<Import Include="System.Threading.Tasks" /> <Import Include="System.Threading.Tasks" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="CRD-Classes.vb" />
<Compile Include="Settings.vb" /> <Compile Include="Settings.vb" />
<Compile Include="Trackbar.Designer.vb"> <Compile Include="Trackbar.Designer.vb">
<DependentUpon>Trackbar.vb</DependentUpon> <DependentUpon>Trackbar.vb</DependentUpon>

385
Crunchyroll Downloader/Main.vb
View File

@ -111,7 +111,8 @@ Public Class Main
Public ResoSave As String = "6666x6666" Public ResoSave As String = "6666x6666"
Public ResoFunBackup As String = "6666x6666" Public ResoFunBackup As String = "6666x6666"
Public SubSprache As String Public SubSprache As NameValuePair
Public SubSpracheEnum As New List(Of NameValuePair)
Public SoftSubs As New List(Of String) Public SoftSubs As New List(Of String)
Public IncludeLangName As Boolean = False Public IncludeLangName As Boolean = False
Public LangNameType As Integer = 0 Public LangNameType As Integer = 0
@ -181,7 +182,7 @@ Public Class Main
Public LabelResoNotFoundText As String = "resolution not found" + vbNewLine + "Select another one below" Public LabelResoNotFoundText As String = "resolution not found" + vbNewLine + "Select another one below"
Public LabelLangNotFoundText As String = "subtitle language not found" + vbNewLine + "Select another one below" Public LabelLangNotFoundText As String = "subtitle language not found" + vbNewLine + "Select another one below"
Public ButtonResoNotFoundText As String = "Submit" Public ButtonResoNotFoundText As String = "Submit"
Public CB_SuB_Nothing As String = "[ null ]" 'Public CB_SuB_Nothing As String = "[ null ]"
Dim StatusToolTip As ToolTip = New ToolTip() Dim StatusToolTip As ToolTip = New ToolTip()
Dim StatusToolTipText As String Dim StatusToolTipText As String
@ -388,7 +389,7 @@ Public Class Main
Private Sub Main_Load(sender As Object, e As EventArgs) Handles MyBase.Load Private Sub Main_Load(sender As Object, e As EventArgs) Handles MyBase.Load
' '
FillArray()
#Region "settings path" #Region "settings path"
Dim mySettings As New DirectorySettings Dim mySettings As New DirectorySettings
@ -484,7 +485,15 @@ Public Class Main
LeadingZero = My.Settings.LeadingZero LeadingZero = My.Settings.LeadingZero
SubSprache = My.Settings.Subtitle SubSprache = SubSpracheEnum(0)
For i As Integer = 0 To SubSpracheEnum.Count - 1
If SubSpracheEnum(i).CR_Value = My.Settings.Subtitle Then
'MsgBox(My.Settings.Subtitle)
SubSprache = SubSpracheEnum(i)
Exit For
End If
Next
Funimation_Bitrate = My.Settings.Funimation_Bitrate Funimation_Bitrate = My.Settings.Funimation_Bitrate
@ -564,17 +573,17 @@ Public Class Main
Public Sub ListItemAdd(ByVal NameKomplett As String, ByVal NameP1 As String, ByVal NameP2 As String, ByVal Reso As String, ByVal HardSub As String, ByVal SoftSubs As String, ByVal ThumbnialURL As String, ByVal URL_DL As String, ByVal Pfad_DL As String, Optional Service As String = "CR") ', ByVal AudioLang As String) Public Sub ListItemAdd(ByVal NameKomplett As String, ByVal NameP1 As String, ByVal NameP2 As String, ByVal Reso As String, ByVal HardSub As String, ByVal ThumbnialURL As String, ByVal URL_DL As String, ByVal Pfad_DL As String, Optional Service As String = "CR") ', ByVal AudioLang As String)
'With ListView1.Items.Add("0") 'With ListView1.Items.Add("0")
'For i As Integer = 0 To 10 'For i As Integer = 0 To 10
ItemConstructor(NameKomplett, NameP1, NameP2, Reso, HardSub, SoftSubs, ThumbnialURL, URL_DL, Pfad_DL, Service) ItemConstructor(NameKomplett, NameP1, NameP2, Reso, HardSub, ThumbnialURL, URL_DL, Pfad_DL, Service)
'Next 'Next
'End With 'End With
End Sub End Sub
Public Sub ItemConstructor(ByVal NameKomplett As String, ByVal NameP1 As String, ByVal NameP2 As String, ByVal DisplayReso As String, ByVal HardSub As String, ByVal SoftSubs As String, ByVal ThumbnialURL As String, ByVal URL_DL As String, ByVal Pfad_DL As String, ByVal Service As String) Public Sub ItemConstructor(ByVal NameKomplett As String, ByVal NameP1 As String, ByVal NameP2 As String, ByVal DisplayReso As String, ByVal HardSub As String, ByVal ThumbnialURL As String, ByVal URL_DL As String, ByVal Pfad_DL As String, ByVal Service As String)
Dim Item As New CRD_List_Item Dim Item As New CRD_List_Item
Item.Visible = False Item.Visible = False
@ -589,7 +598,6 @@ Public Class Main
Item.SetLabelHardsub(HardSub) Item.SetLabelHardsub(HardSub)
Item.SetThumbnailImage(ThumbnialURL) Item.SetThumbnailImage(ThumbnialURL)
Item.SetLabelPercent("0%") Item.SetLabelPercent("0%")
Item.SetToolTip("Softsubs: " + SoftSubs)
Item.SetCache(KeepCache) Item.SetCache(KeepCache)
Item.SetMergeSubstoMP4(MergeSubs) Item.SetMergeSubstoMP4(MergeSubs)
Item.SetDebug2(Debug2) Item.SetDebug2(Debug2)
@ -637,107 +645,7 @@ Public Class Main
#End Region #End Region
#Region "Sub to display" #Region "Sub to display"
Public Function SubValuesToDisplay() As String
Try
Dim deDE As Boolean = False
Dim enUS As Boolean = False
Dim ptBR As Boolean = False
Dim esLA As Boolean = False
Dim frFR As Boolean = False
Dim arME As Boolean = False
Dim ruRU As Boolean = False
Dim itIT As Boolean = False
Dim esES As Boolean = False
Dim ListReturn As String = Nothing
For i As Integer = 0 To SoftSubs.Count - 1
If SoftSubs(i) = "deDE" Then
deDE = True
ElseIf SoftSubs(i) = "enUS" Then
enUS = True
ElseIf SoftSubs(i) = "ptBR" Then
ptBR = True
ElseIf SoftSubs(i) = "esLA" Then
esLA = True
ElseIf SoftSubs(i) = "frFR" Then
frFR = True
ElseIf SoftSubs(i) = "arME" Then
arME = True
ElseIf SoftSubs(i) = "ruRU" Then
ruRU = True
ElseIf SoftSubs(i) = "itIT" Then
itIT = True
ElseIf SoftSubs(i) = "esES" Then
esES = True
End If
Next
If deDE = True Then
If ListReturn = Nothing Then
ListReturn = "Deutsch"
Else
ListReturn = ListReturn + ", Deutsch"
End If
End If
If enUS = True Then
If ListReturn = Nothing Then
ListReturn = "English"
Else
ListReturn = ListReturn + ", English"
End If
End If
If esLA = True Then
If ListReturn = Nothing Then
ListReturn = "Español (LA)"
Else
ListReturn = ListReturn + ", Español (LA)"
End If
End If
If ptBR = True Then
If ListReturn = Nothing Then
ListReturn = "Português (Brasil)"
Else
ListReturn = ListReturn + ", Português (Brasil)"
End If
End If
If frFR = True Then
If ListReturn = Nothing Then
ListReturn = "Français (France)"
Else
ListReturn = ListReturn + ", Français (France)"
End If
End If
If arME = True Then
If ListReturn = Nothing Then
ListReturn = "العربية (Arabic)"
Else
ListReturn = ListReturn + ", العربية (Arabic)"
End If
End If
If ruRU = True Then
If ListReturn = Nothing Then
ListReturn = "Русский (Russian)"
Else
ListReturn = ListReturn + ", Русский (Russian)"
End If
End If
If itIT = True Then
If ListReturn = Nothing Then
ListReturn = "Italiano (Italian)"
Else
ListReturn = ListReturn + ", Italiano (Italian)"
End If
End If
If esES = True Then
If ListReturn = Nothing Then
ListReturn = "Español (España)"
Else
ListReturn = ListReturn + ", Español (España)"
End If
End If
Return ListReturn
Catch ex As Exception
Return Nothing
End Try
End Function
Public Function GetSubFileLangName(ByVal HardSub As String) As String Public Function GetSubFileLangName(ByVal HardSub As String) As String
@ -755,58 +663,40 @@ Public Class Main
End Function End Function
Public Function HardSubValuesToDisplay(ByVal HardSub As String) As String Public Function HardSubValuesToDisplay(ByVal HardSub As String) As String
Try
HardSub = HardSub.Replace(Chr(34), "") For i As Integer = 0 To SubSpracheEnum.Count - 1
If HardSub = "deDE" Or HardSub = "de-DE" Then If SubSpracheEnum(i).CR_Value = HardSub Or SubSpracheEnum(i).FM_Value = HardSub Then
Return "Deutsch" Return SubSpracheEnum(i).Name
ElseIf HardSub = "enUS" Or HardSub = "en" Or HardSub = "en-US" Then Exit Function
Return "English"
ElseIf HardSub = "ptBR" Or HardSub = "pt" Or HardSub = "pt-BR" Then
Return "Português (Brasil)"
ElseIf HardSub = "esLA" Or HardSub = "es" Or HardSub = "es-LA" Then
Return "Español (LA)"
ElseIf HardSub = "es-419" Then
Return "Español"
ElseIf HardSub = "frFR" Or HardSub = "fr-FR" Then
Return "Français (France)"
ElseIf HardSub = "arME" Or HardSub = "ar-ME" Then
Return "العربية (Arabic)"
ElseIf HardSub = "ruRU" Or HardSub = "ru-RU" Then
Return "Русский (Russian)"
ElseIf HardSub = "itIT" Or HardSub = "it-IT" Then
Return "Italiano (Italian)"
ElseIf HardSub = "esES" Or HardSub = "es-ES" Then
Return "Español (España)"
ElseIf HardSub = "jaJP" Or HardSub = "ja-JP" Then
Return "Japanese"
Else
Return CB_SuB_Nothing
End If End If
Catch ex As Exception Next
Return Nothing
End Try Return "Error"
End Function End Function
Public Function CCtoMP4CC(ByVal HardSub As String) As String Public Function CCtoMP4CC(ByVal HardSub As String) As String
Try Try
If HardSub = "deDE" Or HardSub = "de-DE" Then If HardSub = "de-DE" Then
Return "ger" Return "ger"
ElseIf HardSub = "enUS" Or HardSub = "en-US" Or HardSub = "en" Then ElseIf HardSub = "en-US" Or HardSub = "en" Then
Return "eng" Return "eng"
ElseIf HardSub = "ptBR" Or HardSub = "pt-BR" Or HardSub = "pt" Then ElseIf HardSub = "pt-BR" Or HardSub = "pt" Then
Return "por" Return "por"
ElseIf HardSub = "esLA" Or HardSub = "es-LA" Or HardSub = "es" Or HardSub = "es-419" Then ElseIf HardSub = "es" Or HardSub = "es-419" Then
Return "spa" Return "spa"
ElseIf HardSub = "frFR" Or HardSub = "fr-FR" Then ElseIf HardSub = "fr-FR" Then
Return "fre" Return "fre"
ElseIf HardSub = "arME" Or HardSub = "ar-ME" Then ElseIf HardSub = "ar-ME" Then
Return "ara" Return "ara"
ElseIf HardSub = "ruRU" Or HardSub = "ru-RU" Then ElseIf HardSub = "ru-RU" Then
Return "rus" Return "rus"
ElseIf HardSub = "itIT" Or HardSub = "it-IT" Then ElseIf HardSub = "it-IT" Then
Return "ita" Return "ita"
ElseIf HardSub = "esES" Or HardSub = "es-ES" Then ElseIf HardSub = "es-ES" Then
Return "spa" Return "spa"
ElseIf HardSub = "jaJP" Or HardSub = "ja-JP" Then ElseIf HardSub = "ja-JP" Then
Return "jpn" Return "jpn"
Else Else
Return "chi" Return "chi"
@ -1588,13 +1478,13 @@ Public Class Main
Debug.WriteLine("VideoStreams: " + Streams) Debug.WriteLine("VideoStreams: " + Streams)
Dim CR_HardSubLang As String = ConvertCC(SubSprache) Dim CR_HardSubLang As String = SubSprache.CR_Value
#End Region #End Region
#Region "Download softsub file or build ffmpeg cmd" #Region "Download softsub file or build ffmpeg cmd"
Dim SoftSubs2 As New List(Of String) Dim SoftSubs2 As New List(Of String)
If SoftSubs.Count > 0 Then If SoftSubs.Count > 0 Then
For i As Integer = 0 To SoftSubs.Count - 1 For i As Integer = 0 To SoftSubs.Count - 1
If CBool(InStr(VideoJson, Chr(34) + "locale" + Chr(34) + ":" + Chr(34) + ConvertCC(SoftSubs(i)) + Chr(34) + "," + Chr(34) + "url" + Chr(34) + ":" + Chr(34))) Then If CBool(InStr(VideoJson, Chr(34) + "locale" + Chr(34) + ":" + Chr(34) + SoftSubs(i) + Chr(34) + "," + Chr(34) + "url" + Chr(34) + ":" + Chr(34))) Then
SoftSubs2.Add(SoftSubs(i)) SoftSubs2.Add(SoftSubs(i))
Else Else
' '
@ -1620,7 +1510,7 @@ Public Class Main
If SoftSubs2(i) = DefaultSubCR Then If SoftSubs2(i) = DefaultSubCR Then
DispositionIndex = i DispositionIndex = i
End If End If
Dim SoftSub As String() = VideoJson.Split(New String() {Chr(34) + "locale" + Chr(34) + ":" + Chr(34) + ConvertCC(SoftSubs2(i)) + Chr(34) + "," + Chr(34) + "url" + Chr(34) + ":" + Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries) Dim SoftSub As String() = VideoJson.Split(New String() {Chr(34) + "locale" + Chr(34) + ":" + Chr(34) + SoftSubs2(i) + Chr(34) + "," + Chr(34) + "url" + Chr(34) + ":" + Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries)
Dim SoftSub_2 As String() = SoftSub(1).Split(New [Char]() {Chr(34)}) Dim SoftSub_2 As String() = SoftSub(1).Split(New [Char]() {Chr(34)})
Dim SoftSub_3 As String = SoftSub_2(0).Replace("&amp;", "&").Replace("/u0026", "&").Replace("\u002F", "/").Replace("\u0026", "&") Dim SoftSub_3 As String = SoftSub_2(0).Replace("&amp;", "&").Replace("/u0026", "&").Replace("\u002F", "/").Replace("\u0026", "&")
If SoftSubMergeURLs = Nothing Then If SoftSubMergeURLs = Nothing Then
@ -1650,7 +1540,7 @@ Public Class Main
Me.Invalidate() Me.Invalidate()
Return Nothing Return Nothing
End Function)) End Function))
Dim SoftSub As String() = VideoJson.Split(New String() {Chr(34) + "locale" + Chr(34) + ":" + Chr(34) + ConvertCC(SoftSubs2(i)) + Chr(34) + "," + Chr(34) + "url" + Chr(34) + ":" + Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries) Dim SoftSub As String() = VideoJson.Split(New String() {Chr(34) + "locale" + Chr(34) + ":" + Chr(34) + SoftSubs2(i) + Chr(34) + "," + Chr(34) + "url" + Chr(34) + ":" + Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries)
Dim SoftSub_2 As String() = SoftSub(1).Split(New [Char]() {Chr(34)}) Dim SoftSub_2 As String() = SoftSub(1).Split(New [Char]() {Chr(34)})
Dim SoftSub_3 As String = SoftSub_2(0).Replace("&amp;", "&").Replace("/u0026", "&").Replace("\u002F", "/").Replace("\u0026", "&") Dim SoftSub_3 As String = SoftSub_2(0).Replace("&amp;", "&").Replace("/u0026", "&").Replace("\u002F", "/").Replace("\u0026", "&")
'MsgBox(SoftSub_3) 'MsgBox(SoftSub_3)
@ -1975,7 +1865,7 @@ Public Class Main
Me.Invoke(New Action(Function() As Object Me.Invoke(New Action(Function() As Object
ListItemAdd(Path.GetFileName(Pfad_DL.Replace(Chr(34), "")), L1Name, L2Name, ResoHTMLDisplay, SubType_Value, SubValuesToDisplay(), thumbnail3, URL_DL, Pfad_DL) ListItemAdd(Path.GetFileName(Pfad_DL.Replace(Chr(34), "")), L1Name, L2Name, ResoHTMLDisplay, SubType_Value, thumbnail3, URL_DL, Pfad_DL)
Return Nothing Return Nothing
End Function)) End Function))
'liList.Add(My.Resources.htmlvorThumbnail + thumbnail3 + My.Resources.htmlnachTumbnail + CR_title + " <br> " + CR_season_number + " " + CR_episode + My.Resources.htmlvorAufloesung + ResoHTMLDisplay + My.Resources.htmlvorSoftSubs + vbNewLine + SubValuesToDisplay() + My.Resources.htmlvorHardSubs + Subsprache3 + My.Resources.htmlnachHardSubs + "<!-- " + L2Name + "-->") 'liList.Add(My.Resources.htmlvorThumbnail + thumbnail3 + My.Resources.htmlnachTumbnail + CR_title + " <br> " + CR_season_number + " " + CR_episode + My.Resources.htmlvorAufloesung + ResoHTMLDisplay + My.Resources.htmlvorSoftSubs + vbNewLine + SubValuesToDisplay() + My.Resources.htmlvorHardSubs + Subsprache3 + My.Resources.htmlnachHardSubs + "<!-- " + L2Name + "-->")
@ -1999,7 +1889,7 @@ Public Class Main
End Function)) End Function))
Grapp_RDY = True Grapp_RDY = True
If CBool(InStr(ex.ToString, "Could not find the sub language")) Then If CBool(InStr(ex.ToString, "Could not find the sub language")) Then
MsgBox(Sub_language_NotFound + SubSprache) MsgBox(Sub_language_NotFound + SubSprache.Name)
ElseIf CBool(InStr(ex.ToString, "RESOLUTION Not Found")) Then ElseIf CBool(InStr(ex.ToString, "RESOLUTION Not Found")) Then
MsgBox(Resolution_NotFound) MsgBox(Resolution_NotFound)
ElseIf CBool(InStr(ex.ToString, "Premium Episode")) Then ElseIf CBool(InStr(ex.ToString, "Premium Episode")) Then
@ -2043,41 +1933,41 @@ Public Class Main
Return Nothing Return Nothing
End Try End Try
End Function End Function
Function ConvertCC(ByVal CC As String) As String 'Function ConvertCC(ByVal CC As String) As String
Try ' Try
If CC = "deDE" Then ' If CC = "deDE" Then
Return "de-DE" ' Return "de-DE"
ElseIf CC = "enUS" Then ' ElseIf CC = "enUS" Then
Return "en-US" ' Return "en-US"
ElseIf CC = "ptBR" Then ' ElseIf CC = "ptBR" Then
Return "pt-BR" ' Return "pt-BR"
ElseIf CC = "esLA" Then ' ElseIf CC = "esLA" Then
Return "es-LA" ' Return "es-LA"
ElseIf CC = "es-419" Then ' ElseIf CC = "es-419" Then
Return "es-419" ' Return "es-419"
ElseIf CC = "frFR" Then ' ElseIf CC = "frFR" Then
Return "fr-FR" ' Return "fr-FR"
ElseIf CC = "arME" Then ' ElseIf CC = "arME" Then
Return "ar-ME" ' Return "ar-ME"
ElseIf CC = "ar-SA" Then ' ElseIf CC = "ar-SA" Then
Return "ar-SA" ' Return "ar-SA"
ElseIf CC = "ruRU" Then ' ElseIf CC = "ruRU" Then
Return "ru-RU" ' Return "ru-RU"
ElseIf CC = "itIT" Then ' ElseIf CC = "itIT" Then
Return "it-IT" ' Return "it-IT"
ElseIf CC = "esES" Then ' ElseIf CC = "esES" Then
Return "es-ES" ' Return "es-ES"
ElseIf CC = "jaJP" Then ' ElseIf CC = "jaJP" Then
Return "ja-JP" ' Return "ja-JP"
ElseIf CC = "None" Then ' ElseIf CC = "None" Then
Return "" ' Return ""
Else ' Else
Return CB_SuB_Nothing ' Return CB_SuB_Nothing
End If ' End If
Catch ex As Exception ' Catch ex As Exception
Return Nothing ' Return Nothing
End Try ' End Try
End Function 'End Function
#End Region #End Region
Private Sub Btn_Close_Click(sender As Object, e As EventArgs) Handles Btn_Close.Click Private Sub Btn_Close_Click(sender As Object, e As EventArgs) Handles Btn_Close.Click
@ -2165,7 +2055,7 @@ Public Class Main
Next Next
reader.Close() reader.Close()
Me.Invoke(New Action(Function() As Object Me.Invoke(New Action(Function() As Object
ListItemAdd(Filename, L1Name, L2Name, ResoHTMLDisplay, Subsprache3, SubValuesToDisplay(), thumbnail3, URL2, Pfad2) ListItemAdd(Filename, L1Name, L2Name, ResoHTMLDisplay, Subsprache3, thumbnail3, URL2, Pfad2)
Return Nothing Return Nothing
End Function)) End Function))
' liList.Add(My.Resources.htmlvorThumbnail + thumbnail3 + My.Resources.htmlnachTumbnail + L1Name + " <br> " + L2Name + My.Resources.htmlvorAufloesung + ResoHTMLDisplay + My.Resources.htmlvorSoftSubs + vbNewLine + SubValuesToDisplay() + My.Resources.htmlvorHardSubs + Subsprache3 + My.Resources.htmlnachHardSubs + "<!-- " + L2Name + "-->") ' liList.Add(My.Resources.htmlvorThumbnail + thumbnail3 + My.Resources.htmlnachTumbnail + L1Name + " <br> " + L2Name + My.Resources.htmlvorAufloesung + ResoHTMLDisplay + My.Resources.htmlvorSoftSubs + vbNewLine + SubValuesToDisplay() + My.Resources.htmlvorHardSubs + Subsprache3 + My.Resources.htmlnachHardSubs + "<!-- " + L2Name + "-->")
@ -3346,7 +3236,7 @@ Public Class Main
Dim L1Name_Split As String() = WebbrowserURL.Split(New String() {"/"}, System.StringSplitOptions.RemoveEmptyEntries) Dim L1Name_Split As String() = WebbrowserURL.Split(New String() {"/"}, System.StringSplitOptions.RemoveEmptyEntries)
Dim L1Name As String = L1Name_Split(1).Replace("www.", "") + " | Dub : " + FunimationDub Dim L1Name As String = L1Name_Split(1).Replace("www.", "") + " | Dub : " + FunimationDub
Me.Invoke(New Action(Function() As Object Me.Invoke(New Action(Function() As Object
ListItemAdd(Pfad_DL, L1Name, DefaultName, ResoHTMLDisplay, Funimation_m3u8_MainVersion, SubValuesToDisplay(), thumbnail4, Funimation_m3u8_final, DownloadPfad, "FM") ListItemAdd(Pfad_DL, L1Name, DefaultName, ResoHTMLDisplay, Funimation_m3u8_MainVersion, thumbnail4, Funimation_m3u8_final, DownloadPfad, "FM")
Return Nothing Return Nothing
End Function)) End Function))
'liList.Add(My.Resources.htmlvorThumbnail + thumbnail4 + My.Resources.htmlnachTumbnail + FunimationTitle + " <br> " + FunimationSeason + " " + FunimationEpisode + My.Resources.htmlvorAufloesung + ResoHTMLDisplay + My.Resources.htmlvorSoftSubs + vbNewLine + SubValuesToDisplay() + My.Resources.htmlvorHardSubs + "null" + My.Resources.htmlnachHardSubs + "<!-- " + DefaultName + "-->") 'liList.Add(My.Resources.htmlvorThumbnail + thumbnail4 + My.Resources.htmlnachTumbnail + FunimationTitle + " <br> " + FunimationSeason + " " + FunimationEpisode + My.Resources.htmlvorAufloesung + ResoHTMLDisplay + My.Resources.htmlvorSoftSubs + vbNewLine + SubValuesToDisplay() + My.Resources.htmlvorHardSubs + "null" + My.Resources.htmlnachHardSubs + "<!-- " + DefaultName + "-->")
@ -4385,115 +4275,32 @@ Public Class Main
End Sub End Sub
#End Region
#Region "enum"
Sub FillArray() '
SubSpracheEnum.Add(New NameValuePair("[ null ]", "None", Nothing))
SubSpracheEnum.Add(New NameValuePair("Deutsch", "de-DE", Nothing))
SubSpracheEnum.Add(New NameValuePair("English", "en-US", "en"))
SubSpracheEnum.Add(New NameValuePair("Português (Brasil)", "pt-BR", "pt"))
SubSpracheEnum.Add(New NameValuePair("Español (LA)", "es-419", "es"))
SubSpracheEnum.Add(New NameValuePair("Français (France)", "fr-FR", Nothing))
SubSpracheEnum.Add(New NameValuePair("العربية (Arabic)", "ar-ME", Nothing))
SubSpracheEnum.Add(New NameValuePair("Русский (Russian)", "ru-RU", Nothing))
SubSpracheEnum.Add(New NameValuePair("Italiano (Italian)", "it-IT", Nothing))
SubSpracheEnum.Add(New NameValuePair("Español (España)", "es-ES", Nothing))
SubSpracheEnum.Add(New NameValuePair("Japanese", "ja-JP", Nothing))
End Sub
#End Region #End Region
End Class
Public Class FunimationOverview
Public ID As String
Public Title As String
Public Slug As String
Public Sub New(ByVal Slug As String, ByVal ID As String, ByVal Title As String)
Me.ID = ID
Me.Title = Title
Me.Slug = Slug
End Sub
Public Overrides Function ToString() As String
Return String.Format("{0}, {1}, {2}", Me.Slug, Me.ID, Me.Title)
End Function
End Class
Public Class FunimationSubs
Public LangugageCode As String
Public Url As String
Public Format As String
Public Sub New(ByVal LangugageCode As String, ByVal Format As String, ByVal Url As String)
Me.Url = Url
Me.LangugageCode = LangugageCode
Me.Format = Format
End Sub
Public Overrides Function ToString() As String
Return String.Format("{0}, {1}, {2}", Me.LangugageCode, Me.Format, Me.Url)
End Function
End Class
Public Class FunimationStream
Public audioLanguage As String
Public Url As String
Public version As String
Public Primary As Boolean
Public Sub New(ByVal audioLanguage As String, ByVal version As String, ByVal Url As String, ByVal Primary As Boolean)
Me.Primary = Primary
Me.Url = Url
Me.audioLanguage = audioLanguage
Me.version = version
End Sub
Public Overrides Function ToString() As String
Return String.Format("{0}, {1}, {2}", Me.audioLanguage, Me.version, Me.Url)
End Function
End Class
Public Class CR_Beta_Stream
'Public audioLanguage As String
Public Url As String
Public subLang As String
Public Format As String
'ByVal audioLanguage As String,
Public Sub New(ByVal subLang As String, ByVal Format As String, ByVal Url As String)
Me.subLang = subLang
Me.Url = Url
'Me.audioLanguage = audioLanguage
Me.Format = Format
End Sub
'Me.audioLanguage,
Public Overrides Function ToString() As String
Return String.Format("{0}, {1}, {2}", Me.subLang, Me.Format, Me.Url)
End Function
End Class End Class
Public Class UrlJson
Public Url As String
Public Content As String
Public Sub New(ByVal Url As String, ByVal Content As String)
Me.Url = Url
Me.Content = Content
End Sub
Public Overrides Function ToString() As String
Return String.Format("{0}, {1}", Me.Url, Me.Content)
End Function
End Class
Public Class ServerResponse
Public Type As String
Public Content As String
Public Sub New(ByVal Content As String, ByVal Type As String)
Me.Content = Content
Me.Type = Type
End Sub
Public Overrides Function ToString() As String
Return String.Format("{0}, {1}", Me.Content, Me.Type)
End Function
End Class

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

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

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

@ -39,7 +39,7 @@ Partial Class Einstellungen
Me.CBdeDE = New MetroFramework.Controls.MetroCheckBox() Me.CBdeDE = New MetroFramework.Controls.MetroCheckBox()
Me.CBenUS = New MetroFramework.Controls.MetroCheckBox() Me.CBenUS = New MetroFramework.Controls.MetroCheckBox()
Me.GB_SubLanguage = New System.Windows.Forms.GroupBox() Me.GB_SubLanguage = New System.Windows.Forms.GroupBox()
Me.ComboBox1 = New MetroFramework.Controls.MetroComboBox() Me.CB_CR_Harsubs = New MetroFramework.Controls.MetroComboBox()
Me.TabPage2 = New MetroFramework.Controls.MetroTabPage() Me.TabPage2 = New MetroFramework.Controls.MetroTabPage()
Me.GroupBox18 = New System.Windows.Forms.GroupBox() Me.GroupBox18 = New System.Windows.Forms.GroupBox()
Me.ListViewAdd_True = New MetroFramework.Controls.MetroCheckBox() Me.ListViewAdd_True = New MetroFramework.Controls.MetroCheckBox()
@ -234,7 +234,7 @@ Partial Class Einstellungen
Me.CR_SoftSubDefault.IntegralHeight = False Me.CR_SoftSubDefault.IntegralHeight = False
Me.CR_SoftSubDefault.ItemHeight = 23 Me.CR_SoftSubDefault.ItemHeight = 23
Me.CR_SoftSubDefault.Items.AddRange(New Object() {"[Disabled]"}) Me.CR_SoftSubDefault.Items.AddRange(New Object() {"[Disabled]"})
Me.CR_SoftSubDefault.Location = New System.Drawing.Point(69, 30) Me.CR_SoftSubDefault.Location = New System.Drawing.Point(82, 30)
Me.CR_SoftSubDefault.Name = "CR_SoftSubDefault" Me.CR_SoftSubDefault.Name = "CR_SoftSubDefault"
Me.CR_SoftSubDefault.Size = New System.Drawing.Size(326, 29) Me.CR_SoftSubDefault.Size = New System.Drawing.Size(326, 29)
Me.CR_SoftSubDefault.Sorted = True Me.CR_SoftSubDefault.Sorted = True
@ -266,7 +266,7 @@ Partial Class Einstellungen
Me.CBesES.AutoSize = True Me.CBesES.AutoSize = True
Me.CBesES.FontSize = MetroFramework.MetroCheckBoxSize.Medium Me.CBesES.FontSize = MetroFramework.MetroCheckBoxSize.Medium
Me.CBesES.ForeColor = System.Drawing.Color.Black Me.CBesES.ForeColor = System.Drawing.Color.Black
Me.CBesES.Location = New System.Drawing.Point(156, 73) Me.CBesES.Location = New System.Drawing.Point(164, 73)
Me.CBesES.Name = "CBesES" Me.CBesES.Name = "CBesES"
Me.CBesES.Size = New System.Drawing.Size(127, 19) Me.CBesES.Size = New System.Drawing.Size(127, 19)
Me.CBesES.TabIndex = 25 Me.CBesES.TabIndex = 25
@ -278,7 +278,7 @@ Partial Class Einstellungen
Me.CBitIT.AutoSize = True Me.CBitIT.AutoSize = True
Me.CBitIT.FontSize = MetroFramework.MetroCheckBoxSize.Medium Me.CBitIT.FontSize = MetroFramework.MetroCheckBoxSize.Medium
Me.CBitIT.ForeColor = System.Drawing.Color.Black Me.CBitIT.ForeColor = System.Drawing.Color.Black
Me.CBitIT.Location = New System.Drawing.Point(15, 110) Me.CBitIT.Location = New System.Drawing.Point(24, 110)
Me.CBitIT.Name = "CBitIT" Me.CBitIT.Name = "CBitIT"
Me.CBitIT.Size = New System.Drawing.Size(119, 19) Me.CBitIT.Size = New System.Drawing.Size(119, 19)
Me.CBitIT.TabIndex = 27 Me.CBitIT.TabIndex = 27
@ -290,7 +290,7 @@ Partial Class Einstellungen
Me.CBruRU.AutoSize = True Me.CBruRU.AutoSize = True
Me.CBruRU.FontSize = MetroFramework.MetroCheckBoxSize.Medium Me.CBruRU.FontSize = MetroFramework.MetroCheckBoxSize.Medium
Me.CBruRU.ForeColor = System.Drawing.Color.Black Me.CBruRU.ForeColor = System.Drawing.Color.Black
Me.CBruRU.Location = New System.Drawing.Point(296, 110) Me.CBruRU.Location = New System.Drawing.Point(304, 110)
Me.CBruRU.Name = "CBruRU" Me.CBruRU.Name = "CBruRU"
Me.CBruRU.Size = New System.Drawing.Size(133, 19) Me.CBruRU.Size = New System.Drawing.Size(133, 19)
Me.CBruRU.TabIndex = 29 Me.CBruRU.TabIndex = 29
@ -302,7 +302,7 @@ Partial Class Einstellungen
Me.CBarME.AutoSize = True Me.CBarME.AutoSize = True
Me.CBarME.FontSize = MetroFramework.MetroCheckBoxSize.Medium Me.CBarME.FontSize = MetroFramework.MetroCheckBoxSize.Medium
Me.CBarME.ForeColor = System.Drawing.Color.Black Me.CBarME.ForeColor = System.Drawing.Color.Black
Me.CBarME.Location = New System.Drawing.Point(156, 110) Me.CBarME.Location = New System.Drawing.Point(164, 110)
Me.CBarME.Name = "CBarME" Me.CBarME.Name = "CBarME"
Me.CBarME.Size = New System.Drawing.Size(115, 19) Me.CBarME.Size = New System.Drawing.Size(115, 19)
Me.CBarME.TabIndex = 28 Me.CBarME.TabIndex = 28
@ -314,7 +314,7 @@ Partial Class Einstellungen
Me.CBfrFR.AutoSize = True Me.CBfrFR.AutoSize = True
Me.CBfrFR.FontSize = MetroFramework.MetroCheckBoxSize.Medium Me.CBfrFR.FontSize = MetroFramework.MetroCheckBoxSize.Medium
Me.CBfrFR.ForeColor = System.Drawing.Color.Black Me.CBfrFR.ForeColor = System.Drawing.Color.Black
Me.CBfrFR.Location = New System.Drawing.Point(296, 35) Me.CBfrFR.Location = New System.Drawing.Point(304, 35)
Me.CBfrFR.Name = "CBfrFR" Me.CBfrFR.Name = "CBfrFR"
Me.CBfrFR.Size = New System.Drawing.Size(126, 19) Me.CBfrFR.Size = New System.Drawing.Size(126, 19)
Me.CBfrFR.TabIndex = 23 Me.CBfrFR.TabIndex = 23
@ -326,7 +326,7 @@ Partial Class Einstellungen
Me.CBesLA.AutoSize = True Me.CBesLA.AutoSize = True
Me.CBesLA.FontSize = MetroFramework.MetroCheckBoxSize.Medium Me.CBesLA.FontSize = MetroFramework.MetroCheckBoxSize.Medium
Me.CBesLA.ForeColor = System.Drawing.Color.Black Me.CBesLA.ForeColor = System.Drawing.Color.Black
Me.CBesLA.Location = New System.Drawing.Point(156, 35) Me.CBesLA.Location = New System.Drawing.Point(164, 35)
Me.CBesLA.Name = "CBesLA" Me.CBesLA.Name = "CBesLA"
Me.CBesLA.Size = New System.Drawing.Size(100, 19) Me.CBesLA.Size = New System.Drawing.Size(100, 19)
Me.CBesLA.TabIndex = 22 Me.CBesLA.TabIndex = 22
@ -338,7 +338,7 @@ Partial Class Einstellungen
Me.CBptBR.AutoSize = True Me.CBptBR.AutoSize = True
Me.CBptBR.FontSize = MetroFramework.MetroCheckBoxSize.Medium Me.CBptBR.FontSize = MetroFramework.MetroCheckBoxSize.Medium
Me.CBptBR.ForeColor = System.Drawing.Color.Black Me.CBptBR.ForeColor = System.Drawing.Color.Black
Me.CBptBR.Location = New System.Drawing.Point(296, 73) Me.CBptBR.Location = New System.Drawing.Point(304, 73)
Me.CBptBR.Name = "CBptBR" Me.CBptBR.Name = "CBptBR"
Me.CBptBR.Size = New System.Drawing.Size(131, 19) Me.CBptBR.Size = New System.Drawing.Size(131, 19)
Me.CBptBR.TabIndex = 26 Me.CBptBR.TabIndex = 26
@ -350,7 +350,7 @@ Partial Class Einstellungen
Me.CBdeDE.AutoSize = True Me.CBdeDE.AutoSize = True
Me.CBdeDE.FontSize = MetroFramework.MetroCheckBoxSize.Medium Me.CBdeDE.FontSize = MetroFramework.MetroCheckBoxSize.Medium
Me.CBdeDE.ForeColor = System.Drawing.Color.Black Me.CBdeDE.ForeColor = System.Drawing.Color.Black
Me.CBdeDE.Location = New System.Drawing.Point(15, 73) Me.CBdeDE.Location = New System.Drawing.Point(24, 73)
Me.CBdeDE.Name = "CBdeDE" Me.CBdeDE.Name = "CBdeDE"
Me.CBdeDE.Size = New System.Drawing.Size(75, 19) Me.CBdeDE.Size = New System.Drawing.Size(75, 19)
Me.CBdeDE.TabIndex = 24 Me.CBdeDE.TabIndex = 24
@ -362,7 +362,7 @@ Partial Class Einstellungen
Me.CBenUS.AutoSize = True Me.CBenUS.AutoSize = True
Me.CBenUS.FontSize = MetroFramework.MetroCheckBoxSize.Medium Me.CBenUS.FontSize = MetroFramework.MetroCheckBoxSize.Medium
Me.CBenUS.ForeColor = System.Drawing.Color.Black Me.CBenUS.ForeColor = System.Drawing.Color.Black
Me.CBenUS.Location = New System.Drawing.Point(15, 35) Me.CBenUS.Location = New System.Drawing.Point(24, 35)
Me.CBenUS.Name = "CBenUS" Me.CBenUS.Name = "CBenUS"
Me.CBenUS.Size = New System.Drawing.Size(68, 19) Me.CBenUS.Size = New System.Drawing.Size(68, 19)
Me.CBenUS.TabIndex = 21 Me.CBenUS.TabIndex = 21
@ -372,7 +372,7 @@ Partial Class Einstellungen
'GB_SubLanguage 'GB_SubLanguage
' '
Me.GB_SubLanguage.BackColor = System.Drawing.Color.Transparent Me.GB_SubLanguage.BackColor = System.Drawing.Color.Transparent
Me.GB_SubLanguage.Controls.Add(Me.ComboBox1) Me.GB_SubLanguage.Controls.Add(Me.CB_CR_Harsubs)
Me.GB_SubLanguage.Font = New System.Drawing.Font("Arial", 9.75!) Me.GB_SubLanguage.Font = New System.Drawing.Font("Arial", 9.75!)
Me.GB_SubLanguage.ForeColor = System.Drawing.Color.Black Me.GB_SubLanguage.ForeColor = System.Drawing.Color.Black
Me.GB_SubLanguage.Location = New System.Drawing.Point(5, 74) Me.GB_SubLanguage.Location = New System.Drawing.Point(5, 74)
@ -382,20 +382,18 @@ Partial Class Einstellungen
Me.GB_SubLanguage.TabStop = False Me.GB_SubLanguage.TabStop = False
Me.GB_SubLanguage.Text = "Sub Sprache" Me.GB_SubLanguage.Text = "Sub Sprache"
' '
'ComboBox1 'CB_CR_Harsubs
' '
Me.ComboBox1.DropDownHeight = 250 Me.CB_CR_Harsubs.DropDownHeight = 275
Me.ComboBox1.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.CB_CR_Harsubs.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.ComboBox1.FormattingEnabled = True Me.CB_CR_Harsubs.FormattingEnabled = True
Me.ComboBox1.IntegralHeight = False Me.CB_CR_Harsubs.IntegralHeight = False
Me.ComboBox1.ItemHeight = 23 Me.CB_CR_Harsubs.ItemHeight = 23
Me.ComboBox1.Items.AddRange(New Object() {"Deutsch", "English", "Español (España)", "Español (LA)", "Français (France)", "Italiano (Italian)", "Português (Brasil)", "Русский (Russian)", "العربية (Arabic)"}) Me.CB_CR_Harsubs.Location = New System.Drawing.Point(82, 25)
Me.ComboBox1.Location = New System.Drawing.Point(60, 25) Me.CB_CR_Harsubs.Name = "CB_CR_Harsubs"
Me.ComboBox1.Name = "ComboBox1" Me.CB_CR_Harsubs.Size = New System.Drawing.Size(326, 29)
Me.ComboBox1.Size = New System.Drawing.Size(326, 29) Me.CB_CR_Harsubs.TabIndex = 20
Me.ComboBox1.Sorted = True Me.CB_CR_Harsubs.UseSelectable = True
Me.ComboBox1.TabIndex = 20
Me.ComboBox1.UseSelectable = True
' '
'TabPage2 'TabPage2
' '
@ -1139,9 +1137,9 @@ Partial Class Einstellungen
Me.MetroTabPage2.HorizontalScrollbarBarColor = True Me.MetroTabPage2.HorizontalScrollbarBarColor = True
Me.MetroTabPage2.HorizontalScrollbarHighlightOnWheel = False Me.MetroTabPage2.HorizontalScrollbarHighlightOnWheel = False
Me.MetroTabPage2.HorizontalScrollbarSize = 10 Me.MetroTabPage2.HorizontalScrollbarSize = 10
Me.MetroTabPage2.Location = New System.Drawing.Point(4, 44) Me.MetroTabPage2.Location = New System.Drawing.Point(4, 35)
Me.MetroTabPage2.Name = "MetroTabPage2" Me.MetroTabPage2.Name = "MetroTabPage2"
Me.MetroTabPage2.Size = New System.Drawing.Size(501, 519) Me.MetroTabPage2.Size = New System.Drawing.Size(501, 528)
Me.MetroTabPage2.TabIndex = 8 Me.MetroTabPage2.TabIndex = 8
Me.MetroTabPage2.Text = "Naming" Me.MetroTabPage2.Text = "Naming"
Me.MetroTabPage2.VerticalScrollbarBarColor = True Me.MetroTabPage2.VerticalScrollbarBarColor = True
@ -1642,9 +1640,9 @@ Partial Class Einstellungen
Me.TabPage7.Controls.Add(Me.Label4) Me.TabPage7.Controls.Add(Me.Label4)
Me.TabPage7.Controls.Add(Me.Label6) Me.TabPage7.Controls.Add(Me.Label6)
Me.TabPage7.Controls.Add(Me.Label5) Me.TabPage7.Controls.Add(Me.Label5)
Me.TabPage7.Location = New System.Drawing.Point(4, 44) Me.TabPage7.Location = New System.Drawing.Point(4, 35)
Me.TabPage7.Name = "TabPage7" Me.TabPage7.Name = "TabPage7"
Me.TabPage7.Size = New System.Drawing.Size(501, 519) Me.TabPage7.Size = New System.Drawing.Size(501, 528)
Me.TabPage7.TabIndex = 5 Me.TabPage7.TabIndex = 5
Me.TabPage7.Text = " About " Me.TabPage7.Text = " About "
' '
@ -1925,7 +1923,7 @@ Partial Class Einstellungen
Friend WithEvents MetroLabel1 As MetroFramework.Controls.MetroLabel Friend WithEvents MetroLabel1 As MetroFramework.Controls.MetroLabel
Friend WithEvents DarkMode As MetroFramework.Controls.MetroCheckBox Friend WithEvents DarkMode As MetroFramework.Controls.MetroCheckBox
Friend WithEvents TextBox1 As MetroFramework.Controls.MetroTextBox Friend WithEvents TextBox1 As MetroFramework.Controls.MetroTextBox
Friend WithEvents ComboBox1 As MetroFramework.Controls.MetroComboBox Friend WithEvents CB_CR_Harsubs As MetroFramework.Controls.MetroComboBox
Friend WithEvents CB_Fun_HardSubs As MetroFramework.Controls.MetroComboBox Friend WithEvents CB_Fun_HardSubs As MetroFramework.Controls.MetroComboBox
Friend WithEvents Fun_Dub_Over As MetroFramework.Controls.MetroComboBox Friend WithEvents Fun_Dub_Over As MetroFramework.Controls.MetroComboBox
Public WithEvents LastVersion As MetroFramework.Controls.MetroLabel Public WithEvents LastVersion As MetroFramework.Controls.MetroLabel

3
Crunchyroll Downloader/einstellungen.resx
View File

@ -126,6 +126,9 @@
<metadata name="MenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="MenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>118, 20</value> <value>118, 20</value>
</metadata> </metadata>
<metadata name="MenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>118, 20</value>
</metadata>
<metadata name="BackgroundWorker1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="BackgroundWorker1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>332, 20</value> <value>332, 20</value>
</metadata> </metadata>

159
Crunchyroll Downloader/einstellungen.vb
View File

@ -80,23 +80,23 @@ Public Class Einstellungen
TabControl1.SelectedIndex = 0 TabControl1.SelectedIndex = 0
For i As Integer = 0 To Main.SoftSubs.Count - 1 For i As Integer = 0 To Main.SoftSubs.Count - 1
If Main.SoftSubs(i) = "deDE" Then If Main.SoftSubs(i) = "de-DE" Then
CBdeDE.Checked = True CBdeDE.Checked = True
ElseIf Main.SoftSubs(i) = "enUS" Then ElseIf Main.SoftSubs(i) = "en-US" Then
CBenUS.Checked = True CBenUS.Checked = True
ElseIf Main.SoftSubs(i) = "ptBR" Then ElseIf Main.SoftSubs(i) = "pt-BR" Then
CBptBR.Checked = True CBptBR.Checked = True
ElseIf Main.SoftSubs(i) = "esLA" Then ElseIf Main.SoftSubs(i) = "es-419" Then
CBesLA.Checked = True CBesLA.Checked = True
ElseIf Main.SoftSubs(i) = "frFR" Then ElseIf Main.SoftSubs(i) = "fr-FR" Then
CBfrFR.Checked = True CBfrFR.Checked = True
ElseIf Main.SoftSubs(i) = "arME" Then ElseIf Main.SoftSubs(i) = "ar-ME" Then
CBarME.Checked = True CBarME.Checked = True
ElseIf Main.SoftSubs(i) = "ruRU" Then ElseIf Main.SoftSubs(i) = "ru-RU" Then
CBruRU.Checked = True CBruRU.Checked = True
ElseIf Main.SoftSubs(i) = "itIT" Then ElseIf Main.SoftSubs(i) = "it-IT" Then
CBitIT.Checked = True CBitIT.Checked = True
ElseIf Main.SoftSubs(i) = "esES" Then ElseIf Main.SoftSubs(i) = "es-ES" Then
CBesES.Checked = True CBesES.Checked = True
End If End If
Next Next
@ -214,34 +214,18 @@ Public Class Einstellungen
AAuto.Checked = True AAuto.Checked = True
End If End If
CB_CR_Harsubs.Items.Clear()
If Check_CB() = False Then
ComboBox1.Items.Add(Main.CB_SuB_Nothing) For i As Integer = 0 To Main.SubSpracheEnum.Count - 1
End If CB_CR_Harsubs.Items.Add(Main.SubSpracheEnum(i).Name)
If Main.SubSprache = "deDE" Then If Main.SubSpracheEnum(i).CR_Value = Main.SubSprache.CR_Value Then
ComboBox1.SelectedItem = "Deutsch" 'MsgBox(CB_CR_Harsubs.Items.Count.ToString)
ElseIf Main.SubSprache = "enUS" Then 'MsgBox(i.ToString)
ComboBox1.SelectedItem = "English" CB_CR_Harsubs.SelectedIndex = i
ElseIf Main.SubSprache = "ptBR" Then
ComboBox1.SelectedItem = "Português (Brasil)"
ElseIf Main.SubSprache = "es-419" Then
ComboBox1.SelectedItem = "Español (LA)"
ElseIf Main.SubSprache = "esLA" Then
ComboBox1.SelectedItem = "Español (LA)"
ElseIf Main.SubSprache = "frFR" Then
ComboBox1.SelectedItem = "Français (France)"
ElseIf Main.SubSprache = "arME" Then
ComboBox1.SelectedItem = "العربية (Arabic)"
ElseIf Main.SubSprache = "ruRU" Then
ComboBox1.SelectedItem = "Русский (Russian)"
ElseIf Main.SubSprache = "itIT" Then
ComboBox1.SelectedItem = "Italiano (Italian)"
ElseIf Main.SubSprache = "esES" Then
ComboBox1.SelectedItem = "Español (España)"
Else
ComboBox1.SelectedItem = Main.CB_SuB_Nothing
End If End If
Next
If DD_Season_Prefix.Items.Contains(Main.Season_Prefix) Then If DD_Season_Prefix.Items.Contains(Main.Season_Prefix) Then
DD_Season_Prefix.SelectedItem = Main.Season_Prefix DD_Season_Prefix.SelectedItem = Main.Season_Prefix
@ -317,23 +301,23 @@ Public Class Einstellungen
If Main.DefaultSubCR = "deDE" Then If Main.DefaultSubCR = "de-DE" Then
CR_SoftSubDefault.SelectedItem = "Deutsch" CR_SoftSubDefault.SelectedItem = "Deutsch"
ElseIf Main.DefaultSubCR = "enUS" Then ElseIf Main.DefaultSubCR = "en-US" Then
CR_SoftSubDefault.SelectedItem = "English" CR_SoftSubDefault.SelectedItem = "English"
ElseIf Main.DefaultSubCR = "ptBR" Then ElseIf Main.DefaultSubCR = "pt-BR" Then
CR_SoftSubDefault.SelectedItem = "Português (Brasil)" CR_SoftSubDefault.SelectedItem = "Português (Brasil)"
ElseIf Main.DefaultSubCR = "esLA" Then ElseIf Main.DefaultSubCR = "es-419" Then
CR_SoftSubDefault.SelectedItem = "Español (LA)" CR_SoftSubDefault.SelectedItem = "Español (LA)"
ElseIf Main.DefaultSubCR = "frFR" Then ElseIf Main.DefaultSubCR = "fr-FR" Then
CR_SoftSubDefault.SelectedItem = "Français (France)" CR_SoftSubDefault.SelectedItem = "Français (France)"
ElseIf Main.DefaultSubCR = "arME" Then ElseIf Main.DefaultSubCR = "ar-ME" Then
CR_SoftSubDefault.SelectedItem = "العربية (Arabic)" CR_SoftSubDefault.SelectedItem = "العربية (Arabic)"
ElseIf Main.DefaultSubCR = "ruRU" Then ElseIf Main.DefaultSubCR = "ru-RU" Then
CR_SoftSubDefault.SelectedItem = "Русский (Russian)" CR_SoftSubDefault.SelectedItem = "Русский (Russian)"
ElseIf Main.DefaultSubCR = "itIT" Then ElseIf Main.DefaultSubCR = "it-IT" Then
CR_SoftSubDefault.SelectedItem = "Italiano (Italian)" CR_SoftSubDefault.SelectedItem = "Italiano (Italian)"
ElseIf Main.DefaultSubCR = "esES" Then ElseIf Main.DefaultSubCR = "es-ES" Then
CR_SoftSubDefault.SelectedItem = "Español (España)" CR_SoftSubDefault.SelectedItem = "Español (España)"
Else Else
CR_SoftSubDefault.SelectedItem = "[Disabled]" CR_SoftSubDefault.SelectedItem = "[Disabled]"
@ -452,70 +436,53 @@ Public Class Einstellungen
My.Settings.Reso = Main.Reso My.Settings.Reso = Main.Reso
End If End If
If ComboBox1.SelectedItem.ToString = "English" Then
Main.SubSprache = "enUS" For i As Integer = 0 To Main.SubSpracheEnum.Count - 1
My.Settings.Subtitle = Main.SubSprache
ElseIf ComboBox1.SelectedItem.ToString = "Deutsch" Then If CB_CR_Harsubs.SelectedItem.ToString = Main.SubSpracheEnum(i).Name Then
Main.SubSprache = "deDE" Main.SubSprache = Main.SubSpracheEnum(i)
My.Settings.Subtitle = Main.SubSprache My.Settings.Subtitle = Main.SubSprache.CR_Value
ElseIf ComboBox1.SelectedItem.ToString = "Português (Brasil)" Then 'MsgBox(Main.SubSpracheEnum(i).Name)
Main.SubSprache = "ptBR" 'MsgBox(Main.SubSpracheEnum(i).CR_Value)
My.Settings.Subtitle = Main.SubSprache Exit For
ElseIf ComboBox1.SelectedItem.ToString = "Español (LA)" Then
Main.SubSprache = "es-419"
My.Settings.Subtitle = Main.SubSprache
ElseIf ComboBox1.SelectedItem.ToString = "Français (France)" Then
Main.SubSprache = "frFR"
My.Settings.Subtitle = Main.SubSprache
ElseIf ComboBox1.SelectedItem.ToString = "العربية (Arabic)" Then
Main.SubSprache = "arME"
My.Settings.Subtitle = Main.SubSprache
ElseIf ComboBox1.SelectedItem.ToString = "Русский (Russian)" Then
Main.SubSprache = "ruRU"
My.Settings.Subtitle = Main.SubSprache
ElseIf ComboBox1.SelectedItem.ToString = "Italiano (Italian)" Then
Main.SubSprache = "itIT"
My.Settings.Subtitle = Main.SubSprache
ElseIf ComboBox1.SelectedItem.ToString = "Español (España)" Then
Main.SubSprache = "esES"
My.Settings.Subtitle = Main.SubSprache
ElseIf ComboBox1.SelectedItem.ToString = Main.CB_SuB_Nothing Then
Main.SubSprache = "None"
My.Settings.Subtitle = Main.SubSprache
End If End If
Next
If CR_SoftSubDefault.SelectedItem.ToString = "English" Then If CR_SoftSubDefault.SelectedItem.ToString = "English" Then
Main.DefaultSubCR = "enUS" Main.DefaultSubCR = "en-US"
My.Settings.DefaultSubCR = Main.DefaultSubCR My.Settings.DefaultSubCR = Main.DefaultSubCR
ElseIf CR_SoftSubDefault.SelectedItem.ToString = "Deutsch" Then ElseIf CR_SoftSubDefault.SelectedItem.ToString = "Deutsch" Then
Main.DefaultSubCR = "deDE" Main.DefaultSubCR = "de-DE"
My.Settings.DefaultSubCR = Main.DefaultSubCR My.Settings.DefaultSubCR = Main.DefaultSubCR
ElseIf CR_SoftSubDefault.SelectedItem.ToString = "Português (Brasil)" Then ElseIf CR_SoftSubDefault.SelectedItem.ToString = "Português (Brasil)" Then
Main.DefaultSubCR = "ptBR" Main.DefaultSubCR = "pt-BR"
My.Settings.DefaultSubCR = Main.DefaultSubCR My.Settings.DefaultSubCR = Main.DefaultSubCR
ElseIf CR_SoftSubDefault.SelectedItem.ToString = "Español (LA)" Then ElseIf CR_SoftSubDefault.SelectedItem.ToString = "Español (LA)" Then
Main.DefaultSubCR = "esLA" Main.DefaultSubCR = "es-419"
My.Settings.DefaultSubCR = Main.DefaultSubCR My.Settings.DefaultSubCR = Main.DefaultSubCR
ElseIf CR_SoftSubDefault.SelectedItem.ToString = "Français (France)" Then ElseIf CR_SoftSubDefault.SelectedItem.ToString = "Français (France)" Then
Main.DefaultSubCR = "frFR" Main.DefaultSubCR = "fr-FR"
My.Settings.DefaultSubCR = Main.DefaultSubCR My.Settings.DefaultSubCR = Main.DefaultSubCR
ElseIf CR_SoftSubDefault.SelectedItem.ToString = "العربية (Arabic)" Then ElseIf CR_SoftSubDefault.SelectedItem.ToString = "العربية (Arabic)" Then
Main.DefaultSubCR = "arME" Main.DefaultSubCR = "ar-ME"
My.Settings.DefaultSubCR = Main.DefaultSubCR My.Settings.DefaultSubCR = Main.DefaultSubCR
ElseIf CR_SoftSubDefault.SelectedItem.ToString = "Русский (Russian)" Then ElseIf CR_SoftSubDefault.SelectedItem.ToString = "Русский (Russian)" Then
Main.DefaultSubCR = "ruRU" Main.DefaultSubCR = "ru-RU"
My.Settings.DefaultSubCR = Main.DefaultSubCR My.Settings.DefaultSubCR = Main.DefaultSubCR
ElseIf CR_SoftSubDefault.SelectedItem.ToString = "Italiano (Italian)" Then ElseIf CR_SoftSubDefault.SelectedItem.ToString = "Italiano (Italian)" Then
Main.DefaultSubCR = "itIT" Main.DefaultSubCR = "it-IT"
My.Settings.DefaultSubCR = Main.DefaultSubCR My.Settings.DefaultSubCR = Main.DefaultSubCR
ElseIf CR_SoftSubDefault.SelectedItem.ToString = "Español (España)" Then ElseIf CR_SoftSubDefault.SelectedItem.ToString = "Español (España)" Then
Main.DefaultSubCR = "esES" Main.DefaultSubCR = "es-ES"
My.Settings.DefaultSubCR = Main.DefaultSubCR My.Settings.DefaultSubCR = Main.DefaultSubCR
ElseIf CR_SoftSubDefault.SelectedItem.ToString = "[Disabled]" Then ElseIf CR_SoftSubDefault.SelectedItem.ToString = "[Disabled]" Then
Main.DefaultSubCR = "None" Main.DefaultSubCR = "None"
My.Settings.DefaultSubCR = Main.DefaultSubCR My.Settings.DefaultSubCR = Main.DefaultSubCR
End If End If
If CR_Filename.Text = "[episode number]" Then If CR_Filename.Text = "[episode number]" Then
Main.CR_NameMethode = 0 Main.CR_NameMethode = 0
My.Settings.CR_NameMethode = Main.CR_NameMethode My.Settings.CR_NameMethode = Main.CR_NameMethode
@ -781,16 +748,7 @@ Public Class Einstellungen
Me.Close() Me.Close()
End Sub End Sub
Private Function Check_CB() As Boolean
Dim C As Boolean = False
For i As Integer = 0 To ComboBox1.Items.Count - 1
If ComboBox1.Items.Item(i).ToString = Main.CB_SuB_Nothing Then
C = True
Exit For
End If
Next
Return C
End Function
@ -820,7 +778,7 @@ Public Class Einstellungen
End Sub End Sub
Private Sub ComboBox1_DrawItem(sender As Object, e As DrawItemEventArgs) Handles ComboBox1.DrawItem, CB_Fun_HardSubs.DrawItem, Fun_Dub_Over.DrawItem Private Sub ComboBox1_DrawItem(sender As Object, e As DrawItemEventArgs) Handles CB_CR_Harsubs.DrawItem, CB_Fun_HardSubs.DrawItem, Fun_Dub_Over.DrawItem
Dim CB As ComboBox = CType(sender, ComboBox) Dim CB As ComboBox = CType(sender, ComboBox)
CB.BackColor = Color.White CB.BackColor = Color.White
If e.Index >= 0 Then If e.Index >= 0 Then
@ -1282,24 +1240,9 @@ Public Class Einstellungen
End Sub End Sub
Private Sub ComboBox1_SelectedIndexChanged(sender As Object, e As EventArgs) Handles ComboBox1.SelectedIndexChanged
End Sub
#End Region #End Region
#End Region #End Region
End Class End Class