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

Funimation LA support

Browse Source 
Funimation dub selection added
funimation subtile handling rewritten
added sub option for Mexico/Brazil (Spanish and Portuguese)
This commit is contained in:
hama3254 2020-11-19 22:28:42 +01:00
parent df4d2e95ae
commit 754f38daef
22 changed files with 693 additions and 378 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.

BIN
.vs/Crunchyroll Downloader/v15/Server/sqlite3/storage.ide
View File

Binary file not shown.

BIN
.vs/Crunchyroll Downloader/v15/Server/sqlite3/storage.ide-shm
View File

Binary file not shown.

BIN
.vs/Crunchyroll Downloader/v15/Server/sqlite3/storage.ide-wal
View File

Binary file not shown.

389
Crunchyroll Downloader/Anime_Add.vb
View File

@ -218,191 +218,204 @@ Public Class Anime_Add
If groupBox1.Visible = True Then If groupBox1.Visible = True Then
Try Try
If CBool(InStr(textBox1.Text, "crunchyroll.com")) Or CBool(InStr(textBox1.Text, "funimation.com")) Then 'Or CBool(InStr(textBox1.Text, "anime-on-demand.de")) Then If CBool(InStr(textBox1.Text, "crunchyroll.com")) Or CBool(InStr(textBox1.Text, "funimation.com")) Then 'Or CBool(InStr(textBox1.Text, "anime-on-demand.de")) Then
If StatusLabel.Text = "Status: waiting for episode selection" Then If InStr(textBox1.Text, "funimation.com") Then
If MessageBox.Show("Are you sure you want cancel the advanced download?", "confirm?", MessageBoxButtons.YesNo, MessageBoxIcon.Question) = DialogResult.Yes Then If InStr(textBox1.Text, "lang=") Then
StatusLabel.Text = "Status: idle"
Else Else
Exit Sub If InStr(textBox1.Text, "?") Then
pictureBox4.Enabled = True textBox1.AppendText("&lang=" + Main.DubFunimation)
Else
textBox1.AppendText("?lang=" + Main.DubFunimation)
End If
End If End If
'ElseIf LabelUpdate = "Status: looking for video file" Then End If
' Exit Sub
' pictureBox4.Enabled = True If StatusLabel.Text = "Status: waiting for episode selection" Then
Else If MessageBox.Show("Are you sure you want cancel the advanced download?", "confirm?", MessageBoxButtons.YesNo, MessageBoxIcon.Question) = DialogResult.Yes Then
If Main.RunningDownloads >= Main.MaxDL Then StatusLabel.Text = "Status: idle"
ListBox1.Items.Add(textBox1.Text) Else
textBox1.ForeColor = Color.FromArgb(9248044) Exit Sub
Pause(1) pictureBox4.Enabled = True
textBox1.ForeColor = Color.Black End If
textBox1.Text = "URL" 'ElseIf LabelUpdate = "Status: looking for video file" Then
' Exit Sub
' pictureBox4.Enabled = True
Else Else
If Main.Grapp_RDY = True Then If Main.RunningDownloads >= Main.MaxDL Then
GeckoFX.WebBrowser1.Navigate(textBox1.Text) ListBox1.Items.Add(textBox1.Text)
StatusLabel.Text = "Status: loading ..." textBox1.ForeColor = Color.FromArgb(9248044)
Main.b = False Pause(1)
textBox1.ForeColor = Color.Black
textBox1.Text = "URL"
Else
If Main.Grapp_RDY = True Then
GeckoFX.WebBrowser1.Navigate(textBox1.Text)
StatusLabel.Text = "Status: loading ..."
Main.b = False
End If
End If End If
End If End If
End If ElseIf CBool(InStr(textBox1.Text, "anime-on-demand.de")) Then
ElseIf CBool(InStr(textBox1.Text, "anime-on-demand.de")) Then Main.b = False
Main.b = False AoD_DubList.Clear()
AoD_DubList.Clear() AoD_OmUList.Clear()
AoD_OmUList.Clear() Dim FileLocation As DirectoryInfo = New DirectoryInfo(Application.StartupPath)
Dim FileLocation As DirectoryInfo = New DirectoryInfo(Application.StartupPath) Dim CurrentFile As String = Nothing
Dim CurrentFile As String = Nothing For Each File In FileLocation.GetFiles()
For Each File In FileLocation.GetFiles() If InStr(File.FullName, "gecko-network.txt") Then
If InStr(File.FullName, "gecko-network.txt") Then CurrentFile = File.FullName
CurrentFile = File.FullName Exit For
Exit For End If
Next
If CurrentFile = Nothing Then
Else
Dim logFileStream As FileStream = New FileStream(CurrentFile, FileMode.Open, FileAccess.ReadWrite, FileShare.ReadWrite)
Dim logFileReader As StreamReader = New StreamReader(logFileStream)
logFileStream.SetLength(0)
logFileReader.Close()
logFileStream.Close()
End If End If
Next Main.LogBrowserData = True
If CurrentFile = Nothing Then GeckoPreferences.Default("logging.config.LOG_FILE") = "gecko-network.txt"
Else GeckoPreferences.Default("logging.nsHttp") = 3
Dim logFileStream As FileStream = New FileStream(CurrentFile, FileMode.Open, FileAccess.ReadWrite, FileShare.ReadWrite) GeckoFX.WebBrowser1.Navigate(textBox1.Text)
Dim logFileReader As StreamReader = New StreamReader(logFileStream)
logFileStream.SetLength(0)
logFileReader.Close()
logFileStream.Close()
End If
Main.LogBrowserData = True
GeckoPreferences.Default("logging.config.LOG_FILE") = "gecko-network.txt"
GeckoPreferences.Default("logging.nsHttp") = 3
GeckoFX.WebBrowser1.Navigate(textBox1.Text)
Do Until Main.b = True Do Until Main.b = True
Main.Text = "Status: loading ..." Main.Text = "Status: loading ..."
Main.Invalidate() Main.Invalidate()
StatusLabel.Text = "Status: loading ..." StatusLabel.Text = "Status: loading ..."
Pause(1) Pause(1)
Loop Loop
Main.LogBrowserData = False Main.LogBrowserData = False
GeckoPreferences.Default("logging.config.LOG_FILE") = "gecko-network.txt" GeckoPreferences.Default("logging.config.LOG_FILE") = "gecko-network.txt"
GeckoPreferences.Default("logging.nsHttp") = 0 GeckoPreferences.Default("logging.nsHttp") = 0
Dim AoD_Cookie As String = Nothing Dim AoD_Cookie As String = Nothing
Dim AoDhttpLog As DirectoryInfo = New DirectoryInfo(Application.StartupPath) Dim AoDhttpLog As DirectoryInfo = New DirectoryInfo(Application.StartupPath)
Dim AoDhttpLogFile As String = Nothing Dim AoDhttpLogFile As String = Nothing
For Each File In AoDhttpLog.GetFiles() For Each File In AoDhttpLog.GetFiles()
If InStr(File.FullName, "gecko-network.txt") Then If InStr(File.FullName, "gecko-network.txt") Then
AoDhttpLogFile = File.FullName AoDhttpLogFile = File.FullName
Exit For Exit For
End If End If
Next Next
Dim AoDlogFileStream As FileStream = New FileStream(AoDhttpLogFile, FileMode.Open, FileAccess.ReadWrite, FileShare.ReadWrite) Dim AoDlogFileStream As FileStream = New FileStream(AoDhttpLogFile, FileMode.Open, FileAccess.ReadWrite, FileShare.ReadWrite)
Dim AoDlogFileReader As StreamReader = New StreamReader(AoDlogFileStream) Dim AoDlogFileReader As StreamReader = New StreamReader(AoDlogFileStream)
Dim line As String = Nothing Dim line As String = Nothing
Dim HTMLString As String = Nothing Dim HTMLString As String = Nothing
line = AoDlogFileReader.ReadLine
While (line IsNot Nothing)
line = AoDlogFileReader.ReadLine line = AoDlogFileReader.ReadLine
If CBool(InStr(line, "Cookie: ")) And CBool(InStr(line, "remember_user_token=")) Then
AoD_Cookie = "Cookie: " + line.Split(New String() {"Cookie: "}, System.StringSplitOptions.RemoveEmptyEntries)(1)
Exit While
End If
End While
AoDlogFileReader.Close()
AoDlogFileStream.Close()
If AoD_Cookie = Nothing Then
MsgBox(Main.LoginReminder)
Main.Text = "Crunchyroll Downloader"
Main.Invalidate()
StatusLabel.Text = "Status: idle"
Exit Sub
End If
'MsgBox(AoD_Cookie)
'Main.WebbrowserCookie = AoD_Cookie
If CBool(InStr(Main.WebbrowserText, "/OmU/1080/hlsfirst/")) Then
Dim OmUStreamSplit() As String = Main.WebbrowserText.Split(New String() {"/OmU/1080/hlsfirst/"}, System.StringSplitOptions.RemoveEmptyEntries)
Dim OmUStreamSplitToken() As String = OmUStreamSplit(1).Split(New String() {Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries)
Dim OmUStreamSplitEpisodeIndex() As String = OmUStreamSplit(0).Split(New String() {"/videomaterialurl/"}, System.StringSplitOptions.RemoveEmptyEntries)
Dim OmUStreamSplitEpisodeIndex2() As String = OmUStreamSplitEpisodeIndex(1).Split(New String() {"/"}, System.StringSplitOptions.RemoveEmptyEntries)
Dim m3u8Strings As String = Nothing
'I/nsHttp Cookie:
Try
Using client As New WebClient()
client.Headers.Add("User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:82.0) Gecko/20100101 Firefox/82.0")
client.Headers.Add("ACCEPT: application/json, text/javascript, */*; q=0.01")
client.Headers.Add("Accept-Encoding: gzip, deflate, br")
client.Headers.Add("X-Requested-With: XMLHttpRequest")
client.Headers.Add(AoD_Cookie) '+ WebBrowser1.Document.Cookie)
'MsgBox(OmUStreamSplitEpisodeIndex(1))
m3u8Strings = client.DownloadString("https://www.anime-on-demand.de/videomaterialurl/" + OmUStreamSplitEpisodeIndex2(0) + "/OmU/1080/hlsfirst/" + OmUStreamSplitToken(0))
'("Sub: " + m3u8Strings)
End Using
Catch ex As Exception
MsgBox(ex.ToString + vbNewLine + "https://www.anime-on-demand.de/videomaterialurl/" + OmUStreamSplitEpisodeIndex2(0) + "/OmU/1080/hlsfirst/" + OmUStreamSplitToken(0))
End Try
If m3u8Strings = Nothing Then
Else
Dim OmUStreams() As String = m3u8Strings.Split(New String() {My.Resources.AoD_files}, System.StringSplitOptions.RemoveEmptyEntries) While (line IsNot Nothing)
For i As Integer = 1 To OmUStreams.Count - 1 line = AoDlogFileReader.ReadLine
AoD_OmuList.Add(OmUStreams(i)) If CBool(InStr(line, "Cookie: ")) And CBool(InStr(line, "remember_user_token=")) Then
Next AoD_Cookie = "Cookie: " + line.Split(New String() {"Cookie: "}, System.StringSplitOptions.RemoveEmptyEntries)(1)
Exit While
End If
End While
AoDlogFileReader.Close()
AoDlogFileStream.Close()
If AoD_Cookie = Nothing Then
MsgBox(Main.LoginReminder)
Main.Text = "Crunchyroll Downloader"
Main.Invalidate()
StatusLabel.Text = "Status: idle"
Exit Sub
End If
'MsgBox(AoD_Cookie)
'Main.WebbrowserCookie = AoD_Cookie
If CBool(InStr(Main.WebbrowserText, "/OmU/1080/hlsfirst/")) Then
Dim OmUStreamSplit() As String = Main.WebbrowserText.Split(New String() {"/OmU/1080/hlsfirst/"}, System.StringSplitOptions.RemoveEmptyEntries)
Dim OmUStreamSplitToken() As String = OmUStreamSplit(1).Split(New String() {Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries)
Dim OmUStreamSplitEpisodeIndex() As String = OmUStreamSplit(0).Split(New String() {"/videomaterialurl/"}, System.StringSplitOptions.RemoveEmptyEntries)
Dim OmUStreamSplitEpisodeIndex2() As String = OmUStreamSplitEpisodeIndex(1).Split(New String() {"/"}, System.StringSplitOptions.RemoveEmptyEntries)
Dim m3u8Strings As String = Nothing
'I/nsHttp Cookie:
Try
Using client As New WebClient()
client.Headers.Add("User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:82.0) Gecko/20100101 Firefox/82.0")
client.Headers.Add("ACCEPT: application/json, text/javascript, */*; q=0.01")
client.Headers.Add("Accept-Encoding: gzip, deflate, br")
client.Headers.Add("X-Requested-With: XMLHttpRequest")
client.Headers.Add(AoD_Cookie) '+ WebBrowser1.Document.Cookie)
'MsgBox(OmUStreamSplitEpisodeIndex(1))
m3u8Strings = client.DownloadString("https://www.anime-on-demand.de/videomaterialurl/" + OmUStreamSplitEpisodeIndex2(0) + "/OmU/1080/hlsfirst/" + OmUStreamSplitToken(0))
'("Sub: " + m3u8Strings)
End Using
Catch ex As Exception
MsgBox(ex.ToString + vbNewLine + "https://www.anime-on-demand.de/videomaterialurl/" + OmUStreamSplitEpisodeIndex2(0) + "/OmU/1080/hlsfirst/" + OmUStreamSplitToken(0))
End Try
If m3u8Strings = Nothing Then
Else
Dim OmUStreams() As String = m3u8Strings.Split(New String() {My.Resources.AoD_files}, System.StringSplitOptions.RemoveEmptyEntries)
For i As Integer = 1 To OmUStreams.Count - 1
AoD_OmUList.Add(OmUStreams(i))
Next
End If
End If End If
End If If CBool(InStr(Main.WebbrowserText, "/Dub/1080/hlsfirst/")) Then
Dim DubStreamSplit() As String = Main.WebbrowserText.Split(New String() {"/Dub/1080/hlsfirst/"}, System.StringSplitOptions.RemoveEmptyEntries)
Dim DubStreamSplitToken() As String = DubStreamSplit(1).Split(New String() {Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries)
Dim DubStreamSplitEpisodeIndex() As String = DubStreamSplit(0).Split(New String() {"/videomaterialurl/"}, System.StringSplitOptions.RemoveEmptyEntries)
Dim DubStreamSplitEpisodeIndex2() As String = DubStreamSplitEpisodeIndex(1).Split(New String() {"/"}, System.StringSplitOptions.RemoveEmptyEntries)
Dim m3u8Strings As String = Nothing
'I/nsHttp Cookie:
Try
Using client As New WebClient()
client.Headers.Add("User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:82.0) Gecko/20100101 Firefox/82.0")
client.Headers.Add("ACCEPT: application/json, text/javascript, */*; q=0.01")
client.Headers.Add("Accept-Encoding: gzip, deflate, br")
client.Headers.Add("X-Requested-With: XMLHttpRequest")
client.Headers.Add(AoD_Cookie) '+ WebBrowser1.Document.Cookie)
'MsgBox(DubStreamSplitEpisodeIndex(1))
m3u8Strings = client.DownloadString("https://www.anime-on-demand.de/videomaterialurl/" + DubStreamSplitEpisodeIndex2(0) + "/Dub/1080/hlsfirst/" + DubStreamSplitToken(0))
'MsgBox("Dub: " + m3u8Strings)
End Using
Catch ex As Exception
MsgBox(ex.ToString + vbNewLine + "https://www.anime-on-demand.de/videomaterialurl/" + DubStreamSplitEpisodeIndex2(0) + "/Dub/1080/hlsfirst/" + DubStreamSplitToken(0))
End Try
If m3u8Strings = Nothing Then
Else
If CBool(InStr(Main.WebbrowserText, "/Dub/1080/hlsfirst/")) Then Dim DubStreams() As String = m3u8Strings.Split(New String() {My.Resources.AoD_files}, System.StringSplitOptions.RemoveEmptyEntries)
Dim DubStreamSplit() As String = Main.WebbrowserText.Split(New String() {"/Dub/1080/hlsfirst/"}, System.StringSplitOptions.RemoveEmptyEntries) For i As Integer = 1 To DubStreams.Count - 1
Dim DubStreamSplitToken() As String = DubStreamSplit(1).Split(New String() {Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries) AoD_DubList.Add(DubStreams(i))
Dim DubStreamSplitEpisodeIndex() As String = DubStreamSplit(0).Split(New String() {"/videomaterialurl/"}, System.StringSplitOptions.RemoveEmptyEntries) Next
Dim DubStreamSplitEpisodeIndex2() As String = DubStreamSplitEpisodeIndex(1).Split(New String() {"/"}, System.StringSplitOptions.RemoveEmptyEntries) End If
Dim m3u8Strings As String = Nothing
'I/nsHttp Cookie:
Try
Using client As New WebClient()
client.Headers.Add("User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:82.0) Gecko/20100101 Firefox/82.0")
client.Headers.Add("ACCEPT: application/json, text/javascript, */*; q=0.01")
client.Headers.Add("Accept-Encoding: gzip, deflate, br")
client.Headers.Add("X-Requested-With: XMLHttpRequest")
client.Headers.Add(AoD_Cookie) '+ WebBrowser1.Document.Cookie)
'MsgBox(DubStreamSplitEpisodeIndex(1))
m3u8Strings = client.DownloadString("https://www.anime-on-demand.de/videomaterialurl/" + DubStreamSplitEpisodeIndex2(0) + "/Dub/1080/hlsfirst/" + DubStreamSplitToken(0))
'MsgBox("Dub: " + m3u8Strings)
End Using
Catch ex As Exception
MsgBox(ex.ToString + vbNewLine + "https://www.anime-on-demand.de/videomaterialurl/" + DubStreamSplitEpisodeIndex2(0) + "/Dub/1080/hlsfirst/" + DubStreamSplitToken(0))
End Try
If m3u8Strings = Nothing Then
Else
Dim DubStreams() As String = m3u8Strings.Split(New String() {My.Resources.AoD_files}, System.StringSplitOptions.RemoveEmptyEntries)
For i As Integer = 1 To DubStreams.Count - 1 End If
AoD_DubList.Add(DubStreams(i)) AoD_Mode = True
Next If AoD_DubList.Count And AoD_OmUList.Count > 0 Then
GroupBox3.Visible = False
groupBox2.Visible = True
groupBox1.Visible = False
ComboBox1.Enabled = True
comboBox3.Enabled = True
comboBox4.Enabled = True
ComboBox1.Items.Add("Dub")
ComboBox1.Items.Add("OmU")
FillAoDDropDown()
ElseIf AoD_DubList.Count Or AoD_OmUList.Count > 0 Then
GroupBox3.Visible = False
groupBox2.Visible = True
groupBox1.Visible = False
ComboBox1.Enabled = False
comboBox3.Enabled = True
comboBox4.Enabled = True
FillAoDDropDown()
End If End If
ElseIf CBool(InStr(textBox1.Text, "Test=true")) Then
End If GeckoFX.WebBrowser1.Navigate(textBox1.Text)
AoD_Mode = True Else 'If CBool(InStr(textBox1.Text, "vrv.co")) Then
If AoD_DubList.Count And AoD_OmUList.Count > 0 Then If MessageBox.Show("This in NOT a Crunchyroll URL, try anyway?", "confirm?", MessageBoxButtons.YesNo, MessageBoxIcon.Question) = DialogResult.Yes Then
GroupBox3.Visible = False
groupBox2.Visible = True
groupBox1.Visible = False
ComboBox1.Enabled = True
comboBox3.Enabled = True
comboBox4.Enabled = True
ComboBox1.Items.Add("Dub")
ComboBox1.Items.Add("OmU")
FillAoDDropDown()
ElseIf AoD_DubList.Count Or AoD_OmUList.Count > 0 Then
GroupBox3.Visible = False
groupBox2.Visible = True
groupBox1.Visible = False
ComboBox1.Enabled = False
comboBox3.Enabled = True
comboBox4.Enabled = True
FillAoDDropDown()
End If
ElseIf CBool(InStr(textBox1.Text, "Test=true")) Then
GeckoFX.WebBrowser1.Navigate(textBox1.Text)
Else 'If CBool(InStr(textBox1.Text, "vrv.co")) Then
If MessageBox.Show("This in NOT a Crunchyroll URL, try anyway?", "confirm?", MessageBoxButtons.YesNo, MessageBoxIcon.Question) = DialogResult.Yes Then
Dim FileLocation As DirectoryInfo = New DirectoryInfo(Application.StartupPath) Dim FileLocation As DirectoryInfo = New DirectoryInfo(Application.StartupPath)
Dim CurrentFile As String = Nothing Dim CurrentFile As String = Nothing
For Each File In FileLocation.GetFiles() For Each File In FileLocation.GetFiles()
@ -453,7 +466,7 @@ Public Class Anime_Add
MsgBox("Error nothing selected!", MsgBoxStyle.Exclamation) MsgBox("Error nothing selected!", MsgBoxStyle.Exclamation)
Exit Sub Exit Sub
ElseIf comboBox3.SelectedIndex < 0 Or comboBox4.SelectedIndex < 0 Then ElseIf comboBox3.SelectedIndex < 0 Or comboBox4.SelectedIndex < 0 Then
MsgBox("deteced!", MsgBoxStyle.Exclamation) 'MsgBox("deteced!", MsgBoxStyle.Exclamation)
If comboBox3.SelectedIndex < 0 Then If comboBox3.SelectedIndex < 0 Then
'MsgBox("deteced! 3", MsgBoxStyle.Exclamation) 'MsgBox("deteced! 3", MsgBoxStyle.Exclamation)
Dim CB4 As Integer = comboBox4.SelectedIndex Dim CB4 As Integer = comboBox4.SelectedIndex
@ -858,10 +871,7 @@ Public Class Anime_Add
Dim client As New WebClient Dim client As New WebClient
client.Encoding = System.Text.Encoding.UTF8 client.Encoding = System.Text.Encoding.UTF8
Dim text As String = client.DownloadString(m3u8_Master_url) Dim text As String = client.DownloadString(m3u8_Master_url)
'Me.Invoke(New Action(Function()
' MsgBox(text)
' Return Nothing
' End Function))
If InStr(text, "RESOLUTION=") Then 'master m3u8 no fragments If InStr(text, "RESOLUTION=") Then 'master m3u8 no fragments
Dim new_m3u8() As String = text.Split(New String() {vbLf}, System.StringSplitOptions.RemoveEmptyEntries) Dim new_m3u8() As String = text.Split(New String() {vbLf}, System.StringSplitOptions.RemoveEmptyEntries)
@ -870,13 +880,28 @@ Public Class Anime_Add
End If End If
For i2 As Integer = 0 To new_m3u8.Count - 1 For i2 As Integer = 0 To new_m3u8.Count - 1
'MsgBox("x" + Main.Resu.ToString) 'MsgBox("x" + Main.Resu.ToString)
If CBool(InStr(new_m3u8(i2), "x" + TargetReso.ToString)) = True Then If CBool(InStr(new_m3u8(i2), "x" + TargetReso.ToString)) = True Then
m3u8_list.Add(new_m3u8(i2) + vbCrLf + new_m3u8(i2 + 1)) m3u8_list.Add(new_m3u8(i2) + vbCrLf + new_m3u8(i2 + 1))
'm3u8_url_Temp = new_m3u8(i2 + 1) 'm3u8_url_Temp = new_m3u8(i2 + 1)
'Exit For 'Exit For
ElseIf CBool(InStr(new_m3u8(i2), "x1081")) = True Then
If AoD_1080pPlus = True Then
'Me.Invoke(New Action(Function()
' MsgBox(new_m3u8(i2 + 1))
' Return Nothing
' End Function))
m3u8_list.Add(new_m3u8(i2) + vbCrLf + new_m3u8(i2 + 1))
End If
End If End If
Next Next
'Me.Invoke(New Action(Function()
' MsgBox(m3u8_list.Count.ToString)
' Return Nothing
' End Function))
If m3u8_list.Count > 1 Then If m3u8_list.Count > 1 Then
Dim HigestBitrate As Integer = 0 Dim HigestBitrate As Integer = 0
For i2 As Integer = 0 To m3u8_list.Count - 1 For i2 As Integer = 0 To m3u8_list.Count - 1
@ -899,6 +924,24 @@ Public Class Anime_Add
HigestBitrate = CInt(BitRate2(0)) HigestBitrate = CInt(BitRate2(0))
End If End If
End If End If
ElseIf CBool(InStr(m3u8_list.Item(i2), "BANDWIDTH=")) = True Then
Dim BitRate() As String = m3u8_list.Item(i2).Split(New String() {"BANDWIDTH="}, System.StringSplitOptions.RemoveEmptyEntries)
Dim BitRate2() As String = BitRate(1).Split(New String() {","}, System.StringSplitOptions.RemoveEmptyEntries)
If AoD_1080pPlus = True Then
If CInt(BitRate2(0)) > HigestBitrate Then
HigestBitrate = CInt(BitRate2(0))
End If
Else
'Me.Invoke(New Action(Function()
' MsgBox(HigestBitrate.ToString + vbNewLine + BitRate2(0))
' Return Nothing
' End Function))
If HigestBitrate > CInt(BitRate2(0)) Then
HigestBitrate = CInt(BitRate2(0))
ElseIf HigestBitrate = 0 Then
HigestBitrate = CInt(BitRate2(0))
End If
End If
End If End If
Next Next

354
Crunchyroll Downloader/Main.vb
View File

@ -82,7 +82,10 @@ Public Class Main
Public WebbrowserCookie As String = Nothing Public WebbrowserCookie As String = Nothing
Public UserBowser As Boolean = False Public UserBowser As Boolean = False
Public HybridMode As Boolean = False Public HybridMode As Boolean = False
Public HardSubFunimation As Boolean = False Public HardSubFunimation As String = "Disabled"
Public DubFunimation As String = "Disabled"
Public SubFunimationString As String = "en"
Public SubFunimation As New List(Of String)
#Region "Sprachen Vairablen" #Region "Sprachen Vairablen"
Public URL_Invaild As String = "something is wrong here..." Public URL_Invaild As String = "something is wrong here..."
Public SubFolder_automatic As String = "[automatic : Series/Season]" Public SubFolder_automatic As String = "[automatic : Series/Season]"
@ -353,6 +356,30 @@ Public Class Main
Catch ex As Exception Catch ex As Exception
End Try End Try
'Try
' Dim rkg As RegistryKey = Registry.CurrentUser.OpenSubKey("Software\CRDownloader")
' SubFunimation = rkg.GetValue("Fun_Sub").ToString
'Catch ex As Exception
'End Try
Try
Dim rkg As RegistryKey = Registry.CurrentUser.OpenSubKey("Software\CRDownloader")
SubFunimationString = rkg.GetValue("Fun_Sub").ToString
If SubFunimationString = "none" Then
Else
Dim SoftSubsStringSplit() As String = SubFunimationString.Split(New String() {","}, System.StringSplitOptions.RemoveEmptyEntries)
For i As Integer = 0 To SoftSubsStringSplit.Count - 1
SubFunimation.Add(SoftSubsStringSplit(i))
Next
End If
Catch ex As Exception
If SubFunimation.Count = 0 Then
SubFunimation.Add("en")
End If
End Try
Try Try
Dim rkg As RegistryKey = Registry.CurrentUser.OpenSubKey("Software\CRDownloader") Dim rkg As RegistryKey = Registry.CurrentUser.OpenSubKey("Software\CRDownloader")
SubFolder = Integer.Parse(rkg.GetValue("SubFolder").ToString) SubFolder = Integer.Parse(rkg.GetValue("SubFolder").ToString)
@ -389,7 +416,13 @@ Public Class Main
End Try End Try
Try Try
Dim rkg As RegistryKey = Registry.CurrentUser.OpenSubKey("Software\CRDownloader") Dim rkg As RegistryKey = Registry.CurrentUser.OpenSubKey("Software\CRDownloader")
HardSubFunimation = CBool(Integer.Parse(rkg.GetValue("FunimationHardsub").ToString)) HardSubFunimation = rkg.GetValue("FunimationHardsub").ToString
Catch ex As Exception
End Try
Try
Dim rkg As RegistryKey = Registry.CurrentUser.OpenSubKey("Software\CRDownloader")
DubFunimation = rkg.GetValue("FunimationDub").ToString
Catch ex As Exception Catch ex As Exception
End Try End Try
@ -1202,6 +1235,8 @@ Public Class Main
Return "Italiano (Italian)" Return "Italiano (Italian)"
ElseIf HardSub = Chr(34) + "esES" + Chr(34) Then ElseIf HardSub = Chr(34) + "esES" + Chr(34) Then
Return "Español (España)" Return "Español (España)"
ElseIf HardSub = Chr(34) + "jaJP" + Chr(34) Then
Return "Japanese"
Else Else
Return CB_SuB_Nothing Return CB_SuB_Nothing
End If End If
@ -1216,11 +1251,11 @@ Public Class Main
Try Try
If HardSub = "deDE" Then If HardSub = "deDE" Then
Return "ger" Return "ger"
ElseIf HardSub = "enUS" Then ElseIf HardSub = "enUS" Or HardSub = "en" Then
Return "eng" Return "eng"
ElseIf HardSub = "ptBR" Then ElseIf HardSub = "ptBR" Or HardSub = "pt" Then
Return "por" Return "por"
ElseIf HardSub = "esLA" Then ElseIf HardSub = "esLA" Or HardSub = "es" Then
Return "spa" Return "spa"
ElseIf HardSub = "frFR" Then ElseIf HardSub = "frFR" Then
Return "fre" Return "fre"
@ -2366,6 +2401,8 @@ Public Class Main
Dim ResoHTMLDisplay As String = Reso.ToString + "p" Dim ResoHTMLDisplay As String = Reso.ToString + "p"
#Region "Subs" #Region "Subs"
Dim SubsClient As New WebClient Dim SubsClient As New WebClient
SubsClient.Encoding = Encoding.UTF8 SubsClient.Encoding = Encoding.UTF8
If WebbrowserCookie = Nothing Then If WebbrowserCookie = Nothing Then
@ -2373,160 +2410,201 @@ Public Class Main
SubsClient.Headers.Add(HttpRequestHeader.Cookie, WebbrowserCookie) SubsClient.Headers.Add(HttpRequestHeader.Cookie, WebbrowserCookie)
End If End If
Dim PlayerPage As String = SubsClient.DownloadString("https://www.funimation.com/player/" + Player_ID2(0) + "/?bdub=0&qid=") Dim PlayerPage As String = SubsClient.DownloadString("https://www.funimation.com/player/" + Player_ID2(0) + "/?bdub=0&qid=")
Dim SplittString As String = Nothing
If InStr(PlayerPage, My.Resources.Funimation_Subtitle_String) Then
SplittString = My.Resources.Funimation_Subtitle_String
ElseIf InStr(PlayerPage, My.Resources.Funimation_Subtitle_String2) Then
SplittString = My.Resources.Funimation_Subtitle_String2
End If Dim Subs_in_srt As New List(Of String)
Dim UsedSub As String = Nothing Dim Subs_in_vtt As New List(Of String)
If SplittString = Nothing Then Dim Subs_in_dfxp As New List(Of String)
If InStr(PlayerPage, ".srt") Then
Dim SubTitle() As String = PlayerPage.Split(New String() {".srt"}, System.StringSplitOptions.RemoveEmptyEntries) Dim SoftSubs2 As New List(Of String)
Dim SubTitle2() As String = SubTitle(0).Split(New String() {Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries)
UsedSub = SubTitle2(SubTitle2.Count - 1) + ".srt" If SubFunimation.Count > 0 Then
ElseIf InStr(PlayerPage, ".vtt") Then For i As Integer = 0 To SubFunimation.Count - 1
Dim SubTitle() As String = PlayerPage.Split(New String() {".vtt"}, System.StringSplitOptions.RemoveEmptyEntries) If InStr(PlayerPage, My.Resources.Funimation_Subtitle_String + SubFunimation(i)) Then
Dim SubTitle2() As String = SubTitle(0).Split(New String() {Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries) SoftSubs2.Add(My.Resources.Funimation_Subtitle_String + SubFunimation(i))
UsedSub = SubTitle2(SubTitle2.Count - 1) + ".vtt" Continue For
ElseIf InStr(PlayerPage, ".dfxp") Then ElseIf InStr(PlayerPage, My.Resources.Funimation_Subtitle_String2 + SubFunimation(i)) Then
Dim SubTitle() As String = PlayerPage.Split(New String() {".dfxp"}, System.StringSplitOptions.RemoveEmptyEntries) SoftSubs2.Add(My.Resources.Funimation_Subtitle_String2 + SubFunimation(i))
Dim SubTitle2() As String = SubTitle(0).Split(New String() {Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries)
UsedSub = SubTitle2(SubTitle2.Count - 1) + ".dfxp"
Else
If MessageBox.Show("No Subtitle found in the website, a logfile was created." + vbNewLine + "Press 'Yes' to download the video without subtitle", "No Subtitle", MessageBoxButtons.YesNo) = DialogResult.Yes Then
File.WriteAllText(DownloadPfad.Replace(".mp4", "-no subtitle.log"), PlayerPage, Encoding.UTF8)
Else
File.WriteAllText(DownloadPfad.Replace(".mp4", "-no subtitle.log"), PlayerPage, Encoding.UTF8)
Exit Sub
End If End If
'MsgBox("No Subtitle found In the website, a logfile was created.", MsgBoxStyle.OkCancel, "No Subtitle")
End If
Else
Dim SubTitle1() As String = PlayerPage.Split(New String() {SplittString}, System.StringSplitOptions.RemoveEmptyEntries)
Dim Subs_in_srt As New List(Of String)
Dim Subs_in_vtt As New List(Of String)
Dim Subs_in_dfxp As New List(Of String)
For i As Integer = 0 To SubTitle1.Count - 1
Dim SubTitle2() As String = SubTitle1(0).Split(New String() {Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries)
If InStr(SubTitle2(SubTitle2.Count - 1), ".srt") Then
Subs_in_srt.Add(SubTitle2(SubTitle2.Count - 1))
ElseIf InStr(SubTitle2(SubTitle2.Count - 1), ".vtt") Then
Subs_in_vtt.Add(SubTitle2(SubTitle2.Count - 1))
ElseIf InStr(SubTitle2(SubTitle2.Count - 1), ".dfxp") Then
Subs_in_dfxp.Add(SubTitle2(SubTitle2.Count - 1))
End If
Next Next
If SoftSubs2.Count = 0 Then
Me.Invoke(New Action(Function()
Me.Text = "No Subtitles found..."
Me.Invalidate()
Return Nothing
End Function))
File.WriteAllText(DownloadPfad.Replace(".mp4", "-subtitle_error.log"), PlayerPage, Encoding.UTF8)
If Subs_in_srt.Count > 0 Then
UsedSub = Subs_in_srt.Item(0)
ElseIf Subs_in_vtt.Count > 0 Then
UsedSub = Subs_in_vtt.Item(0)
ElseIf Subs_in_dfxp.Count > 0 Then
UsedSub = Subs_in_dfxp.Item(0)
End If
End If
If UsedSub = Nothing Then
ElseIf MergeSubstoMP4 = True Then
If HardSubFunimation = True Then
Dim SubText As String = client0.DownloadString(UsedSub)
Dim SubtitelFormat As String = ".srt"
If InStr(UsedSub, ".vtt") Then
SubtitelFormat = ".vtt"
ElseIf InStr(UsedSub, ".dfxp") Then
SubtitelFormat = ".dfxp"
End If
UsedSub = einstellungen.GeräteID() + SubtitelFormat
File.WriteAllText(Application.StartupPath + "\" + UsedSub, SubText, Encoding.UTF8)
End If
Else
If HardSubFunimation = True Then
Dim SubText As String = client0.DownloadString(UsedSub)
Dim SubtitelFormat As String = ".srt"
If InStr(UsedSub, ".vtt") Then
SubtitelFormat = ".vtt"
ElseIf InStr(UsedSub, ".dfxp") Then
SubtitelFormat = ".dfxp"
End If
UsedSub = einstellungen.GeräteID() + SubtitelFormat
File.WriteAllText(Application.StartupPath + "\" + UsedSub, SubText, Encoding.UTF8)
Else
Dim str2 As String = client0.DownloadString(UsedSub)
Dim SubtitelFormat As String = ".srt"
If InStr(UsedSub, ".vtt") Then
SubtitelFormat = ".vtt"
ElseIf InStr(UsedSub, ".dfxp") Then
SubtitelFormat = ".dfxp"
End If
Dim Pfad3 As String = DownloadPfad.Replace(Chr(34), "")
Dim Pfad4 As String = Pfad3.Replace(".mp4", SubtitelFormat)
File.WriteAllText(Pfad4, str2, Encoding.UTF8)
End If End If
End If End If
' End If
#End Region
#Region "SubsToMP4" Dim HardSubFound As Boolean = False
If UsedSub = Nothing Then Dim HardSubSplittString As String = Nothing
If FunimationDub = "japanese" Then Dim UsedSub As String = Nothing
Dim DubMetatata As String = " -metadata:s:a:0 language=jpn" Dim UsedSubs As New List(Of String)
Funimation_m3u8_final = "-i " + Chr(34) + Funimation_m3u8_final + Chr(34) + DubMetatata + " " + ffmpeg_command Dim ffmpeg_hardsub As String = Nothing
Else
Dim DubMetatata As String = " -metadata:s:a:0 language=eng" If InStr(PlayerPage, My.Resources.Funimation_Subtitle_String + HardSubFunimation) Then
Funimation_m3u8_final = "-i " + Chr(34) + Funimation_m3u8_final + Chr(34) + DubMetatata + " " + ffmpeg_command HardSubFound = True
End If HardSubSplittString = My.Resources.Funimation_Subtitle_String + HardSubFunimation
ElseIf HardSubFunimation = True Then ElseIf InStr(PlayerPage, My.Resources.Funimation_Subtitle_String2 + HardSubFunimation) Then
Dim ffmpeg_hardsub As String = Nothing HardSubFound = True
HardSubSplittString = My.Resources.Funimation_Subtitle_String2 + HardSubFunimation
End If
If HardSubFound = True Then 'anyways not true if hardsub is "Disabled"
If InStr(ffmpeg_command, "-c copy") Then If InStr(ffmpeg_command, "-c copy") Then
ffmpeg_hardsub = "-bsf:a aac_adtstoasc" ffmpeg_hardsub = "-bsf:a aac_adtstoasc"
Else Else
ffmpeg_hardsub = ffmpeg_command ffmpeg_hardsub = ffmpeg_command
End If End If
If UsedSub = Nothing Then
Else
If FunimationDub = "japanese" Then
Dim DubMetatata As String = " -metadata:s:a:0 language=jpn"
Funimation_m3u8_final = "-i " + Chr(34) + Funimation_m3u8_final + Chr(34) + " -vf subtitles=" + Chr(34) + UsedSub + Chr(34) + " " + ffmpeg_hardsub
Else
Dim DubMetatata As String = " -metadata:s:a:0 language=eng"
Funimation_m3u8_final = "-i " + Chr(34) + Funimation_m3u8_final + Chr(34) + " -vf subtitles=" + Chr(34) + UsedSub + Chr(34) + " " + ffmpeg_hardsub
End If
End If
'MsgBox(Funimation_m3u8_final)
ElseIf MergeSubstoMP4 = True Then
If UsedSub = Nothing Then
Else
Dim DubMetatata As String = " -metadata:s:a:0 language=jpn"
If FunimationDub = "japanese" Then
DubMetatata = " -metadata:s:a:0 language=jpn"
'Funimation_m3u8_final = "-i " + Chr(34) + Funimation_m3u8_final + Chr(34) + DubMetatata + " " + ffmpeg_command
Else
DubMetatata = " -metadata:s:a:0 language=eng"
'Funimation_m3u8_final = "-i " + Chr(34) + Funimation_m3u8_final + Chr(34) + DubMetatata + " " + ffmpeg_command
End If
Dim SoftSubMergeURLs As String = " -headers " + My.Resources.ffmpeg_user_agend + " -i " + Chr(34) + UsedSub + Chr(34) Dim HardSubTitle() As String = PlayerPage.Split(New String() {HardSubSplittString}, System.StringSplitOptions.RemoveEmptyEntries)
Dim SoftSubMergeMaps As String = " -map 0:v -map 0:a -map 1" Dim HardSubTitle2() As String = HardSubTitle(0).Split(New String() {Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries)
Dim SoftSubMergeMetatata As String = " -metadata:s:s:0 language=eng" UsedSub = HardSubTitle2(0)
Funimation_m3u8_final = "-i " + Chr(34) + Funimation_m3u8_final + Chr(34) + SoftSubMergeURLs + SoftSubMergeMaps + " " + ffmpeg_command + " -c:s mov_text" + SoftSubMergeMetatata + DubMetatata Dim SubText As String = client0.DownloadString(UsedSub)
Dim SubtitelFormat As String = ".srt"
If InStr(UsedSub, ".vtt") Then
SubtitelFormat = ".vtt"
ElseIf InStr(UsedSub, ".dfxp") Then
SubtitelFormat = ".dfxp"
End If End If
Else UsedSub = einstellungen.GeräteID() + SubtitelFormat
If FunimationDub = "japanese" Then File.WriteAllText(Application.StartupPath + "\" + UsedSub, SubText, Encoding.UTF8)
Dim DubMetatata As String = " -metadata:s:a:0 language=jpn" ElseIf SoftSubs2.Count > 0 Then
Funimation_m3u8_final = "-i " + Chr(34) + Funimation_m3u8_final + Chr(34) + DubMetatata + " " + ffmpeg_command For i As Integer = 0 To SoftSubs2.Count - 1
Dim SubTitle() As String = PlayerPage.Split(New String() {SoftSubs2.Item(i)}, System.StringSplitOptions.RemoveEmptyEntries)
Dim FoundCount As Integer = 0
For ii As Integer = 0 To SubTitle.Count - 1
Dim SubTitle2() As String = SubTitle(ii).Split(New String() {My.Resources.Funimation_subs_src}, System.StringSplitOptions.RemoveEmptyEntries)
For iii As Integer = 0 To SubTitle2.Count - 1
If InStr(SubTitle2(iii), ".srt" + Chr(34)) Then
ElseIf InStr(SubTitle2(iii), ".vtt" + Chr(34)) Then
ElseIf InStr(SubTitle2(iii), ".dfxp" + Chr(34)) Then
ElseIf InStr(SubTitle2(iii), ".srt") Then
If Subs_in_srt.Contains(SubTitle2(iii)) Then
Else
Subs_in_srt.Add(SubTitle2(iii))
End If
ElseIf InStr(SubTitle2(iii), ".vtt") Then
If Subs_in_vtt.Contains(SubTitle2(iii)) Then
Else
Subs_in_vtt.Add(SubTitle2(iii))
End If
ElseIf InStr(SubTitle2(iii), ".dfxp") Then
If Subs_in_dfxp.Contains(SubTitle2(iii)) Then
Else
Subs_in_dfxp.Add(SubTitle2(iii))
End If
End If
Next
Next
If Subs_in_srt.Count > 0 Then
UsedSubs.Add(Subs_in_srt.Item(0) + " , " + SoftSubs2.Item(i).Replace(My.Resources.Funimation_Subtitle_String, "").Replace(My.Resources.Funimation_Subtitle_String2, ""))
ElseIf Subs_in_vtt.Count > 0 Then
UsedSubs.Add(Subs_in_vtt.Item(0) + " , " + SoftSubs2.Item(i).Replace(My.Resources.Funimation_Subtitle_String, "").Replace(My.Resources.Funimation_Subtitle_String2, ""))
ElseIf Subs_in_dfxp.Count > 0 Then
UsedSubs.Add(Subs_in_dfxp.Item(0) + " , " + SoftSubs2.Item(i).Replace(My.Resources.Funimation_Subtitle_String, "").Replace(My.Resources.Funimation_Subtitle_String2, ""))
End If
Subs_in_srt.Clear()
Subs_in_vtt.Clear()
Subs_in_dfxp.Clear()
Next
End If
'
Dim SoftSubMergeURLs As String = Nothing
Dim SoftSubMergeMaps As String = " -map 0:v -map 0:a"
Dim SoftSubMergeMetatata As String = Nothing
If UsedSubs.Count > 0 Then
If MergeSubstoMP4 = True Then
For i As Integer = 0 To UsedSubs.Count - 1
Dim SoftSub As String() = UsedSubs.Item(i).Split(New String() {" , "}, System.StringSplitOptions.RemoveEmptyEntries)
If SoftSubMergeURLs = Nothing Then
SoftSubMergeURLs = " -i " + Chr(34) + SoftSub(0) + Chr(34)
Else
SoftSubMergeURLs = SoftSubMergeURLs + " -i " + Chr(34) + SoftSub(0) + Chr(34)
End If
SoftSubMergeMaps = SoftSubMergeMaps + " -map " + (i + 1).ToString
If SoftSubMergeMetatata = Nothing Then
SoftSubMergeMetatata = " -metadata:s:s:" + i.ToString + " language=" + CCtoMP4CC(SoftSub(1))
Else
SoftSubMergeMetatata = SoftSubMergeMetatata + " -metadata:s:s:" + i.ToString + " language=" + CCtoMP4CC(SoftSubs2(i))
End If
Next
Else Else
Dim DubMetatata As String = " -metadata:s:a:0 language=eng" For i As Integer = 0 To UsedSubs.Count - 1
Funimation_m3u8_final = "-i " + Chr(34) + Funimation_m3u8_final + Chr(34) + DubMetatata + " " + ffmpeg_command LabelUpdate = "Status: downloading subtitle file"
LabelEpisode = SoftSubs2(i)
Dim SoftSub As String() = UsedSubs.Item(i).Split(New String() {" , "}, System.StringSplitOptions.RemoveEmptyEntries)
Dim SoftSub_3 As String = SoftSub(0).Replace("\/", "/")
Dim Subfile As String = SubsClient.DownloadString(SoftSub_3)
Dim Pfad3 As String = DownloadPfad.Replace(Chr(34), "")
'MsgBox(FN)
Dim SubtitelFormat As String = "srt"
If InStr(SoftSub_3, ".vtt") Then
SubtitelFormat = "vtt"
ElseIf InStr(SoftSub_3, ".dfxp") Then
SubtitelFormat = "dfxp"
End If
Dim FN As String = Path.ChangeExtension(Path.Combine(Path.GetFileNameWithoutExtension(Pfad3) + " " + SoftSub(1) + Path.GetExtension(Pfad3)), SubtitelFormat)
If i = 0 Then
FN = Path.ChangeExtension(Path.GetFileName(Pfad3), SubtitelFormat)
'MsgBox(FN)
End If
Dim Pfad4 As String = Path.Combine(Path.GetDirectoryName(Pfad3), FN)
'MsgBox(Pfad4)
File.WriteAllText(Pfad4, str0, Encoding.UTF8)
Pause(1)
Next
End If End If
End If
#End Region
#Region "ffmpeg command"
Dim DubMetatata As String = Nothing
If FunimationDub = "japanese" Then
DubMetatata = " -metadata:s:a:0 language=jpn"
ElseIf FunimationDub = "portuguese-brazil" Then
DubMetatata = " -metadata:s:a:0 language=por"
ElseIf FunimationDub = "spanish-latin-am" Then
DubMetatata = " -metadata:s:a:0 language=spa"
Else '
DubMetatata = " -metadata:s:a:0 language=eng"
End If End If
If HardSubFound = True Then
Funimation_m3u8_final = "-i " + Chr(34) + Funimation_m3u8_final + Chr(34) + " -vf subtitles=" + Chr(34) + UsedSub + Chr(34) + " " + ffmpeg_hardsub
ElseIf MergeSubstoMP4 = True Then
Funimation_m3u8_final = "-i " + Chr(34) + Funimation_m3u8_final + Chr(34) + SoftSubMergeURLs + SoftSubMergeMaps + " " + ffmpeg_command + " -c:s mov_text" + SoftSubMergeMetatata + DubMetatata
Else
Funimation_m3u8_final = "-i " + Chr(34) + Funimation_m3u8_final + Chr(34) + DubMetatata + " " + ffmpeg_command
End If
#End Region #End Region
'MsgBox(Funimation_m3u8_final) 'MsgBox(Funimation_m3u8_final)
'DownloadPfad = DownloadPfad.Replace(" \", "\") 'DownloadPfad = DownloadPfad.Replace(" \", "\")

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

@ -391,7 +391,16 @@ Namespace My.Resources
End Property End Property
'''<summary> '''<summary>
''' Sucht eine lokalisierte Zeichenfolge, die &quot;, &quot;kind&quot;: &quot;subtitle&quot;, &quot;type&quot;: &quot;CC&quot;, &quot;language&quot;: &quot;en&quot; ähnelt. ''' 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> '''</summary>
Friend ReadOnly Property Funimation_Subtitle_String() As String Friend ReadOnly Property Funimation_Subtitle_String() As String
Get Get
@ -400,7 +409,7 @@ Namespace My.Resources
End Property End Property
'''<summary> '''<summary>
''' Sucht eine lokalisierte Zeichenfolge, die &quot;, &quot;kind&quot;: &quot;subtitle&quot;, &quot;type&quot;: &quot;Full&quot;, &quot;language&quot;: &quot;en&quot; ähnelt. ''' Sucht eine lokalisierte Zeichenfolge, die &quot;, &quot;kind&quot;: &quot;subtitle&quot;, &quot;type&quot;: &quot;Full&quot;, &quot;language&quot;: &quot; ähnelt.
'''</summary> '''</summary>
Friend ReadOnly Property Funimation_Subtitle_String2() As String Friend ReadOnly Property Funimation_Subtitle_String2() As String
Get Get

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

@ -161,7 +161,7 @@
<value>..\Resources\credits-background.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\credits-background.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="Funimation_Subtitle_String2" xml:space="preserve"> <data name="Funimation_Subtitle_String2" xml:space="preserve">
<value>", "kind": "subtitle", "type": "Full", "language": "en"</value> <value>", "kind": "subtitle", "type": "Full", "language": "</value>
</data> </data>
<data name="htmlTitlel" xml:space="preserve"> <data name="htmlTitlel" xml:space="preserve">
<value>&lt;a class="main_titel"&gt;Placeholder&lt;/a&gt; <value>&lt;a class="main_titel"&gt;Placeholder&lt;/a&gt;
@ -247,7 +247,7 @@
<value>"image":"</value> <value>"image":"</value>
</data> </data>
<data name="Funimation_Subtitle_String" xml:space="preserve"> <data name="Funimation_Subtitle_String" xml:space="preserve">
<value>", "kind": "subtitle", "type": "CC", "language": "en"</value> <value>", "kind": "subtitle", "type": "CC", "language": "</value>
</data> </data>
<data name="htmlEnd" xml:space="preserve"> <data name="htmlEnd" xml:space="preserve">
<value>&lt;script&gt; <value>&lt;script&gt;
@ -517,4 +517,7 @@ 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"> <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> <value>..\Resources\main-setting_invert.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="Funimation_subs_src" xml:space="preserve">
<value>{"src": "</value>
</data>
</root> </root>

BIN
Crunchyroll Downloader/bin/x86/Debug/Crunchyroll Downloader.exe
View File

Binary file not shown.

BIN
Crunchyroll Downloader/bin/x86/Debug/Crunchyroll Downloader.pdb
View File

Binary file not shown.

9
Crunchyroll Downloader/bin/x86/Debug/Crunchyroll Downloader.xml
View File

@ -205,14 +205,19 @@ Video Position: 0
Sucht eine lokalisierte Zeichenfolge, die &quot;src&quot;: ähnelt. Sucht eine lokalisierte Zeichenfolge, die &quot;src&quot;: ähnelt.
</summary> </summary>
</member> </member>
<member name="P:Crunchyroll_Downloader.My.Resources.Resources.Funimation_subs_src">
<summary>
Sucht eine lokalisierte Zeichenfolge, die {&quot;src&quot;: &quot; ähnelt.
</summary>
</member>
<member name="P:Crunchyroll_Downloader.My.Resources.Resources.Funimation_Subtitle_String"> <member name="P:Crunchyroll_Downloader.My.Resources.Resources.Funimation_Subtitle_String">
<summary> <summary>
Sucht eine lokalisierte Zeichenfolge, die &quot;, &quot;kind&quot;: &quot;subtitle&quot;, &quot;type&quot;: &quot;CC&quot;, &quot;language&quot;: &quot;en&quot; ähnelt. Sucht eine lokalisierte Zeichenfolge, die &quot;, &quot;kind&quot;: &quot;subtitle&quot;, &quot;type&quot;: &quot;CC&quot;, &quot;language&quot;: &quot; ähnelt.
</summary> </summary>
</member> </member>
<member name="P:Crunchyroll_Downloader.My.Resources.Resources.Funimation_Subtitle_String2"> <member name="P:Crunchyroll_Downloader.My.Resources.Resources.Funimation_Subtitle_String2">
<summary> <summary>
Sucht eine lokalisierte Zeichenfolge, die &quot;, &quot;kind&quot;: &quot;subtitle&quot;, &quot;type&quot;: &quot;Full&quot;, &quot;language&quot;: &quot;en&quot; ähnelt. Sucht eine lokalisierte Zeichenfolge, die &quot;, &quot;kind&quot;: &quot;subtitle&quot;, &quot;type&quot;: &quot;Full&quot;, &quot;language&quot;: &quot; ähnelt.
</summary> </summary>
</member> </member>
<member name="P:Crunchyroll_Downloader.My.Resources.Resources.Funimation_thumbnail"> <member name="P:Crunchyroll_Downloader.My.Resources.Resources.Funimation_thumbnail">

2
Crunchyroll Downloader/bin/x86/Debug/WebInterface/index.html
View File

@ -27,7 +27,7 @@
.liClass{margin-bottom:8px} .liClass{margin-bottom:8px}
</style> </style>
<body id="bodypage" class="main-bg" > <body id="bodypage" class="main-bg" >
<a class="main_titel">Test</a> <a class="main_titel">Crunchyroll Downloader</a>
<img alt="image error" src="balken.png" class="class-balken"> <img alt="image error" src="balken.png" class="class-balken">
<script> <script>

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

@ -106,8 +106,11 @@ Partial Class einstellungen
Me.TabControl1 = New MetroFramework.Controls.MetroTabControl() Me.TabControl1 = New MetroFramework.Controls.MetroTabControl()
Me.TabPage6 = New MetroFramework.Controls.MetroTabPage() Me.TabPage6 = New MetroFramework.Controls.MetroTabPage()
Me.GroupBox7 = New System.Windows.Forms.GroupBox() Me.GroupBox7 = New System.Windows.Forms.GroupBox()
Me.FunimationHardsub = New System.Windows.Forms.CheckBox() Me.CB_Fun_HardSubs = New System.Windows.Forms.ComboBox()
Me.CheckBox10 = New System.Windows.Forms.CheckBox() Me.GroupBox9 = New System.Windows.Forms.GroupBox()
Me.CB_fun_eng = New System.Windows.Forms.CheckBox()
Me.CB_fun_es = New System.Windows.Forms.CheckBox()
Me.CB_fun_ptbr = New System.Windows.Forms.CheckBox()
Me.TabPage8 = New System.Windows.Forms.TabPage() Me.TabPage8 = New System.Windows.Forms.TabPage()
Me.GroupBox8 = New System.Windows.Forms.GroupBox() Me.GroupBox8 = New System.Windows.Forms.GroupBox()
Me.AoD_0p = New System.Windows.Forms.RadioButton() Me.AoD_0p = New System.Windows.Forms.RadioButton()
@ -125,6 +128,8 @@ Partial Class einstellungen
Me.Label5 = New System.Windows.Forms.Label() Me.Label5 = New System.Windows.Forms.Label()
Me.MetroStyleManager1 = New MetroFramework.Components.MetroStyleManager(Me.components) Me.MetroStyleManager1 = New MetroFramework.Components.MetroStyleManager(Me.components)
Me.MetroStyleExtender1 = New MetroFramework.Components.MetroStyleExtender(Me.components) Me.MetroStyleExtender1 = New MetroFramework.Components.MetroStyleExtender(Me.components)
Me.GroupBox10 = New System.Windows.Forms.GroupBox()
Me.Fun_Dub_Over = New System.Windows.Forms.ComboBox()
CType(Me.pictureBox1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.pictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.pictureBox4, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.pictureBox4, System.ComponentModel.ISupportInitialize).BeginInit()
Me.TabPage4.SuspendLayout() Me.TabPage4.SuspendLayout()
@ -155,12 +160,14 @@ Partial Class einstellungen
Me.TabControl1.SuspendLayout() Me.TabControl1.SuspendLayout()
Me.TabPage6.SuspendLayout() Me.TabPage6.SuspendLayout()
Me.GroupBox7.SuspendLayout() Me.GroupBox7.SuspendLayout()
Me.GroupBox9.SuspendLayout()
Me.TabPage8.SuspendLayout() Me.TabPage8.SuspendLayout()
Me.GroupBox8.SuspendLayout() Me.GroupBox8.SuspendLayout()
Me.TabPage7.SuspendLayout() Me.TabPage7.SuspendLayout()
CType(Me.PictureBox7, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox7, System.ComponentModel.ISupportInitialize).BeginInit()
Me.Panel2.SuspendLayout() Me.Panel2.SuspendLayout()
CType(Me.MetroStyleManager1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.MetroStyleManager1, System.ComponentModel.ISupportInitialize).BeginInit()
Me.GroupBox10.SuspendLayout()
Me.SuspendLayout() Me.SuspendLayout()
' '
'ToolTip1 'ToolTip1
@ -639,9 +646,9 @@ Partial Class einstellungen
Me.MergeMP4.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.MergeMP4.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.MergeMP4.Location = New System.Drawing.Point(205, 21) Me.MergeMP4.Location = New System.Drawing.Point(205, 21)
Me.MergeMP4.Name = "MergeMP4" Me.MergeMP4.Name = "MergeMP4"
Me.MergeMP4.Size = New System.Drawing.Size(194, 20) Me.MergeMP4.Size = New System.Drawing.Size(205, 20)
Me.MergeMP4.TabIndex = 42 Me.MergeMP4.TabIndex = 42
Me.MergeMP4.Text = "Merge softubs with video file" Me.MergeMP4.Text = "Merge soft-subs with video file"
Me.MergeMP4.UseVisualStyleBackColor = True Me.MergeMP4.UseVisualStyleBackColor = True
' '
'GB_Sub_Path 'GB_Sub_Path
@ -1081,7 +1088,7 @@ Partial Class einstellungen
Me.TabControl1.FontWeight = MetroFramework.MetroTabControlWeight.Regular Me.TabControl1.FontWeight = MetroFramework.MetroTabControlWeight.Regular
Me.TabControl1.Location = New System.Drawing.Point(22, 45) Me.TabControl1.Location = New System.Drawing.Point(22, 45)
Me.TabControl1.Name = "TabControl1" Me.TabControl1.Name = "TabControl1"
Me.TabControl1.SelectedIndex = 2 Me.TabControl1.SelectedIndex = 3
Me.TabControl1.Size = New System.Drawing.Size(501, 500) Me.TabControl1.Size = New System.Drawing.Size(501, 500)
Me.TabControl1.TabIndex = 38 Me.TabControl1.TabIndex = 38
Me.TabControl1.UseSelectable = True Me.TabControl1.UseSelectable = True
@ -1089,7 +1096,9 @@ Partial Class einstellungen
'TabPage6 '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.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.GroupBox10)
Me.TabPage6.Controls.Add(Me.GroupBox7) Me.TabPage6.Controls.Add(Me.GroupBox7)
Me.TabPage6.Controls.Add(Me.GroupBox9)
Me.TabPage6.HorizontalScrollbarBarColor = True Me.TabPage6.HorizontalScrollbarBarColor = True
Me.TabPage6.HorizontalScrollbarHighlightOnWheel = False Me.TabPage6.HorizontalScrollbarHighlightOnWheel = False
Me.TabPage6.HorizontalScrollbarSize = 10 Me.TabPage6.HorizontalScrollbarSize = 10
@ -1107,42 +1116,81 @@ Partial Class einstellungen
'GroupBox7 'GroupBox7
' '
Me.GroupBox7.BackColor = System.Drawing.Color.Transparent Me.GroupBox7.BackColor = System.Drawing.Color.Transparent
Me.GroupBox7.Controls.Add(Me.FunimationHardsub) Me.GroupBox7.Controls.Add(Me.CB_Fun_HardSubs)
Me.GroupBox7.Controls.Add(Me.CheckBox10) Me.GroupBox7.Font = New System.Drawing.Font("Arial", 9.75!)
Me.GroupBox7.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.GroupBox7.ForeColor = System.Drawing.Color.Black
Me.GroupBox7.Location = New System.Drawing.Point(6, 6) Me.GroupBox7.Location = New System.Drawing.Point(3, 6)
Me.GroupBox7.Name = "GroupBox7" Me.GroupBox7.Name = "GroupBox7"
Me.GroupBox7.Size = New System.Drawing.Size(481, 90) Me.GroupBox7.Size = New System.Drawing.Size(478, 69)
Me.GroupBox7.TabIndex = 52 Me.GroupBox7.TabIndex = 54
Me.GroupBox7.TabStop = False Me.GroupBox7.TabStop = False
Me.GroupBox7.Text = "Subtitle" Me.GroupBox7.Text = "Hard Subtitle (post-processed)"
' '
'FunimationHardsub 'CB_Fun_HardSubs
' '
Me.FunimationHardsub.AutoSize = True Me.CB_Fun_HardSubs.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed
Me.FunimationHardsub.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.DropDownHeight = 250
Me.FunimationHardsub.ForeColor = System.Drawing.Color.Black Me.CB_Fun_HardSubs.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
Me.FunimationHardsub.Location = New System.Drawing.Point(217, 36) 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.FunimationHardsub.Name = "FunimationHardsub" Me.CB_Fun_HardSubs.FormattingEnabled = True
Me.FunimationHardsub.Size = New System.Drawing.Size(145, 20) Me.CB_Fun_HardSubs.IntegralHeight = False
Me.FunimationHardsub.TabIndex = 43 Me.CB_Fun_HardSubs.ItemHeight = 16
Me.FunimationHardsub.Text = "Hardsub Output File" Me.CB_Fun_HardSubs.Items.AddRange(New Object() {"Disabled", "English", "Español (LA)", "Português (Brasil)"})
Me.FunimationHardsub.UseVisualStyleBackColor = True Me.CB_Fun_HardSubs.Location = New System.Drawing.Point(69, 30)
Me.CB_Fun_HardSubs.Name = "CB_Fun_HardSubs"
Me.CB_Fun_HardSubs.Size = New System.Drawing.Size(326, 22)
Me.CB_Fun_HardSubs.Sorted = True
Me.CB_Fun_HardSubs.TabIndex = 33
' '
'CheckBox10 'GroupBox9
' '
Me.CheckBox10.AutoSize = True Me.GroupBox9.BackColor = System.Drawing.Color.Transparent
Me.CheckBox10.Checked = True Me.GroupBox9.Controls.Add(Me.CB_fun_eng)
Me.CheckBox10.CheckState = System.Windows.Forms.CheckState.Checked Me.GroupBox9.Controls.Add(Me.CB_fun_es)
Me.CheckBox10.Enabled = False Me.GroupBox9.Controls.Add(Me.CB_fun_ptbr)
Me.CheckBox10.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.GroupBox9.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.CheckBox10.ForeColor = System.Drawing.Color.Black Me.GroupBox9.Location = New System.Drawing.Point(3, 81)
Me.CheckBox10.Location = New System.Drawing.Point(100, 36) Me.GroupBox9.Name = "GroupBox9"
Me.CheckBox10.Name = "CheckBox10" Me.GroupBox9.Size = New System.Drawing.Size(478, 95)
Me.CheckBox10.Size = New System.Drawing.Size(71, 20) Me.GroupBox9.TabIndex = 53
Me.CheckBox10.TabIndex = 0 Me.GroupBox9.TabStop = False
Me.CheckBox10.Text = "English" Me.GroupBox9.Text = "Soft-Subtitle"
Me.CheckBox10.UseVisualStyleBackColor = True '
'CB_fun_eng
'
Me.CB_fun_eng.AutoSize = True
Me.CB_fun_eng.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.CB_fun_eng.ForeColor = System.Drawing.Color.Black
Me.CB_fun_eng.Location = New System.Drawing.Point(51, 50)
Me.CB_fun_eng.Name = "CB_fun_eng"
Me.CB_fun_eng.Size = New System.Drawing.Size(71, 20)
Me.CB_fun_eng.TabIndex = 0
Me.CB_fun_eng.Text = "English"
Me.CB_fun_eng.UseVisualStyleBackColor = True
'
'CB_fun_es
'
Me.CB_fun_es.AutoSize = True
Me.CB_fun_es.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.CB_fun_es.ForeColor = System.Drawing.Color.Black
Me.CB_fun_es.Location = New System.Drawing.Point(165, 50)
Me.CB_fun_es.Name = "CB_fun_es"
Me.CB_fun_es.Size = New System.Drawing.Size(104, 20)
Me.CB_fun_es.TabIndex = 44
Me.CB_fun_es.Text = "Español (LA)"
Me.CB_fun_es.UseVisualStyleBackColor = True
'
'CB_fun_ptbr
'
Me.CB_fun_ptbr.AutoSize = True
Me.CB_fun_ptbr.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.CB_fun_ptbr.ForeColor = System.Drawing.Color.Black
Me.CB_fun_ptbr.Location = New System.Drawing.Point(287, 50)
Me.CB_fun_ptbr.Name = "CB_fun_ptbr"
Me.CB_fun_ptbr.Size = New System.Drawing.Size(133, 20)
Me.CB_fun_ptbr.TabIndex = 45
Me.CB_fun_ptbr.Text = "Português (Brasil)"
Me.CB_fun_ptbr.UseVisualStyleBackColor = True
' '
'TabPage8 'TabPage8
' '
@ -1335,6 +1383,35 @@ Partial Class einstellungen
' '
Me.MetroStyleManager1.Owner = Nothing Me.MetroStyleManager1.Owner = Nothing
' '
'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(6, 182)
Me.GroupBox10.Name = "GroupBox10"
Me.GroupBox10.Size = New System.Drawing.Size(478, 69)
Me.GroupBox10.TabIndex = 55
Me.GroupBox10.TabStop = False
Me.GroupBox10.Text = "Funimation Dub"
'
'Fun_Dub_Over
'
Me.Fun_Dub_Over.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed
Me.Fun_Dub_Over.DropDownHeight = 250
Me.Fun_Dub_Over.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
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 = 16
Me.Fun_Dub_Over.Items.AddRange(New Object() {"Disabled", "english", "japanese", "portuguese(Brazil)", "spanish(Mexico)"})
Me.Fun_Dub_Over.Location = New System.Drawing.Point(69, 30)
Me.Fun_Dub_Over.Name = "Fun_Dub_Over"
Me.Fun_Dub_Over.Size = New System.Drawing.Size(326, 22)
Me.Fun_Dub_Over.Sorted = True
Me.Fun_Dub_Over.TabIndex = 33
'
'einstellungen 'einstellungen
' '
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@ -1342,7 +1419,7 @@ Partial Class einstellungen
Me.BackgroundImage = Global.Crunchyroll_Downloader.My.Resources.Resources.crdSettings_Background Me.BackgroundImage = Global.Crunchyroll_Downloader.My.Resources.Resources.crdSettings_Background
Me.BackImage = Global.Crunchyroll_Downloader.My.Resources.Resources.crdSettings_Background Me.BackImage = Global.Crunchyroll_Downloader.My.Resources.Resources.crdSettings_Background
Me.BackMaxSize = 600 Me.BackMaxSize = 600
Me.ClientSize = New System.Drawing.Size(546, 600) Me.ClientSize = New System.Drawing.Size(545, 600)
Me.Controls.Add(Me.TabControl1) Me.Controls.Add(Me.TabControl1)
Me.Controls.Add(Me.pictureBox4) Me.Controls.Add(Me.pictureBox4)
Me.Controls.Add(Me.pictureBox1) Me.Controls.Add(Me.pictureBox1)
@ -1394,7 +1471,8 @@ Partial Class einstellungen
Me.TabControl1.ResumeLayout(False) Me.TabControl1.ResumeLayout(False)
Me.TabPage6.ResumeLayout(False) Me.TabPage6.ResumeLayout(False)
Me.GroupBox7.ResumeLayout(False) Me.GroupBox7.ResumeLayout(False)
Me.GroupBox7.PerformLayout() Me.GroupBox9.ResumeLayout(False)
Me.GroupBox9.PerformLayout()
Me.TabPage8.ResumeLayout(False) Me.TabPage8.ResumeLayout(False)
Me.GroupBox8.ResumeLayout(False) Me.GroupBox8.ResumeLayout(False)
Me.GroupBox8.PerformLayout() Me.GroupBox8.PerformLayout()
@ -1402,6 +1480,7 @@ Partial Class einstellungen
CType(Me.PictureBox7, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PictureBox7, System.ComponentModel.ISupportInitialize).EndInit()
Me.Panel2.ResumeLayout(False) Me.Panel2.ResumeLayout(False)
CType(Me.MetroStyleManager1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.MetroStyleManager1, System.ComponentModel.ISupportInitialize).EndInit()
Me.GroupBox10.ResumeLayout(False)
Me.ResumeLayout(False) Me.ResumeLayout(False)
Me.PerformLayout() Me.PerformLayout()
@ -1467,9 +1546,6 @@ Partial Class einstellungen
Friend WithEvents MergeMP4 As CheckBox Friend WithEvents MergeMP4 As CheckBox
Friend WithEvents GroupBox4 As GroupBox Friend WithEvents GroupBox4 As GroupBox
Friend WithEvents HybridMode_CB As CheckBox Friend WithEvents HybridMode_CB As CheckBox
Friend WithEvents GroupBox7 As GroupBox
Friend WithEvents CheckBox10 As CheckBox
Friend WithEvents FunimationHardsub As CheckBox
Public WithEvents CBesES As CheckBox Public WithEvents CBesES As CheckBox
Public WithEvents CBitIT As CheckBox Public WithEvents CBitIT As CheckBox
Public WithEvents CBruRU As CheckBox Public WithEvents CBruRU As CheckBox
@ -1508,4 +1584,12 @@ Partial Class einstellungen
Friend WithEvents AoD_0p As RadioButton Friend WithEvents AoD_0p As RadioButton
Friend WithEvents AoD_576p As RadioButton Friend WithEvents AoD_576p As RadioButton
Friend WithEvents AoD_1080_Plus As RadioButton Friend WithEvents AoD_1080_Plus As RadioButton
Friend WithEvents CB_fun_ptbr As CheckBox
Friend WithEvents CB_fun_es As CheckBox
Friend WithEvents CB_fun_eng As CheckBox
Friend WithEvents GroupBox7 As GroupBox
Friend WithEvents CB_Fun_HardSubs As ComboBox
Friend WithEvents GroupBox9 As GroupBox
Friend WithEvents GroupBox10 As GroupBox
Friend WithEvents Fun_Dub_Over As ComboBox
End Class End Class

3
Crunchyroll Downloader/einstellungen.resx
View File

@ -126,9 +126,6 @@
<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>282, 17</value> <value>282, 17</value>
</metadata> </metadata>
<metadata name="MenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>282, 17</value>
</metadata>
<metadata name="MetroStyleManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="MetroStyleManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value> <value>17, 17</value>
</metadata> </metadata>

116
Crunchyroll Downloader/einstellungen.vb
View File

@ -36,6 +36,22 @@ Public Class einstellungen
CBesES.Checked = True CBesES.Checked = True
End If End If
Next Next
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
'If Main.SubFunimation(i) = "en" Then
' RB_eng.Checked = True
'ElseIf Main.SubFunimation(i) = "es" Then
' RB_es.Checked = True
'ElseIf Main.SubFunimation(i) = "pt" Then
' RB_pt.Checked = True
'End If
Next
Me.Location = New Point(Main.Location.X + Main.Width / 2 - Me.Width / 2, Main.Location.Y + Main.Height / 2 - Me.Height / 2) Me.Location = New Point(Main.Location.X + Main.Width / 2 - Me.Width / 2, Main.Location.Y + Main.Height / 2 - Me.Height / 2)
Try Try
Me.Icon = My.Resources.icon Me.Icon = My.Resources.icon
@ -50,8 +66,35 @@ Public Class einstellungen
HybridMode_CB.Checked = True HybridMode_CB.Checked = True
End If End If
If Main.HardSubFunimation = True Then 'If Main.HardSubFunimation = True Then
FunimationHardsub.Checked = True 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.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 End If
If Main.SaveLog = True Then If Main.SaveLog = True Then
@ -237,15 +280,59 @@ Public Class einstellungen
Main.HybridMode = False Main.HybridMode = False
rk.SetValue("HybridMode", "0", RegistryValueKind.String) rk.SetValue("HybridMode", "0", RegistryValueKind.String)
End If End If
#Region "funimation"
Main.DubFunimation = Fun_Dub_Over.SelectedItem.ToString
rk.SetValue("FunimationDub", Fun_Dub_Over.SelectedItem.ToString, RegistryValueKind.String)
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)
If FunimationHardsub.Checked = True Then
Main.HardSubFunimation = True
rk.SetValue("FunimationHardsub", "1", RegistryValueKind.String)
Else
Main.HardSubFunimation = False
rk.SetValue("FunimationHardsub", "0", RegistryValueKind.String)
End If 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
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
rk.SetValue("Fun_Sub", FunimationSaveString, RegistryValueKind.String)
#End Region
If CB_Log.Checked = True Then If CB_Log.Checked = True Then
Main.SaveLog = True Main.SaveLog = True
rk.SetValue("SaveLog", "1", RegistryValueKind.String) rk.SetValue("SaveLog", "1", RegistryValueKind.String)
@ -402,7 +489,7 @@ Public Class einstellungen
End Sub End Sub
Private Sub ComboBox1_DrawItem(sender As Object, e As DrawItemEventArgs) Handles ComboBox1.DrawItem, ComboBox2.DrawItem, comboBox3.DrawItem, comboBox4.DrawItem Private Sub ComboBox1_DrawItem(sender As Object, e As DrawItemEventArgs) Handles ComboBox1.DrawItem, ComboBox2.DrawItem, comboBox3.DrawItem, comboBox4.DrawItem, CB_Fun_HardSubs.DrawItem, Fun_Dub_Over.DrawItem
Dim CB As ComboBox = sender Dim CB As ComboBox = sender
CB.BackColor = Color.White CB.BackColor = Color.White
If e.Index >= 0 Then If e.Index >= 0 Then
@ -606,14 +693,16 @@ Public Class einstellungen
End Sub End Sub
Private Sub FunimationHardsub_Click(sender As Object, e As EventArgs) Handles FunimationHardsub.Click Private Sub FunimationHardsub_Click(sender As Object, e As EventArgs)
If FFMPEG_CommandP1.Text = "-c copy" Then If FFMPEG_CommandP1.Text = "-c copy" Then
If FunimationHardsub.Checked = True Then If CB_Fun_HardSubs.SelectedItem = "Disabled" Then
Else
If MessageBox.Show("This feature does not work with the current output setting." + vbNewLine + "Do you want to ignore the output settings?", "Settings incompatible", MessageBoxButtons.YesNo) = DialogResult.Yes Then If MessageBox.Show("This feature does not work with the current output setting." + vbNewLine + "Do you want to ignore the output settings?", "Settings incompatible", MessageBoxButtons.YesNo) = DialogResult.Yes Then
FunimationHardsub.Checked = True 'FunimationHardsub.Checked = True
Else Else
FunimationHardsub.Checked = False CB_Fun_HardSubs.SelectedItem = "Disabled"
End If End If
End If End If
Else Else
@ -638,5 +727,6 @@ Public Class einstellungen
#End Region #End Region
End Class End Class

BIN
Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.exe
View File

Binary file not shown.

BIN
Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.pdb
View File

Binary file not shown.

5
Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.vbproj.FileListAbsolute.txt
View File

@ -29,10 +29,8 @@ D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.0\Crun
D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.0\Crunchyroll Downloader\obj\x86\Debug\Crunchyroll_Downloader.Anime_Add.resources D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.0\Crunchyroll Downloader\obj\x86\Debug\Crunchyroll_Downloader.Anime_Add.resources
D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.0\Crunchyroll Downloader\obj\x86\Debug\Crunchyroll_Downloader.einstellungen.resources D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.0\Crunchyroll Downloader\obj\x86\Debug\Crunchyroll_Downloader.einstellungen.resources
D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.0\Crunchyroll Downloader\obj\x86\Debug\Crunchyroll_Downloader.GeckoFX.resources D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.0\Crunchyroll Downloader\obj\x86\Debug\Crunchyroll_Downloader.GeckoFX.resources
D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.0\Crunchyroll Downloader\obj\x86\Debug\Crunchyroll_Downloader.Startup.resources
D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.0\Crunchyroll Downloader\obj\x86\Debug\Crunchyroll_Downloader.Main.resources D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.0\Crunchyroll Downloader\obj\x86\Debug\Crunchyroll_Downloader.Main.resources
D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.0\Crunchyroll Downloader\obj\x86\Debug\Crunchyroll_Downloader.Resources.resources D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.0\Crunchyroll Downloader\obj\x86\Debug\Crunchyroll_Downloader.Resources.resources
D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.0\Crunchyroll Downloader\obj\x86\Debug\Crunchyroll_Downloader.Reso.resources
D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.0\Crunchyroll Downloader\obj\x86\Debug\Crunchyroll Downloader.vbproj.GenerateResource.cache D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.0\Crunchyroll Downloader\obj\x86\Debug\Crunchyroll Downloader.vbproj.GenerateResource.cache
D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.0\Crunchyroll Downloader\obj\x86\Debug\Crunchyroll Downloader.vbproj.CoreCompileInputs.cache D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.0\Crunchyroll Downloader\obj\x86\Debug\Crunchyroll Downloader.vbproj.CoreCompileInputs.cache
D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.0\Crunchyroll Downloader\obj\x86\Debug\Crunchyroll Downloader.vbproj.CopyComplete D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.0\Crunchyroll Downloader\obj\x86\Debug\Crunchyroll Downloader.vbproj.CopyComplete
@ -143,3 +141,6 @@ D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.0 - UI
D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.0 - UI\Crunchyroll Downloader\obj\x86\Debug\Crunchyroll_Downloader.Main.resources D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.0 - UI\Crunchyroll Downloader\obj\x86\Debug\Crunchyroll_Downloader.Main.resources
D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.0 - UI\Crunchyroll Downloader\bin\x86\Debug\Geckofx-Core.pdb D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.0 - UI\Crunchyroll Downloader\bin\x86\Debug\Geckofx-Core.pdb
D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.0 - UI\Crunchyroll Downloader\bin\x86\Debug\Geckofx-Winforms.pdb D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.0 - UI\Crunchyroll Downloader\bin\x86\Debug\Geckofx-Winforms.pdb
D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.0\Crunchyroll Downloader\bin\x86\Debug\MetroFramework.dll
D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.0\Crunchyroll Downloader\bin\x86\Debug\MetroFramework.pdb
D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.0\Crunchyroll Downloader\obj\x86\Debug\Crunchyroll_Downloader.ErrorDialog.resources

BIN
Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.vbproj.GenerateResource.cache
View File

Binary file not shown.

9
Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.xml
View File

@ -205,14 +205,19 @@ Video Position: 0
Sucht eine lokalisierte Zeichenfolge, die &quot;src&quot;: ähnelt. Sucht eine lokalisierte Zeichenfolge, die &quot;src&quot;: ähnelt.
</summary> </summary>
</member> </member>
<member name="P:Crunchyroll_Downloader.My.Resources.Resources.Funimation_subs_src">
<summary>
Sucht eine lokalisierte Zeichenfolge, die {&quot;src&quot;: &quot; ähnelt.
</summary>
</member>
<member name="P:Crunchyroll_Downloader.My.Resources.Resources.Funimation_Subtitle_String"> <member name="P:Crunchyroll_Downloader.My.Resources.Resources.Funimation_Subtitle_String">
<summary> <summary>
Sucht eine lokalisierte Zeichenfolge, die &quot;, &quot;kind&quot;: &quot;subtitle&quot;, &quot;type&quot;: &quot;CC&quot;, &quot;language&quot;: &quot;en&quot; ähnelt. Sucht eine lokalisierte Zeichenfolge, die &quot;, &quot;kind&quot;: &quot;subtitle&quot;, &quot;type&quot;: &quot;CC&quot;, &quot;language&quot;: &quot; ähnelt.
</summary> </summary>
</member> </member>
<member name="P:Crunchyroll_Downloader.My.Resources.Resources.Funimation_Subtitle_String2"> <member name="P:Crunchyroll_Downloader.My.Resources.Resources.Funimation_Subtitle_String2">
<summary> <summary>
Sucht eine lokalisierte Zeichenfolge, die &quot;, &quot;kind&quot;: &quot;subtitle&quot;, &quot;type&quot;: &quot;Full&quot;, &quot;language&quot;: &quot;en&quot; ähnelt. Sucht eine lokalisierte Zeichenfolge, die &quot;, &quot;kind&quot;: &quot;subtitle&quot;, &quot;type&quot;: &quot;Full&quot;, &quot;language&quot;: &quot; ähnelt.
</summary> </summary>
</member> </member>
<member name="P:Crunchyroll_Downloader.My.Resources.Resources.Funimation_thumbnail"> <member name="P:Crunchyroll_Downloader.My.Resources.Resources.Funimation_thumbnail">

BIN
Crunchyroll Downloader/obj/x86/Debug/Crunchyroll_Downloader.Resources.resources
View File

Binary file not shown.

BIN
Crunchyroll Downloader/obj/x86/Debug/TempPE/My Project.Resources.Designer.vb.dll
View File

Binary file not shown.