Mirrors
/
Crunchyroll-Downloader-v3.0
mirror of https://github.com/hama3254/Crunchyroll-Downloader-v3.0.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

removed Funimation, removed [Auto] Resolution. 

removed funimation code RIP
removed [Auto] as Resolution (replaced with 240p #930)
This commit is contained in:
hama3254 2024-04-13 11:37:48 +02:00
parent 8a36bf5e6a
commit 31aa603e74
18 changed files with 52 additions and 2610 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.

162
Crunchyroll Downloader/Anime_Add.vb
View File

@ -197,7 +197,7 @@ Public Class Anime_Add
Main.ItemConstructor(NameKomplett, Namep1, Namep2, Reso, HardSub, ThumbnialURL, URL_DL, Chr(34) + Pfad_DL + Chr(34), Service)
ElseIf CBool(InStr(textBox1.Text, "crunchyroll.com")) Or CBool(InStr(textBox1.Text, "funimation.com")) Then
ElseIf CBool(InStr(textBox1.Text, "crunchyroll.com")) Then
'If StatusLabel.Text = "Status: waiting for episode selection" Then
@ -237,41 +237,6 @@ Public Class Anime_Add
Else
If CBool(InStr(textBox1.Text, "funimation.com")) Then
Main.WebbrowserURL = textBox1.Text
If CBool(InStr(textBox1.Text, "funimation.com/v/")) Then
Dim Episode0() As String = textBox1.Text.Split(New String() {"?"}, System.StringSplitOptions.RemoveEmptyEntries)
Dim Episode() As String = Episode0(0).Split(New String() {"/"}, System.StringSplitOptions.RemoveEmptyEntries)
Dim v1JsonUrl As String = "https://d33et77evd9bgg.cloudfront.net/data/v1/episodes/" + Episode(Episode.Length - 1) + ".json"
'MsgBox(v1JsonUrl)
Dim v1Json As String = Nothing
Try
Using client As New WebClient()
client.Encoding = System.Text.Encoding.UTF8
client.Headers.Add(My.Settings.User_Agend.Replace(Chr(34), ""))
v1Json = client.DownloadString(v1JsonUrl)
End Using
Main.WebbrowserURL = textBox1.Text
Main.GetFunimationNewJS_VideoProxy(Nothing, v1Json)
Exit Sub
Catch ex As Exception
Debug.WriteLine("error- getting v1Json data for the bypass")
Debug.WriteLine(ex.ToString)
End Try
ElseIf CBool(InStr(textBox1.Text, "funimation.com/shows/")) Then
Main.LoadingUrl = textBox1.Text
Main.LoadedUrls.Clear()
Main.b = False
Debug.WriteLine("loading funimation show url: " + Date.Now.ToString)
StatusLabel.Text = "Status: loading funimation...."
'Main.LoadBrowser()
Browser.WebView2.CoreWebView2.Navigate(textBox1.Text)
Exit Sub
End If
End If
If Main.Grapp_RDY = True Then
@ -309,20 +274,8 @@ Public Class Anime_Add
btn_dl.Text = "Download"
btn_dl.BackgroundImage = My.Resources.main_button_download_default
StatusLabel.Text = "Status: idle"
ElseIf CBool(InStr(Main.WebbrowserURL, "funimation.com")) = True Then
'btn_dl.BackgroundImage = My.Resources.add_mass_running_cancel
btn_dl.Text = "Cancel"
Mass_DL_Cancel = True
bt_Cancel_mass.Enabled = False
bt_Cancel_mass.Visible = False
Main.DownloadFunimationJS_Seasons()
CB_EP1.Enabled = False
CB_EP0.Enabled = False
CB_Season.Enabled = False
ElseIf CBool(InStr(Main.WebbrowserURL, "crunchyroll.com")) = True Then
StatusLabel.Text = "Status: idle"
@ -346,47 +299,6 @@ Public Class Anime_Add
btn_dl.Enabled = True
End Sub
Public Sub ProcessFunimationJS(ByVal InputURL As String)
Dim FunUri As String = Nothing
If CBool(InStr(InputURL, "?")) Then
Dim ClearUri As String() = InputURL.Split(New String() {"?"}, System.StringSplitOptions.RemoveEmptyEntries)
FunUri = ClearUri(0)
Else
FunUri = InputURL
End If
Dim ShowPath As String = Nothing
Dim EpisodePath As String = Nothing
Dim ShowPath1 As String() = FunUri.Split(New String() {"/shows/"}, System.StringSplitOptions.RemoveEmptyEntries)
'If CBool(InStr(ShowPath1(1), "/") Then
Dim ShowPath2 As String() = ShowPath1(1).Split(New String() {"/"}, System.StringSplitOptions.RemoveEmptyEntries)
If ShowPath2.Count > 1 Then
ShowPath = ShowPath2(0).Replace("/", "")
EpisodePath = ShowPath2(1).Replace("/", "")
Else
ShowPath = ShowPath1(1).Replace("/", "")
End If
Main.FunimationShowPath = ShowPath + "/"
Debug.WriteLine(ShowPath)
Debug.WriteLine(Main.FunimationAPIRegion)
If EpisodePath = Nothing Then 'overview site
Main.GetFunimationJS_Seasons("https://title-api.prd.funimationsvc.com/v2/shows/" + ShowPath + Main.FunimationAPIRegion)
Else 'single episode
End If
Dim FunimationCC As String() = ShowPath1(0).Split(New String() {"funimation.com"}, System.StringSplitOptions.RemoveEmptyEntries)
If FunimationCC.Count > 1 Then
Main.FunimationRegion = FunimationCC(1).Replace("/", "")
End If
End Sub
Private Sub Btn_dl_MouseEnter(sender As Object, e As EventArgs) Handles btn_dl.MouseEnter
@ -562,84 +474,12 @@ Public Class Anime_Add
FillCREpisodes(EpisodeJson)
ElseIf Main.WebbrowserURL = "https://funimation.com/js" Then
CB_EP0.Items.Clear()
CB_EP1.Items.Clear()
CB_EP0.Text = Nothing
CB_EP1.Text = Nothing
Dim ContentID As String = Nothing
For i As Integer = 0 To Main.FunimtaionSeasonList.Count - 1
If CB_Season.Text = Main.FunimtaionSeasonList.Item(i).Title Then
ContentID = Main.FunimtaionSeasonList.Item(i).ID
Exit For
End If
Next
If ContentID = Nothing Then
MsgBox("error during season selection")
Exit Sub
End If
Dim BaseUrl() As String = Main.FunimationSeasonAPIUrl.Split(New String() {"/shows/"}, System.StringSplitOptions.RemoveEmptyEntries)
Dim EpisodeJsonURL As String = BaseUrl(0) + "/seasons/" + ContentID + ".json"
Dim EpisodeJson As String = Nothing
Debug.WriteLine(EpisodeJsonURL)
Try
Using client As New WebClient()
client.Encoding = System.Text.Encoding.UTF8
client.Headers.Add(My.Settings.User_Agend.Replace(Chr(34), ""))
EpisodeJson = client.DownloadString(EpisodeJsonURL)
End Using
Catch ex As Exception
Debug.WriteLine("error- getting EpisodeJson data")
Debug.WriteLine(ex.ToString)
Main.FunimationJsonBrowser = "EpisodeJson"
Main.LoadBrowser(EpisodeJsonURL)
Exit Sub
End Try
FillFunimationEpisodes(EpisodeJson)
If CB_EP0.Items.Count > 0 Then
CB_EP0.SelectedIndex = 0
CB_EP1.SelectedIndex = CB_EP1.Items.Count - 1
End If
End If
End Sub
Public Sub FillFunimationEpisodes(ByVal EpisodeJson As String)
Main.FunimationEpisodeJSON = EpisodeJson
CB_EP0.Enabled = True
CB_EP1.Enabled = True
Dim EpisodeSplit() As String = EpisodeJson.Split(New String() {Chr(34) + "episodeNumber" + Chr(34) + ":" + Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries)
'EpisodeJson.Split(New String() {Chr(34) + "episodeNumber" + Chr(34) + ": " + Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries)
Debug.WriteLine(EpisodeSplit.Count.ToString)
For i As Integer = 1 To EpisodeSplit.Count - 1
Dim EpisodeSplit2() As String = EpisodeSplit(i).Split(New String() {Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries)
CB_EP0.Items.Add("Episode " + EpisodeSplit2(0))
CB_EP1.Items.Add("Episode " + EpisodeSplit2(0))
Next
Main.WebbrowserURL = "https://funimation.com/js"
End Sub
Private Sub TextBox2_Click(sender As Object, e As EventArgs) Handles TextBox2.Click
If TextBox2.Text = "Use Custom Name" Then
TextBox2.Text = Nothing

21
Crunchyroll Downloader/App.config
View File

@ -27,24 +27,12 @@
<setting name="Pfad" serializeAs="String">
<value />
</setting>
<setting name="Fun_Sub" serializeAs="String">
<value>None</value>
</setting>
<setting name="ffmpeg_command" serializeAs="String">
<value> -c copy -c:a copy -bsf:a aac_adtstoasc</value>
</setting>
<setting name="AddedSubs" serializeAs="String">
<value>None</value>
</setting>
<setting name="FunimationDub" serializeAs="String">
<value>Disabled</value>
</setting>
<setting name="FunimationHardsub" serializeAs="String">
<value>Disabled</value>
</setting>
<setting name="DefaultSubFunimation" serializeAs="String">
<value>Disabled</value>
</setting>
<setting name="SubFolder_Value" serializeAs="String">
<value>[ ignore subfolder ]</value>
</setting>
@ -75,12 +63,6 @@
<setting name="Dark_Mode" serializeAs="String">
<value>False</value>
</setting>
<setting name="Funimation_srt" serializeAs="String">
<value>False</value>
</setting>
<setting name="Funimation_vtt" serializeAs="String">
<value>False</value>
</setting>
<setting name="QueueMode" serializeAs="String">
<value>False</value>
</setting>
@ -120,9 +102,6 @@
<setting name="LeadingZero" serializeAs="String">
<value>0</value>
</setting>
<setting name="Funimation_Bitrate" serializeAs="String">
<value>0</value>
</setting>
<setting name="ServerPort" serializeAs="String">
<value>0</value>
</setting>

37
Crunchyroll Downloader/Browser.vb
View File

@ -205,43 +205,6 @@ Public Class Browser
End If
ElseIf CBool(InStr(Main.LoadingUrl, "funimation.com")) Then
If CBool(InStr(e.Request.Uri, "?deviceType=web")) Then
'Debug.WriteLine(e.Request.Uri)
Dim parms As String() = e.Request.Uri.Split(New String() {"?deviceType="}, System.StringSplitOptions.RemoveEmptyEntries)
Main.FunimationDeviceRegion = "?deviceType=" + parms(1)
End If
If CBool(InStr(e.Request.Uri, "https://title-api.prd.funimationsvc.com")) Then
Debug.WriteLine("Funimtaion: " + e.Request.Uri)
If (Me.InvokeRequired) Then
Me.Invoke(Sub() Main.LoadedUrls.Add(e.Request))
Exit Sub
Else
Main.LoadedUrls.Add(e.Request)
Exit Sub
End If
ElseIf CBool(InStr(e.Request.Uri, "/data/v2/shows/")) Then
Debug.WriteLine("Funimtaion: " + e.Request.Uri)
If (Me.InvokeRequired) Then
Me.Invoke(Sub() Main.LoadedUrls.Add(e.Request))
Exit Sub
Else
Main.LoadedUrls.Add(e.Request)
Exit Sub
End If
ElseIf CBool(InStr(e.Request.Uri, "/data/v1/episodes/")) Then
Debug.WriteLine("Funimtaion: " + e.Request.Uri)
If (Me.InvokeRequired) Then
Me.Invoke(Sub() Main.LoadedUrls.Add(e.Request))
Exit Sub
Else
Main.LoadedUrls.Add(e.Request)
Exit Sub
End If
End If
End If

49
Crunchyroll Downloader/CRD-Classes.vb
View File

@ -15,56 +15,7 @@
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

28
Crunchyroll Downloader/ErrorDialog.vb
View File

@ -70,35 +70,11 @@ Public Class ErrorDialog
End Try
ElseIf Main.DialogTaskString = "AudioOnlyResolution" Then
StatusLabel.Text = "" 'Main.LabelResoNotFoundText
ComboBox1.Items.Add("x240,")
ComboBox1.Items.Add("x360,")
ComboBox1.Items.Add("x480,")
ComboBox1.Items.Add("x720,")
ComboBox1.Items.Add("x1080,")
ElseIf Main.DialogTaskString = "Funimation_Resolution" Then
StatusLabel.Text = Main.LabelResoNotFoundText
'Try
' My.Computer.FileSystem.WriteAllText(Application.StartupPath + "\Funimation-Resolution.log", Main.ResoNotFoundString, True)
'Catch ex As Exception
'End Try
Dim ResoList As New List(Of String)
Dim m3u8_split As String() = Main.ResoNotFoundString.Split(New String() {vbLf}, System.StringSplitOptions.RemoveEmptyEntries)
For i As Integer = 0 To m3u8_split.Count - 1
If CBool(InStr(m3u8_split(i), "RESOLUTION=")) Then
ResoList.Add(m3u8_split(i))
End If
Next
Dim Reso_avaible1 As String() = Main.ResoNotFoundString.Split(New String() {"RESOLUTION="}, System.StringSplitOptions.RemoveEmptyEntries)
For i As Integer = 0 To ResoList.Count - 1
Dim Reso_avaible As String() = ResoList.Item(i).Split(New String() {"RESOLUTION="}, System.StringSplitOptions.RemoveEmptyEntries)
If CBool(InStr(Reso_avaible(1), ",")) Then
Dim Reso_avaible2 As String() = Reso_avaible(1).Split(New String() {","}, System.StringSplitOptions.RemoveEmptyEntries)
ComboBox1.Items.Add(Reso_avaible2(0))
Else
ComboBox1.Items.Add(Reso_avaible(1))
End If
Next
SurroundingSub()
End If

9
Crunchyroll Downloader/Main.designer.vb generated
View File

@ -43,7 +43,6 @@ Partial Class Main
Me.SaveModeToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.SaveThumbnailAsImageToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.ToggleDebugModeToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.Funimation_Token = New System.Windows.Forms.ToolStripMenuItem()
Me.CheckCRBetaTokenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.Timer3OffToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.ThreadCount = New System.Windows.Forms.ToolStripMenuItem()
@ -161,7 +160,7 @@ Partial Class Main
'
'ContextMenuStrip1
'
Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.QueueToolStripMenuItem, Me.SaveModeToolStripMenuItem, Me.SaveThumbnailAsImageToolStripMenuItem, Me.ToggleDebugModeToolStripMenuItem, Me.Funimation_Token, Me.CheckCRBetaTokenToolStripMenuItem, Me.Timer3OffToolStripMenuItem, Me.ThreadCount, Me.CRCookieToolStripMenuItem, Me.UrlJsonsToolStripMenuItem, Me.DummyItemToolStripMenuItem, Me.AudioOnlyQualityToolStripMenuItem})
Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.QueueToolStripMenuItem, Me.SaveModeToolStripMenuItem, Me.SaveThumbnailAsImageToolStripMenuItem, Me.ToggleDebugModeToolStripMenuItem, Me.CheckCRBetaTokenToolStripMenuItem, Me.Timer3OffToolStripMenuItem, Me.ThreadCount, Me.CRCookieToolStripMenuItem, Me.UrlJsonsToolStripMenuItem, Me.DummyItemToolStripMenuItem, Me.AudioOnlyQualityToolStripMenuItem})
Me.ContextMenuStrip1.Name = "ContextMenuStrip1"
resources.ApplyResources(Me.ContextMenuStrip1, "ContextMenuStrip1")
'
@ -185,11 +184,6 @@ Partial Class Main
Me.ToggleDebugModeToolStripMenuItem.Name = "ToggleDebugModeToolStripMenuItem"
resources.ApplyResources(Me.ToggleDebugModeToolStripMenuItem, "ToggleDebugModeToolStripMenuItem")
'
'Funimation_Token
'
Me.Funimation_Token.Name = "Funimation_Token"
resources.ApplyResources(Me.Funimation_Token, "Funimation_Token")
'
'CheckCRBetaTokenToolStripMenuItem
'
Me.CheckCRBetaTokenToolStripMenuItem.Name = "CheckCRBetaTokenToolStripMenuItem"
@ -287,7 +281,6 @@ Partial Class Main
Friend WithEvents Btn_Close As Button
Friend WithEvents ContextMenuStrip1 As ContextMenuStrip
Friend WithEvents ToggleDebugModeToolStripMenuItem As ToolStripMenuItem
Friend WithEvents Funimation_Token As ToolStripMenuItem
Friend WithEvents CheckCRBetaTokenToolStripMenuItem As ToolStripMenuItem
Friend WithEvents Timer3OffToolStripMenuItem As ToolStripMenuItem
Friend WithEvents ThreadCount As ToolStripMenuItem

12
Crunchyroll Downloader/Main.resx
View File

@ -507,12 +507,6 @@
<data name="&gt;&gt;ToggleDebugModeToolStripMenuItem.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;Funimation_Token.Name" xml:space="preserve">
<value>Funimation_Token</value>
</data>
<data name="&gt;&gt;Funimation_Token.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;CheckCRBetaTokenToolStripMenuItem.Name" xml:space="preserve">
<value>CheckCRBetaTokenToolStripMenuItem</value>
</data>
@ -591,12 +585,6 @@
<data name="ToggleDebugModeToolStripMenuItem.Text" xml:space="preserve">
<value>Toggle Debug Mode</value>
</data>
<data name="Funimation_Token.Size" type="System.Drawing.Size, System.Drawing">
<value>233, 22</value>
</data>
<data name="Funimation_Token.Text" xml:space="preserve">
<value>Check Funimation Token</value>
</data>
<data name="CheckCRBetaTokenToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>233, 22</value>
</data>

1418
Crunchyroll Downloader/Main.vb
View File

File diff suppressed because it is too large Load Diff

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.20.1")>
<Assembly: AssemblyFileVersion("3.20.1")>
<Assembly: AssemblyVersion("3.21")>
<Assembly: AssemblyFileVersion("3.21")>
<Assembly: NeutralResourcesLanguage("en")>

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

@ -270,96 +270,6 @@ Namespace My.Resources
End Get
End Property
'''<summary>
''' Sucht eine lokalisierte Zeichenfolge, die src=&quot;/player/ ähnelt.
'''</summary>
Friend ReadOnly Property Funimation_Player_ID() As String
Get
Return ResourceManager.GetString("Funimation_Player_ID", resourceCulture)
End Get
End Property
'''<summary>
''' Sucht eine lokalisierte Zeichenfolge, die src=&quot;https://www.funimation.com/player/ ähnelt.
'''</summary>
Friend ReadOnly Property Funimation_Player_ID_2() As String
Get
Return ResourceManager.GetString("Funimation_Player_ID_2", resourceCulture)
End Get
End Property
'''<summary>
''' Sucht eine lokalisierte Zeichenfolge, die &lt;a class=&quot;trackVideo ng-binding&quot; href=&quot; ähnelt.
'''</summary>
Friend ReadOnly Property Funimation_Split_1() As String
Get
Return ResourceManager.GetString("Funimation_Split_1", resourceCulture)
End Get
End Property
'''<summary>
''' Sucht eine lokalisierte Zeichenfolge, die &quot;&gt; ähnelt.
'''</summary>
Friend ReadOnly Property Funimation_Split_2() As String
Get
Return ResourceManager.GetString("Funimation_Split_2", resourceCulture)
End Get
End Property
'''<summary>
''' Sucht eine lokalisierte Zeichenfolge, die &quot;src&quot;: ähnelt.
'''</summary>
Friend ReadOnly Property Funimation_src_string() As String
Get
Return ResourceManager.GetString("Funimation_src_string", resourceCulture)
End Get
End Property
'''<summary>
''' Sucht eine lokalisierte Zeichenfolge, die {&quot;src&quot;: &quot; ähnelt.
'''</summary>
Friend ReadOnly Property Funimation_subs_src() As String
Get
Return ResourceManager.GetString("Funimation_subs_src", resourceCulture)
End Get
End Property
'''<summary>
''' Sucht eine lokalisierte Zeichenfolge, die &quot;, &quot;kind&quot;: &quot;subtitle&quot;, &quot;type&quot;: &quot;CC&quot;, &quot;language&quot;: &quot; ähnelt.
'''</summary>
Friend ReadOnly Property Funimation_Subtitle_String() As String
Get
Return ResourceManager.GetString("Funimation_Subtitle_String", resourceCulture)
End Get
End Property
'''<summary>
''' Sucht eine lokalisierte Zeichenfolge, die &quot;, &quot;kind&quot;: &quot;subtitle&quot;, &quot;type&quot;: &quot;Full&quot;, &quot;language&quot;: &quot; ähnelt.
'''</summary>
Friend ReadOnly Property Funimation_Subtitle_String2() As String
Get
Return ResourceManager.GetString("Funimation_Subtitle_String2", resourceCulture)
End Get
End Property
'''<summary>
''' Sucht eine lokalisierte Zeichenfolge, die &quot;, &quot;kind&quot;: &quot;subtitle&quot;, &quot;type&quot;: &quot;full&quot;, &quot;language&quot;: &quot; ähnelt.
'''</summary>
Friend ReadOnly Property Funimation_Subtitle_String3() As String
Get
Return ResourceManager.GetString("Funimation_Subtitle_String3", resourceCulture)
End Get
End Property
'''<summary>
''' Sucht eine lokalisierte Zeichenfolge, die &lt;meta property=&quot;og:image&quot; content=&quot; ähnelt.
'''</summary>
Friend ReadOnly Property Funimation_thumbnail() As String
Get
Return ResourceManager.GetString("Funimation_thumbnail", resourceCulture)
End Get
End Property
'''<summary>
''' Sucht eine lokalisierte Zeichenfolge, die &lt;script&gt;
'''

30
Crunchyroll Downloader/My Project/Resources.resx
View File

@ -130,24 +130,15 @@
<data name="main_add" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\main-add.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Funimation_Split_2" xml:space="preserve">
<value>"&gt;</value>
</data>
<data name="main_background" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\main-background.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Funimation_Split_1" xml:space="preserve">
<value>&lt;a class="trackVideo ng-binding" href="</value>
</data>
<data name="add_mass_cancel" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\add_mass_cancel.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="about_icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\about_icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Funimation_Subtitle_String2" xml:space="preserve">
<value>", "kind": "subtitle", "type": "Full", "language": "</value>
</data>
<data name="htmlTitlel" xml:space="preserve">
<value>&lt;a class="main_titel"&gt;Placeholder&lt;/a&gt;
&lt;img alt="image error" src="balken.png" class="class-balken"&gt;</value>
@ -163,9 +154,6 @@
&lt;address&gt;Server at Crunchyroll Downloader Port 8080&lt;/address&gt;
&lt;/body&gt;&lt;/html&gt;</value>
</data>
<data name="Funimation_Player_ID" xml:space="preserve">
<value>src="/player/</value>
</data>
<data name="Post_error_Top" xml:space="preserve">
<value>&lt;html&gt;
&lt;head&gt;
@ -216,9 +204,6 @@
<data name="main_pause_play" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\main-pause-play.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Funimation_Subtitle_String" xml:space="preserve">
<value>", "kind": "subtitle", "type": "CC", "language": "</value>
</data>
<data name="htmlEnd" xml:space="preserve">
<value>&lt;script&gt;
@ -242,9 +227,6 @@ setInterval(function loadXMLDoc() {
&lt;/body&gt;
&lt;/html&gt;</value>
</data>
<data name="Funimation_src_string" xml:space="preserve">
<value>"src":</value>
</data>
<data name="ass_template" xml:space="preserve">
<value>[Script Info]
; Template for error handling in the Crunchyrol Downloader by hama3254 https://github.com/hama3254/Crunchyroll-Downloader-v3.0
@ -372,9 +354,6 @@ Dialogue: 0,0:00:00.00,0:00:00.00,Default,,0000,0000,0000,,some ideas on how tem
<data name="crdSettings_Button_SafeExit" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\crdSettings_Button_SafeExit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Funimation_thumbnail" xml:space="preserve">
<value>&lt;meta property="og:image" content="</value>
</data>
<data name="main_pause_play_hover" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\main-pause-play-hover.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@ -432,9 +411,6 @@ Dialogue: 0,0:00:00.00,0:00:00.00,Default,,0000,0000,0000,,some ideas on how tem
<data name="main_setting_invert" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\main-setting_invert.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Funimation_subs_src" xml:space="preserve">
<value>{"src": "</value>
</data>
<data name="main_add_invert_dark" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\main-add_invert_dark.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@ -453,12 +429,6 @@ Dialogue: 0,0:00:00.00,0:00:00.00,Default,,0000,0000,0000,,some ideas on how tem
<data name="main_mini_red" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\main-mini_red.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Funimation_Subtitle_String3" xml:space="preserve">
<value>", "kind": "subtitle", "type": "full", "language": "</value>
</data>
<data name="Funimation_Player_ID_2" xml:space="preserve">
<value>src="https://www.funimation.com/player/</value>
</data>
<data name="main_close_dark" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\main-close_dark.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>

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

@ -78,18 +78,6 @@ Namespace My
End Set
End Property
<Global.System.Configuration.UserScopedSettingAttribute(), _
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
Global.System.Configuration.DefaultSettingValueAttribute("None")> _
Public Property Fun_Sub() As String
Get
Return CType(Me("Fun_Sub"),String)
End Get
Set
Me("Fun_Sub") = value
End Set
End Property
<Global.System.Configuration.UserScopedSettingAttribute(), _
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
Global.System.Configuration.DefaultSettingValueAttribute(" -c copy -c:a copy -bsf:a aac_adtstoasc")> _
@ -114,42 +102,6 @@ Namespace My
End Set
End Property
<Global.System.Configuration.UserScopedSettingAttribute(), _
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
Global.System.Configuration.DefaultSettingValueAttribute("Disabled")> _
Public Property FunimationDub() As String
Get
Return CType(Me("FunimationDub"),String)
End Get
Set
Me("FunimationDub") = value
End Set
End Property
<Global.System.Configuration.UserScopedSettingAttribute(), _
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
Global.System.Configuration.DefaultSettingValueAttribute("Disabled")> _
Public Property FunimationHardsub() As String
Get
Return CType(Me("FunimationHardsub"),String)
End Get
Set
Me("FunimationHardsub") = value
End Set
End Property
<Global.System.Configuration.UserScopedSettingAttribute(), _
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
Global.System.Configuration.DefaultSettingValueAttribute("Disabled")> _
Public Property DefaultSubFunimation() As String
Get
Return CType(Me("DefaultSubFunimation"),String)
End Get
Set
Me("DefaultSubFunimation") = value
End Set
End Property
<Global.System.Configuration.UserScopedSettingAttribute(), _
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
Global.System.Configuration.DefaultSettingValueAttribute("[ ignore subfolder ]")> _
@ -270,30 +222,6 @@ Namespace My
End Set
End Property
<Global.System.Configuration.UserScopedSettingAttribute(), _
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
Global.System.Configuration.DefaultSettingValueAttribute("False")> _
Public Property Funimation_srt() As Boolean
Get
Return CType(Me("Funimation_srt"),Boolean)
End Get
Set
Me("Funimation_srt") = value
End Set
End Property
<Global.System.Configuration.UserScopedSettingAttribute(), _
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
Global.System.Configuration.DefaultSettingValueAttribute("False")> _
Public Property Funimation_vtt() As Boolean
Get
Return CType(Me("Funimation_vtt"),Boolean)
End Get
Set
Me("Funimation_vtt") = value
End Set
End Property
<Global.System.Configuration.UserScopedSettingAttribute(), _
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
Global.System.Configuration.DefaultSettingValueAttribute("False")> _
@ -450,18 +378,6 @@ Namespace My
End Set
End Property
<Global.System.Configuration.UserScopedSettingAttribute(), _
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
Global.System.Configuration.DefaultSettingValueAttribute("0")> _
Public Property Funimation_Bitrate() As Integer
Get
Return CType(Me("Funimation_Bitrate"),Integer)
End Get
Set
Me("Funimation_Bitrate") = value
End Set
End Property
<Global.System.Configuration.UserScopedSettingAttribute(), _
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
Global.System.Configuration.DefaultSettingValueAttribute("0")> _

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

@ -8,24 +8,12 @@
<Setting Name="Pfad" Type="System.String" Scope="User">
<Value Profile="(Default)" />
</Setting>
<Setting Name="Fun_Sub" Type="System.String" Scope="User">
<Value Profile="(Default)">None</Value>
</Setting>
<Setting Name="ffmpeg_command" Type="System.String" Scope="User">
<Value Profile="(Default)"> -c copy -c:a copy -bsf:a aac_adtstoasc</Value>
</Setting>
<Setting Name="AddedSubs" Type="System.String" Scope="User">
<Value Profile="(Default)">None</Value>
</Setting>
<Setting Name="FunimationDub" Type="System.String" Scope="User">
<Value Profile="(Default)">Disabled</Value>
</Setting>
<Setting Name="FunimationHardsub" Type="System.String" Scope="User">
<Value Profile="(Default)">Disabled</Value>
</Setting>
<Setting Name="DefaultSubFunimation" Type="System.String" Scope="User">
<Value Profile="(Default)">Disabled</Value>
</Setting>
<Setting Name="SubFolder_Value" Type="System.String" Scope="User">
<Value Profile="(Default)">[ ignore subfolder ]</Value>
</Setting>
@ -56,12 +44,6 @@
<Setting Name="Dark_Mode" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">False</Value>
</Setting>
<Setting Name="Funimation_srt" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">False</Value>
</Setting>
<Setting Name="Funimation_vtt" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">False</Value>
</Setting>
<Setting Name="QueueMode" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">False</Value>
</Setting>
@ -101,9 +83,6 @@
<Setting Name="LeadingZero" Type="System.Int32" Scope="User">
<Value Profile="(Default)">0</Value>
</Setting>
<Setting Name="Funimation_Bitrate" Type="System.Int32" Scope="User">
<Value Profile="(Default)">0</Value>
</Setting>
<Setting Name="ServerPort" Type="System.Int32" Scope="User">
<Value Profile="(Default)">0</Value>
</Setting>

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

@ -83,7 +83,7 @@ Partial Class Einstellungen
Me.ListBit_1000 = New System.Windows.Forms.ToolStripMenuItem()
Me.FFMPEG_CommandP4 = New System.Windows.Forms.ToolStripMenuItem()
Me.GB_Resolution = New System.Windows.Forms.GroupBox()
Me.AAuto = New MetroFramework.Controls.MetroRadioButton()
Me.A240p = New MetroFramework.Controls.MetroRadioButton()
Me.A480p = New MetroFramework.Controls.MetroRadioButton()
Me.A360p = New MetroFramework.Controls.MetroRadioButton()
Me.A720p = New MetroFramework.Controls.MetroRadioButton()
@ -132,23 +132,6 @@ Partial Class Einstellungen
Me.GroupBox19 = New System.Windows.Forms.GroupBox()
Me.CB_OverrideDub = New MetroFramework.Controls.MetroCheckBox()
Me.CB_CR_Audio = New MetroFramework.Controls.MetroComboBox()
Me.TabPage6 = New MetroFramework.Controls.MetroTabPage()
Me.GroupBox15 = New System.Windows.Forms.GroupBox()
Me.Bitrate_Funi = New MetroFramework.Controls.MetroComboBox()
Me.GroupBox10 = New System.Windows.Forms.GroupBox()
Me.Fun_Dub_Over = New MetroFramework.Controls.MetroComboBox()
Me.GroupBox7 = New System.Windows.Forms.GroupBox()
Me.CB_Fun_HardSubs = New MetroFramework.Controls.MetroComboBox()
Me.GroupBox9 = New System.Windows.Forms.GroupBox()
Me.GroupBox13 = New System.Windows.Forms.GroupBox()
Me.FunSubDef = New MetroFramework.Controls.MetroComboBox()
Me.GroupBox11 = New System.Windows.Forms.GroupBox()
Me.CB_srt = New MetroFramework.Controls.MetroCheckBox()
Me.CB_vtt = New MetroFramework.Controls.MetroCheckBox()
Me.GroupBox8 = New System.Windows.Forms.GroupBox()
Me.CB_fun_eng = New MetroFramework.Controls.MetroCheckBox()
Me.CB_fun_es = New MetroFramework.Controls.MetroCheckBox()
Me.CB_fun_ptbr = New MetroFramework.Controls.MetroCheckBox()
Me.TabPage7 = New System.Windows.Forms.TabPage()
Me.LastVersion = New MetroFramework.Controls.MetroLabel()
Me.Label8 = New MetroFramework.Controls.MetroLabel()
@ -192,14 +175,6 @@ Partial Class Einstellungen
Me.GroupBox22.SuspendLayout()
Me.GroupBox20.SuspendLayout()
Me.GroupBox19.SuspendLayout()
Me.TabPage6.SuspendLayout()
Me.GroupBox15.SuspendLayout()
Me.GroupBox10.SuspendLayout()
Me.GroupBox7.SuspendLayout()
Me.GroupBox9.SuspendLayout()
Me.GroupBox13.SuspendLayout()
Me.GroupBox11.SuspendLayout()
Me.GroupBox8.SuspendLayout()
Me.TabPage7.SuspendLayout()
CType(Me.PictureBox7, System.ComponentModel.ISupportInitialize).BeginInit()
Me.SuspendLayout()
@ -364,7 +339,7 @@ Partial Class Einstellungen
Me.TabPage2.Padding = New System.Windows.Forms.Padding(3)
Me.TabPage2.Size = New System.Drawing.Size(501, 519)
Me.TabPage2.TabIndex = 1
Me.TabPage2.Text = "Output"
Me.TabPage2.Text = " Output "
Me.TabPage2.VerticalScrollbarBarColor = True
Me.TabPage2.VerticalScrollbarHighlightOnWheel = False
Me.TabPage2.VerticalScrollbarSize = 10
@ -776,7 +751,7 @@ Partial Class Einstellungen
'GB_Resolution
'
Me.GB_Resolution.BackColor = System.Drawing.Color.Transparent
Me.GB_Resolution.Controls.Add(Me.AAuto)
Me.GB_Resolution.Controls.Add(Me.A240p)
Me.GB_Resolution.Controls.Add(Me.A480p)
Me.GB_Resolution.Controls.Add(Me.A360p)
Me.GB_Resolution.Controls.Add(Me.A720p)
@ -790,18 +765,18 @@ Partial Class Einstellungen
Me.GB_Resolution.TabStop = False
Me.GB_Resolution.Text = "Auflösung"
'
'AAuto
'A240p
'
Me.AAuto.AutoSize = True
Me.AAuto.FontSize = MetroFramework.MetroCheckBoxSize.Medium
Me.AAuto.ForeColor = System.Drawing.Color.Black
Me.AAuto.Location = New System.Drawing.Point(377, 21)
Me.AAuto.Name = "AAuto"
Me.AAuto.Size = New System.Drawing.Size(63, 19)
Me.AAuto.TabIndex = 16
Me.AAuto.TabStop = True
Me.AAuto.Text = "[Auto]"
Me.AAuto.UseSelectable = True
Me.A240p.AutoSize = True
Me.A240p.FontSize = MetroFramework.MetroCheckBoxSize.Medium
Me.A240p.ForeColor = System.Drawing.Color.Black
Me.A240p.Location = New System.Drawing.Point(377, 21)
Me.A240p.Name = "A240p"
Me.A240p.Size = New System.Drawing.Size(57, 19)
Me.A240p.TabIndex = 16
Me.A240p.TabStop = True
Me.A240p.Text = "240p"
Me.A240p.UseSelectable = True
'
'A480p
'
@ -869,12 +844,12 @@ 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.Text = " Main "
Me.TabPage1.VerticalScrollbar = True
Me.TabPage1.VerticalScrollbarBarColor = True
Me.TabPage1.VerticalScrollbarHighlightOnWheel = False
@ -1100,13 +1075,13 @@ Partial Class Einstellungen
Me.TabControl1.Controls.Add(Me.TabPage2)
Me.TabControl1.Controls.Add(Me.MetroTabPage2)
Me.TabControl1.Controls.Add(Me.MetroTabPage1)
Me.TabControl1.Controls.Add(Me.TabPage6)
Me.TabControl1.Controls.Add(Me.TabPage7)
Me.TabControl1.FontSize = MetroFramework.MetroTabControlSize.Tall
Me.TabControl1.FontWeight = MetroFramework.MetroTabControlWeight.Regular
Me.TabControl1.ItemSize = New System.Drawing.Size(86, 50)
Me.TabControl1.Location = New System.Drawing.Point(22, 60)
Me.TabControl1.Name = "TabControl1"
Me.TabControl1.SelectedIndex = 3
Me.TabControl1.SelectedIndex = 4
Me.TabControl1.Size = New System.Drawing.Size(509, 567)
Me.TabControl1.TabIndex = 0
Me.TabControl1.UseSelectable = True
@ -1120,11 +1095,11 @@ Partial Class Einstellungen
Me.MetroTabPage2.HorizontalScrollbarBarColor = True
Me.MetroTabPage2.HorizontalScrollbarHighlightOnWheel = False
Me.MetroTabPage2.HorizontalScrollbarSize = 10
Me.MetroTabPage2.Location = New System.Drawing.Point(4, 35)
Me.MetroTabPage2.Location = New System.Drawing.Point(4, 44)
Me.MetroTabPage2.Name = "MetroTabPage2"
Me.MetroTabPage2.Size = New System.Drawing.Size(501, 528)
Me.MetroTabPage2.Size = New System.Drawing.Size(501, 519)
Me.MetroTabPage2.TabIndex = 8
Me.MetroTabPage2.Text = "Naming"
Me.MetroTabPage2.Text = " Naming "
Me.MetroTabPage2.VerticalScrollbarBarColor = True
Me.MetroTabPage2.VerticalScrollbarHighlightOnWheel = False
Me.MetroTabPage2.VerticalScrollbarSize = 10
@ -1430,7 +1405,7 @@ Partial Class Einstellungen
Me.MetroTabPage1.Name = "MetroTabPage1"
Me.MetroTabPage1.Size = New System.Drawing.Size(501, 519)
Me.MetroTabPage1.TabIndex = 7
Me.MetroTabPage1.Text = "Crunchyroll"
Me.MetroTabPage1.Text = " Crunchyroll "
Me.MetroTabPage1.VerticalScrollbarBarColor = True
Me.MetroTabPage1.VerticalScrollbarHighlightOnWheel = False
Me.MetroTabPage1.VerticalScrollbarSize = 10
@ -1523,241 +1498,6 @@ Partial Class Einstellungen
Me.CB_CR_Audio.TabIndex = 21
Me.CB_CR_Audio.UseSelectable = True
'
'TabPage6
'
Me.TabPage6.BackColor = System.Drawing.Color.FromArgb(CType(CType(243, Byte), Integer), CType(CType(243, Byte), Integer), CType(CType(243, Byte), Integer))
Me.TabPage6.Controls.Add(Me.GroupBox15)
Me.TabPage6.Controls.Add(Me.GroupBox10)
Me.TabPage6.Controls.Add(Me.GroupBox7)
Me.TabPage6.Controls.Add(Me.GroupBox9)
Me.TabPage6.HorizontalScrollbarBarColor = True
Me.TabPage6.HorizontalScrollbarHighlightOnWheel = False
Me.TabPage6.HorizontalScrollbarSize = 10
Me.TabPage6.Location = New System.Drawing.Point(4, 35)
Me.TabPage6.Name = "TabPage6"
Me.TabPage6.Padding = New System.Windows.Forms.Padding(3)
Me.TabPage6.Size = New System.Drawing.Size(501, 528)
Me.TabPage6.TabIndex = 4
Me.TabPage6.Text = " Funimation"
Me.TabPage6.VerticalScrollbarBarColor = True
Me.TabPage6.VerticalScrollbarHighlightOnWheel = False
Me.TabPage6.VerticalScrollbarSize = 10
Me.TabPage6.Visible = False
'
'GroupBox15
'
Me.GroupBox15.BackColor = System.Drawing.Color.Transparent
Me.GroupBox15.Controls.Add(Me.Bitrate_Funi)
Me.GroupBox15.Font = New System.Drawing.Font("Arial", 9.75!)
Me.GroupBox15.ForeColor = System.Drawing.Color.Black
Me.GroupBox15.Location = New System.Drawing.Point(0, 365)
Me.GroupBox15.Name = "GroupBox15"
Me.GroupBox15.Size = New System.Drawing.Size(490, 69)
Me.GroupBox15.TabIndex = 41
Me.GroupBox15.TabStop = False
Me.GroupBox15.Text = "Bitrate"
'
'Bitrate_Funi
'
Me.Bitrate_Funi.DropDownHeight = 250
Me.Bitrate_Funi.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.Bitrate_Funi.FormattingEnabled = True
Me.Bitrate_Funi.IntegralHeight = False
Me.Bitrate_Funi.ItemHeight = 23
Me.Bitrate_Funi.Items.AddRange(New Object() {"prefer high bitrate", "prefer low bitrate"})
Me.Bitrate_Funi.Location = New System.Drawing.Point(79, 24)
Me.Bitrate_Funi.Name = "Bitrate_Funi"
Me.Bitrate_Funi.Size = New System.Drawing.Size(326, 29)
Me.Bitrate_Funi.Sorted = True
Me.Bitrate_Funi.TabIndex = 32
Me.Bitrate_Funi.UseSelectable = True
'
'GroupBox10
'
Me.GroupBox10.BackColor = System.Drawing.Color.Transparent
Me.GroupBox10.Controls.Add(Me.Fun_Dub_Over)
Me.GroupBox10.Font = New System.Drawing.Font("Arial", 9.75!)
Me.GroupBox10.ForeColor = System.Drawing.Color.Black
Me.GroupBox10.Location = New System.Drawing.Point(0, 6)
Me.GroupBox10.Name = "GroupBox10"
Me.GroupBox10.Size = New System.Drawing.Size(490, 69)
Me.GroupBox10.TabIndex = 80
Me.GroupBox10.TabStop = False
Me.GroupBox10.Text = "Funimation Dub"
'
'Fun_Dub_Over
'
Me.Fun_Dub_Over.DropDownHeight = 250
Me.Fun_Dub_Over.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.Fun_Dub_Over.FormattingEnabled = True
Me.Fun_Dub_Over.IntegralHeight = False
Me.Fun_Dub_Over.ItemHeight = 23
Me.Fun_Dub_Over.Items.AddRange(New Object() {"Disabled", "english", "japanese", "portuguese(Brazil)", "spanish(Mexico)"})
Me.Fun_Dub_Over.Location = New System.Drawing.Point(79, 30)
Me.Fun_Dub_Over.Name = "Fun_Dub_Over"
Me.Fun_Dub_Over.Size = New System.Drawing.Size(326, 29)
Me.Fun_Dub_Over.Sorted = True
Me.Fun_Dub_Over.TabIndex = 40
Me.Fun_Dub_Over.UseSelectable = True
'
'GroupBox7
'
Me.GroupBox7.BackColor = System.Drawing.Color.Transparent
Me.GroupBox7.Controls.Add(Me.CB_Fun_HardSubs)
Me.GroupBox7.Font = New System.Drawing.Font("Arial", 9.75!)
Me.GroupBox7.ForeColor = System.Drawing.Color.Black
Me.GroupBox7.Location = New System.Drawing.Point(0, 440)
Me.GroupBox7.Name = "GroupBox7"
Me.GroupBox7.Size = New System.Drawing.Size(490, 69)
Me.GroupBox7.TabIndex = 40
Me.GroupBox7.TabStop = False
Me.GroupBox7.Text = "Hard Subtitle (post-processed)"
'
'CB_Fun_HardSubs
'
Me.CB_Fun_HardSubs.DropDownHeight = 250
Me.CB_Fun_HardSubs.Enabled = False
Me.CB_Fun_HardSubs.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.CB_Fun_HardSubs.FormattingEnabled = True
Me.CB_Fun_HardSubs.IntegralHeight = False
Me.CB_Fun_HardSubs.ItemHeight = 23
Me.CB_Fun_HardSubs.Items.AddRange(New Object() {"Disabled", "English", "Español (LA)", "Português (Brasil)"})
Me.CB_Fun_HardSubs.Location = New System.Drawing.Point(79, 30)
Me.CB_Fun_HardSubs.Name = "CB_Fun_HardSubs"
Me.CB_Fun_HardSubs.Size = New System.Drawing.Size(326, 29)
Me.CB_Fun_HardSubs.Sorted = True
Me.CB_Fun_HardSubs.TabIndex = 32
Me.CB_Fun_HardSubs.UseSelectable = True
'
'GroupBox9
'
Me.GroupBox9.BackColor = System.Drawing.Color.Transparent
Me.GroupBox9.Controls.Add(Me.GroupBox13)
Me.GroupBox9.Controls.Add(Me.GroupBox11)
Me.GroupBox9.Controls.Add(Me.GroupBox8)
Me.GroupBox9.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.GroupBox9.Location = New System.Drawing.Point(0, 80)
Me.GroupBox9.Name = "GroupBox9"
Me.GroupBox9.Size = New System.Drawing.Size(490, 275)
Me.GroupBox9.TabIndex = 50
Me.GroupBox9.TabStop = False
Me.GroupBox9.Text = "Soft-Subtitle"
'
'GroupBox13
'
Me.GroupBox13.BackColor = System.Drawing.Color.Transparent
Me.GroupBox13.Controls.Add(Me.FunSubDef)
Me.GroupBox13.Font = New System.Drawing.Font("Arial", 9.75!)
Me.GroupBox13.ForeColor = System.Drawing.Color.Black
Me.GroupBox13.Location = New System.Drawing.Point(10, 180)
Me.GroupBox13.Name = "GroupBox13"
Me.GroupBox13.Size = New System.Drawing.Size(474, 82)
Me.GroupBox13.TabIndex = 70
Me.GroupBox13.TabStop = False
Me.GroupBox13.Text = "Default Subtitle"
'
'FunSubDef
'
Me.FunSubDef.DropDownHeight = 250
Me.FunSubDef.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.FunSubDef.FormattingEnabled = True
Me.FunSubDef.IntegralHeight = False
Me.FunSubDef.ItemHeight = 23
Me.FunSubDef.Items.AddRange(New Object() {"[Disabled]"})
Me.FunSubDef.Location = New System.Drawing.Point(69, 30)
Me.FunSubDef.Name = "FunSubDef"
Me.FunSubDef.Size = New System.Drawing.Size(326, 29)
Me.FunSubDef.Sorted = True
Me.FunSubDef.TabIndex = 39
Me.FunSubDef.UseSelectable = True
'
'GroupBox11
'
Me.GroupBox11.BackColor = System.Drawing.Color.Transparent
Me.GroupBox11.Controls.Add(Me.CB_srt)
Me.GroupBox11.Controls.Add(Me.CB_vtt)
Me.GroupBox11.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.GroupBox11.Location = New System.Drawing.Point(10, 100)
Me.GroupBox11.Name = "GroupBox11"
Me.GroupBox11.Size = New System.Drawing.Size(474, 75)
Me.GroupBox11.TabIndex = 60
Me.GroupBox11.TabStop = False
Me.GroupBox11.Text = "Format"
'
'CB_srt
'
Me.CB_srt.AutoSize = True
Me.CB_srt.FontSize = MetroFramework.MetroCheckBoxSize.Medium
Me.CB_srt.ForeColor = System.Drawing.Color.Black
Me.CB_srt.Location = New System.Drawing.Point(139, 35)
Me.CB_srt.Name = "CB_srt"
Me.CB_srt.Size = New System.Drawing.Size(41, 19)
Me.CB_srt.TabIndex = 36
Me.CB_srt.Text = "srt"
Me.CB_srt.UseSelectable = True
'
'CB_vtt
'
Me.CB_vtt.AutoSize = True
Me.CB_vtt.FontSize = MetroFramework.MetroCheckBoxSize.Medium
Me.CB_vtt.ForeColor = System.Drawing.Color.Black
Me.CB_vtt.Location = New System.Drawing.Point(261, 35)
Me.CB_vtt.Name = "CB_vtt"
Me.CB_vtt.Size = New System.Drawing.Size(42, 19)
Me.CB_vtt.TabIndex = 37
Me.CB_vtt.Text = "vtt"
Me.CB_vtt.UseSelectable = True
'
'GroupBox8
'
Me.GroupBox8.BackColor = System.Drawing.Color.Transparent
Me.GroupBox8.Controls.Add(Me.CB_fun_eng)
Me.GroupBox8.Controls.Add(Me.CB_fun_es)
Me.GroupBox8.Controls.Add(Me.CB_fun_ptbr)
Me.GroupBox8.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.GroupBox8.Location = New System.Drawing.Point(10, 21)
Me.GroupBox8.Name = "GroupBox8"
Me.GroupBox8.Size = New System.Drawing.Size(474, 75)
Me.GroupBox8.TabIndex = 61
Me.GroupBox8.TabStop = False
Me.GroupBox8.Text = "Language"
'
'CB_fun_eng
'
Me.CB_fun_eng.AutoSize = True
Me.CB_fun_eng.FontSize = MetroFramework.MetroCheckBoxSize.Medium
Me.CB_fun_eng.ForeColor = System.Drawing.Color.Black
Me.CB_fun_eng.Location = New System.Drawing.Point(34, 35)
Me.CB_fun_eng.Name = "CB_fun_eng"
Me.CB_fun_eng.Size = New System.Drawing.Size(68, 19)
Me.CB_fun_eng.TabIndex = 33
Me.CB_fun_eng.Text = "English"
Me.CB_fun_eng.UseSelectable = True
'
'CB_fun_es
'
Me.CB_fun_es.AutoSize = True
Me.CB_fun_es.FontSize = MetroFramework.MetroCheckBoxSize.Medium
Me.CB_fun_es.ForeColor = System.Drawing.Color.Black
Me.CB_fun_es.Location = New System.Drawing.Point(148, 35)
Me.CB_fun_es.Name = "CB_fun_es"
Me.CB_fun_es.Size = New System.Drawing.Size(100, 19)
Me.CB_fun_es.TabIndex = 34
Me.CB_fun_es.Text = "Español (LA)"
Me.CB_fun_es.UseSelectable = True
'
'CB_fun_ptbr
'
Me.CB_fun_ptbr.AutoSize = True
Me.CB_fun_ptbr.FontSize = MetroFramework.MetroCheckBoxSize.Medium
Me.CB_fun_ptbr.ForeColor = System.Drawing.Color.Black
Me.CB_fun_ptbr.Location = New System.Drawing.Point(270, 35)
Me.CB_fun_ptbr.Name = "CB_fun_ptbr"
Me.CB_fun_ptbr.Size = New System.Drawing.Size(131, 19)
Me.CB_fun_ptbr.TabIndex = 35
Me.CB_fun_ptbr.Text = "Português (Brasil)"
Me.CB_fun_ptbr.UseSelectable = True
'
'TabPage7
'
Me.TabPage7.BackColor = System.Drawing.Color.Transparent
@ -1770,11 +1510,11 @@ 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, 54)
Me.TabPage7.Name = "TabPage7"
Me.TabPage7.Size = New System.Drawing.Size(501, 528)
Me.TabPage7.Size = New System.Drawing.Size(501, 509)
Me.TabPage7.TabIndex = 5
Me.TabPage7.Text = " About "
Me.TabPage7.Text = " About "
'
'LastVersion
'
@ -1963,16 +1703,6 @@ Partial Class Einstellungen
Me.GroupBox20.ResumeLayout(False)
Me.GroupBox20.PerformLayout()
Me.GroupBox19.ResumeLayout(False)
Me.TabPage6.ResumeLayout(False)
Me.GroupBox15.ResumeLayout(False)
Me.GroupBox10.ResumeLayout(False)
Me.GroupBox7.ResumeLayout(False)
Me.GroupBox9.ResumeLayout(False)
Me.GroupBox13.ResumeLayout(False)
Me.GroupBox11.ResumeLayout(False)
Me.GroupBox11.PerformLayout()
Me.GroupBox8.ResumeLayout(False)
Me.GroupBox8.PerformLayout()
Me.TabPage7.ResumeLayout(False)
CType(Me.PictureBox7, System.ComponentModel.ISupportInitialize).EndInit()
Me.ResumeLayout(False)
@ -2016,13 +1746,8 @@ Partial Class Einstellungen
Private WithEvents TabPage2 As MetroFramework.Controls.MetroTabPage
Private WithEvents TabPage1 As MetroFramework.Controls.MetroTabPage
Private WithEvents TabControl1 As MetroFramework.Controls.MetroTabControl
Private WithEvents TabPage6 As MetroFramework.Controls.MetroTabPage
Friend WithEvents TabPage7 As TabPage
Friend WithEvents PictureBox7 As PictureBox
Friend WithEvents GroupBox7 As GroupBox
Friend WithEvents GroupBox9 As GroupBox
Friend WithEvents GroupBox10 As GroupBox
Friend WithEvents GroupBox11 As GroupBox
Friend WithEvents Button1 As Button
Friend WithEvents Label1 As MetroFramework.Controls.MetroLabel
Friend WithEvents Label2 As MetroFramework.Controls.MetroLabel
@ -2030,12 +1755,7 @@ Partial Class Einstellungen
Public WithEvents Label6 As MetroFramework.Controls.MetroLabel
Public WithEvents Label5 As MetroFramework.Controls.MetroLabel
Friend WithEvents CheckBox2 As MetroFramework.Controls.MetroCheckBox
Friend WithEvents CB_fun_ptbr As MetroFramework.Controls.MetroCheckBox
Friend WithEvents CB_fun_es As MetroFramework.Controls.MetroCheckBox
Friend WithEvents CB_fun_eng As MetroFramework.Controls.MetroCheckBox
Friend WithEvents CB_srt As MetroFramework.Controls.MetroCheckBox
Friend WithEvents CB_vtt As MetroFramework.Controls.MetroCheckBox
Friend WithEvents AAuto As MetroFramework.Controls.MetroRadioButton
Friend WithEvents A240p As MetroFramework.Controls.MetroRadioButton
Friend WithEvents A480p As MetroFramework.Controls.MetroRadioButton
Friend WithEvents A360p As MetroFramework.Controls.MetroRadioButton
Friend WithEvents A720p As MetroFramework.Controls.MetroRadioButton
@ -2048,13 +1768,9 @@ Partial Class Einstellungen
Friend WithEvents DarkMode As MetroFramework.Controls.MetroCheckBox
Friend WithEvents TextBox1 As MetroFramework.Controls.MetroTextBox
Friend WithEvents CB_CR_Harsubs As MetroFramework.Controls.MetroComboBox
Friend WithEvents CB_Fun_HardSubs As MetroFramework.Controls.MetroComboBox
Friend WithEvents Fun_Dub_Over As MetroFramework.Controls.MetroComboBox
Public WithEvents LastVersion As MetroFramework.Controls.MetroLabel
Friend WithEvents BackgroundWorker1 As System.ComponentModel.BackgroundWorker
Friend WithEvents http_support As MetroFramework.Controls.MetroComboBox
Friend WithEvents GroupBox13 As GroupBox
Friend WithEvents FunSubDef As MetroFramework.Controls.MetroComboBox
Friend WithEvents GroupBox14 As GroupBox
Friend WithEvents CB_Format As MetroFramework.Controls.MetroComboBox
Friend WithEvents MetroTabPage1 As MetroFramework.Controls.MetroTabPage
@ -2068,9 +1784,6 @@ Partial Class Einstellungen
Friend WithEvents ListBit_4500 As ToolStripMenuItem
Friend WithEvents ListBit_3500 As ToolStripMenuItem
Friend WithEvents ListBit_2500 As ToolStripMenuItem
Friend WithEvents GroupBox8 As GroupBox
Friend WithEvents GroupBox15 As GroupBox
Friend WithEvents Bitrate_Funi As MetroFramework.Controls.MetroComboBox
Friend WithEvents GroupBox16 As GroupBox
Friend WithEvents DD_DLMode As MetroFramework.Controls.MetroComboBox
Friend WithEvents MetroTabPage2 As MetroFramework.Controls.MetroTabPage

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">
<value>118, 20</value>
</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">
<value>332, 20</value>
</metadata>

309
Crunchyroll Downloader/einstellungen.vb
View File

@ -44,8 +44,6 @@ Public Class Einstellungen
TempTB.Text = Main.TempFolder
LeadingZeroDD.SelectedIndex = Main.LeadingZero
Bitrate_Funi.SelectedIndex = Main.Funimation_Bitrate
CB_Ignore.SelectedIndex = Main.IgnoreSeason
CB_HideSF.SelectedIndex = Main.HideFLInt
@ -106,16 +104,7 @@ Public Class Einstellungen
#End Region
For i As Integer = 0 To Main.SubFunimation.Count - 1
If Main.SubFunimation(i) = "en" Then
CB_fun_eng.Checked = True
ElseIf Main.SubFunimation(i) = "es" Then
CB_fun_es.Checked = True
ElseIf Main.SubFunimation(i) = "pt" Then
CB_fun_ptbr.Checked = True
End If
Next
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
@ -132,32 +121,8 @@ Public Class Einstellungen
DD_DLMode.SelectedIndex = 0
End If
If Main.Funimation_srt = True Then
CB_srt.Checked = True
Else
CB_srt.Checked = False
End If
If Main.Funimation_vtt = True Then
CB_vtt.Checked = True
Else
CB_vtt.Checked = False
End If
If Main.HardSubFunimation = "en" Then
CB_Fun_HardSubs.SelectedItem = "English"
ElseIf Main.HardSubFunimation = "pt" Then
CB_Fun_HardSubs.SelectedItem = "Português (Brasil)"
ElseIf Main.HardSubFunimation = "es" Then
CB_Fun_HardSubs.SelectedItem = "Español (LA)"
Else
CB_Fun_HardSubs.SelectedItem = "Disabled"
'FunimationHardsub.Checked = True
End If
If Main.VideoFormat = ".mkv" Then
CB_Format.SelectedItem = "MKV"
ElseIf Main.VideoFormat = ".aac" Then
@ -166,22 +131,6 @@ Public Class Einstellungen
CB_Format.SelectedItem = "MP4"
End If
If Main.DubFunimation = "english" Then
Fun_Dub_Over.SelectedItem = "english"
ElseIf Main.DubFunimation = "japanese" Then
Fun_Dub_Over.SelectedItem = "japanese"
ElseIf Main.DubFunimation = "portuguese(Brazil)" Then
Fun_Dub_Over.SelectedItem = "portuguese(Brazil)"
ElseIf Main.DubFunimation = "spanish(Mexico)" Then
Fun_Dub_Over.SelectedItem = "spanish(Mexico)"
Else
Fun_Dub_Over.SelectedItem = "Disabled"
End If
Try
GB_Resolution.Text = Main.GB_Resolution_Text
@ -199,8 +148,8 @@ Public Class Einstellungen
A480p.Checked = True
ElseIf Main.Reso = 360 Then
A360p.Checked = True
ElseIf Main.Reso = 42 Then
AAuto.Checked = True
ElseIf Main.Reso = 240 Then
A240p.Checked = True
End If
CB_CR_Harsubs.Items.Clear()
@ -291,18 +240,6 @@ Public Class Einstellungen
End If
If Main.DefaultSubFunimation = "en" Then
FunSubDef.SelectedItem = "English"
ElseIf Main.DefaultSubFunimation = "pt" Then
FunSubDef.SelectedItem = "Português (Brasil)"
ElseIf Main.DefaultSubFunimation = "es" Then
FunSubDef.SelectedItem = "Español (LA)"
Else
FunSubDef.SelectedItem = "[Disabled]"
'FunimationHardsub.Checked = True
End If
If Main.DefaultSubCR = "de-DE" Then
CR_SoftSubDefault.SelectedItem = "Deutsch"
@ -358,9 +295,6 @@ Public Class Einstellungen
My.Settings.LeadingZero = LeadingZeroDD.SelectedIndex
My.Settings.OverrideDub = CB_OverrideDub.Checked
My.Settings.Captions = CB_Cap.Checked
Main.Funimation_Bitrate = Bitrate_Funi.SelectedIndex
My.Settings.Funimation_Bitrate = Bitrate_Funi.SelectedIndex
If http_support.Text = "add-on support disabled" Then
My.Settings.ServerPort = 0
@ -461,8 +395,8 @@ Public Class Einstellungen
ElseIf A480p.Checked Then
Main.Reso = 480
My.Settings.Reso = Main.Reso
ElseIf AAuto.Checked Then
Main.Reso = 42
ElseIf A240p.Checked Then
Main.Reso = 240
My.Settings.Reso = Main.Reso
End If
@ -570,101 +504,6 @@ Public Class Einstellungen
My.Settings.Keep_Cache = Main.KeepCache
#Region "funimation"
Main.DubFunimation = Fun_Dub_Over.SelectedItem.ToString
My.Settings.FunimationDub = Main.DubFunimation
'If CB_Fun_HardSubs.SelectedItem.ToString = "Disabled" Then
' Main.HardSubFunimation = "Disabled"
' rk.SetValue("FunimationHardsub", "Disabled", RegistryValueKind.String)
'ElseIf CB_Fun_HardSubs.SelectedItem.ToString = "English" Then
' Main.HardSubFunimation = "en"
' rk.SetValue("FunimationHardsub", "en", RegistryValueKind.String)
'ElseIf CB_Fun_HardSubs.SelectedItem.ToString = "Português (Brasil)" Then
' Main.HardSubFunimation = "pt"
' rk.SetValue("FunimationHardsub", "pt", RegistryValueKind.String)
'ElseIf CB_Fun_HardSubs.SelectedItem.ToString = "Español (LA)" Then
' Main.HardSubFunimation = "es"
' rk.SetValue("FunimationHardsub", "es", RegistryValueKind.String)
'End If
If FunSubDef.SelectedItem.ToString = "[Disabled]" Then
Main.DefaultSubFunimation = "Disabled"
My.Settings.DefaultSubFunimation = Main.DefaultSubFunimation
ElseIf FunSubDef.SelectedItem.ToString = "English" Then
Main.DefaultSubFunimation = "en"
My.Settings.DefaultSubFunimation = Main.DefaultSubFunimation
ElseIf FunSubDef.SelectedItem.ToString = "Português (Brasil)" Then
Main.DefaultSubFunimation = "pt"
My.Settings.DefaultSubFunimation = Main.DefaultSubFunimation
ElseIf FunSubDef.SelectedItem.ToString = "Español (LA)" Then
Main.DefaultSubFunimation = "es"
My.Settings.DefaultSubFunimation = Main.DefaultSubFunimation
End If
Main.SubFunimation.Clear()
If CB_fun_eng.Checked = True Then
Main.SubFunimation.Add("en")
End If
If CB_fun_es.Checked = True Then
Main.SubFunimation.Add("es")
End If
If CB_fun_ptbr.Checked = True Then
Main.SubFunimation.Add("pt")
End If
If Main.SubFunimation.Count > 0 And CB_vtt.Checked = False And CB_srt.Checked = False Then
CB_vtt.Checked = True
End If
If CB_srt.Checked = True Then
Main.Funimation_srt = True
My.Settings.Funimation_srt = True
Else
Main.Funimation_srt = False
My.Settings.Funimation_srt = False
End If
If CB_vtt.Checked = True Then
Main.Funimation_vtt = True
My.Settings.Funimation_vtt = True
Else
Main.Funimation_vtt = False
My.Settings.Funimation_vtt = False
End If
Dim FunimationSaveString As String = Nothing
For ii As Integer = 0 To Main.SubFunimation.Count - 1
If FunimationSaveString = Nothing Then
FunimationSaveString = Main.SubFunimation(ii)
Else
FunimationSaveString = FunimationSaveString + "," + Main.SubFunimation(ii)
End If
Next
If FunimationSaveString = Nothing Then
FunimationSaveString = "None"
End If
My.Settings.Fun_Sub = FunimationSaveString
#End Region
Dim ffpmeg_cmd As String = Nothing
@ -789,7 +628,7 @@ Public Class Einstellungen
End Sub
Private Sub ComboBox1_DrawItem(sender As Object, e As DrawItemEventArgs) Handles CB_CR_Harsubs.DrawItem, CB_Fun_HardSubs.DrawItem, Fun_Dub_Over.DrawItem
Private Sub ComboBox1_DrawItem(sender As Object, e As DrawItemEventArgs) Handles CB_CR_Harsubs.DrawItem
Dim CB As ComboBox = CType(sender, ComboBox)
CB.BackColor = Color.White
If e.Index >= 0 Then
@ -804,52 +643,6 @@ Public Class Einstellungen
End Sub
Private Sub AAuto_Click(sender As Object, e As EventArgs) Handles AAuto.Click
If CB_Merge.SelectedIndex > 0 Then
If AAuto.Checked = True Then
If MessageBox.Show("Resolution '[Auto]' and merge the subtitle with the video file will download all resolutions!" + vbNewLine + "Press 'Yes' to enable it anyway", "Prepare for unforeseen consequences.", MessageBoxButtons.YesNo) = DialogResult.Yes Then
Else
AAuto.Checked = False
A360p.Checked = True
End If
End If
'ElseIf HybridMode_CB.Checked = True Then
' If AAuto.Checked = True Then
' MsgBox("Resolution '[Auto]' and 'Hybride Mode' does not work together", MsgBoxStyle.Information)
' AAuto.Checked = False
' A1080p.Checked = True
' End If
End If
End Sub
Private Sub MergeMP4_Click(sender As Object, e As EventArgs)
If CB_Merge.SelectedIndex > 0 Then
If AAuto.Checked = True Then
If MessageBox.Show("Resolution '[Auto]' and merge the subtitle with the video file will download all resolutions!" + vbNewLine + "Press 'Yes' to enable it anyway", "Prepare for unforeseen consequences.", MessageBoxButtons.YesNo) = DialogResult.Yes Then
Else
CB_Merge.SelectedIndex = 0
End If
End If
End If
End Sub
Private Sub ListC1_Click(sender As Object, e As EventArgs) Handles copy.Click, nv_h264.Click, nv_hevc.Click, nv_AV1.Click, CPU_h264.Click, CPU_h265.Click, CPU_AV1.Click, AMD_h264.Click, AMD_hevc.Click, AMD_AV1.Click, Intel_h264.Click, Intel_hevc.Click, Intel_AV1.Click
Dim Button As ToolStripMenuItem = CType(sender, ToolStripMenuItem)
@ -892,21 +685,6 @@ Public Class Einstellungen
End Sub
Private Sub Label7_Click(sender As Object, e As EventArgs)
Process.Start("https://learn.microsoft.com/de-de/microsoft-edge/webview2/")
End Sub
Private Sub Label3_Click(sender As Object, e As EventArgs)
Process.Start("https://www.ffmpeg.org/about.html")
End Sub
Private Sub Label9_Click(sender As Object, e As EventArgs)
Process.Start("https://github.com/hama3254/metroframework-modern-ui")
End Sub
Sub GroupBoxColor(ByVal color As Color)
NumericUpDown1.ForeColor = color
NumericUpDown2.ForeColor = color
@ -925,15 +703,8 @@ Public Class Einstellungen
GroupBox4.ForeColor = color
GroupBox5.ForeColor = color
GroupBox6.ForeColor = color
GroupBox7.ForeColor = color
GroupBox8.ForeColor = color
GroupBox9.ForeColor = color
GroupBox10.ForeColor = color
GroupBox11.ForeColor = color
GroupBox12.ForeColor = color
GroupBox13.ForeColor = color
GroupBox14.ForeColor = color
GroupBox15.ForeColor = color
GroupBox16.ForeColor = color
GroupBox17.ForeColor = color
GroupBox18.ForeColor = color
@ -973,12 +744,6 @@ Public Class Einstellungen
End Sub
Private Sub Server_Click(sender As Object, e As EventArgs)
'If Server.Checked = True Then
' MsgBox("This feature requires a restart of the downloader", MsgBoxStyle.Information)
'End If
End Sub
Private Sub BackgroundWorker1_DoWork(sender As Object, e As System.ComponentModel.DoWorkEventArgs) Handles BackgroundWorker1.DoWork
Try
Dim client0 As New WebClient
@ -1014,60 +779,6 @@ Public Class Einstellungen
Private Sub CB_Fun_HardSubs_SelectedIndexChanged(sender As Object, e As EventArgs) Handles CB_Fun_HardSubs.SelectedIndexChanged
If CB_Fun_HardSubs.SelectedIndex = 0 Then
Else
If Main.HardSubFunimation = "Disabled" Then
If FFMPEG_CommandP1.Text = "-c copy" Then
If MessageBox.Show("Funimation hard subtitle are post-processed." + vbNewLine + "This cost a lot of performance and it should not more than one download run at the time!", "Prepare for unforeseen consequences.", MessageBoxButtons.YesNo) = DialogResult.Yes Then
Else
CB_Fun_HardSubs.SelectedIndex = 0
End If
End If
End If
End If
'MetroMessageBox.Show(Me, "Test", "Test Box", MessageBoxButtons.YesNo, MessageBoxIcon.None, 150)
'MetroMessageBox.Show(Me, "Test", "Test Box", MessageBoxButtons.YesNo, MessageBoxIcon.None, MessageBoxDefaultButton.Button2, 150, MetroThemeStyle.Dark)
End Sub
Private Sub CB_fun_eng_CheckedChanged(sender As Object, e As EventArgs) Handles CB_fun_eng.CheckedChanged
If CB_fun_eng.Checked = True Then
FunSubDef.Items.Add("English")
Else
FunSubDef.Items.Remove("English")
If FunSubDef.Text = "English" Then
FunSubDef.SelectedItem = "[Disabled]"
End If
End If
End Sub
Private Sub CB_fun_es_CheckedChanged(sender As Object, e As EventArgs) Handles CB_fun_es.CheckedChanged
If CB_fun_es.Checked = True Then
FunSubDef.Items.Add("Español (LA)")
Else
FunSubDef.Items.Remove("Español (LA)")
If FunSubDef.Text = "Español (LA)" Then
FunSubDef.SelectedItem = "[Disabled]"
End If
End If
End Sub
Private Sub CB_fun_ptbr_CheckedChanged(sender As Object, e As EventArgs) Handles CB_fun_ptbr.CheckedChanged
If CB_fun_ptbr.Checked = True Then
FunSubDef.Items.Add("Português (Brasil)")
Else
FunSubDef.Items.Remove("Português (Brasil)")
If FunSubDef.Text = "Português (Brasil)" Then
FunSubDef.SelectedItem = "[Disabled]"
End If
End If
End Sub
Private Sub MetroLink1_Click(sender As Object, e As EventArgs)
Process.Start("https://github.com/hama3254/Crunchyroll-Downloader-v3.0/discussions/276")
End Sub
@ -1259,16 +970,6 @@ Public Class Einstellungen
'Private Sub CB_CR_Audio_Click(sender As Object, e As EventArgs) Handles CB_CR_Audio.Click
' Dim Popup As New CheckBoxComboBox
' Popup.Text = "CR Dub selection"
' Popup.Show()
'End Sub
#End Region
#End Region

44
Crunchyroll Downloader/queue.vb
View File

@ -84,48 +84,8 @@ Public Class Queue
If Main.RunningDownloads < Main.MaxDL Then
If Main.ListBoxList.Count > 0 Then
If CBool(InStr(ListBox1.GetItemText(Main.ListBoxList(0)), "funimation.com")) Then
If Main.Funimation_Grapp_RDY = True Then
Dim UriUsed As String = ListBox1.GetItemText(Main.ListBoxList(0))
If CBool(InStr(UriUsed, "funimation.com/v/")) Then
Dim Episode0() As String = UriUsed.Split(New String() {"?"}, System.StringSplitOptions.RemoveEmptyEntries)
Dim Episode() As String = Episode0(0).Split(New String() {"/"}, System.StringSplitOptions.RemoveEmptyEntries)
Dim v1JsonUrl As String = "https://d33et77evd9bgg.cloudfront.net/data/v1/episodes/" + Episode(Episode.Length - 1) + ".json"
Dim v1Json As String = Nothing
Try
Using client As New WebClient()
client.Encoding = System.Text.Encoding.UTF8
client.Headers.Add(My.Settings.User_Agend.Replace(Chr(34), ""))
v1Json = client.DownloadString(v1JsonUrl)
End Using
Main.Funimation_Grapp_RDY = False
Main.WebbrowserURL = UriUsed
Main.ListBoxList.Remove(UriUsed)
Main.b = False
Main.Invalidate()
Main.GetFunimationNewJS_VideoProxy(Nothing, v1Json)
Exit Sub
Catch ex As Exception
Debug.WriteLine("error- getting v1Json data for the bypasss")
Debug.WriteLine(ex.ToString)
End Try
End If
Main.Funimation_Grapp_RDY = False
Main.WebbrowserURL = UriUsed
Main.ListBoxList.Remove(UriUsed)
Main.b = False
Main.Text = "Status: loading in browser"
Main.LoadBrowser(UriUsed)
End If
Else
Dim UriUsed As String = ListBox1.GetItemText(Main.ListBoxList(0))
Dim UriUsed As String = ListBox1.GetItemText(Main.ListBoxList(0))
If Main.Grapp_RDY = True Then
Main.Grapp_RDY = False
@ -137,8 +97,6 @@ Public Class Queue
End If
End If
End If
End Sub