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

added mkv

Browse Source 
bugfixes
mkv added
This commit is contained in:
hama3254 2021-03-08 21:08:26 +01:00
parent 29793c0b3b
commit dc444e5c28
21 changed files with 252 additions and 282 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.

2
CRD-addon/manifest.json
View File

@ -1,7 +1,7 @@
{ {
"manifest_version": 2, "manifest_version": 2,
"name": "Crunchyroll Downloader Addon", "name": "Crunchyroll Downloader Addon",
"version": "0.4.2", "version": "0.5.0",
"description": "A Firefox Addon for my Crunchyroll Downloader", "description": "A Firefox Addon for my Crunchyroll Downloader",

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

@ -362,9 +362,9 @@ Partial Class Anime_Add
Me.Controls.Add(Me.Btn_min) Me.Controls.Add(Me.Btn_min)
Me.Controls.Add(Me.Btn_Close) Me.Controls.Add(Me.Btn_Close)
Me.Controls.Add(Me.pictureBox4) Me.Controls.Add(Me.pictureBox4)
Me.Controls.Add(Me.groupBox2)
Me.Controls.Add(Me.groupBox1) Me.Controls.Add(Me.groupBox1)
Me.Controls.Add(Me.GroupBox3) Me.Controls.Add(Me.GroupBox3)
Me.Controls.Add(Me.groupBox2)
Me.Name = "Anime_Add" Me.Name = "Anime_Add"
Me.Padding = New System.Windows.Forms.Padding(10, 60, 20, 20) Me.Padding = New System.Windows.Forms.Padding(10, 60, 20, 20)
Me.Text = "Add Video" Me.Text = "Add Video"

149
Crunchyroll Downloader/Anime_Add.vb
View File

@ -144,17 +144,6 @@ Public Class Anime_Add
End Try End Try
End Sub End Sub
Private Sub TextBox4_DoubleClick(sender As Object, e As EventArgs) Handles TextBox4.DoubleClick
'MsgBox(DL_Path_String, MsgBoxStyle.OkOnly)
End Sub
Private Sub PictureBox4_Click(sender As Object, e As EventArgs) Handles pictureBox4.Click Private Sub PictureBox4_Click(sender As Object, e As EventArgs) Handles pictureBox4.Click
'pictureBox4.Enabled = False 'pictureBox4.Enabled = False
@ -171,7 +160,7 @@ Public Class Anime_Add
If InStr(ClearUri(1), "&") Then If InStr(ClearUri(1), "&") Then
Dim ClearUri2 As String() = ClearUri(1).Split(New String() {"&"}, System.StringSplitOptions.RemoveEmptyEntries) Dim ClearUri2 As String() = ClearUri(1).Split(New String() {"&"}, System.StringSplitOptions.RemoveEmptyEntries)
Dim Parms As String = Nothing Dim Parms As String = Nothing
For i As Integer = 0 To ClearUri2.Count - 1 For i As Integer = 1 To ClearUri2.Count - 1
Parms = Parms + "&" + ClearUri2(i) Parms = Parms + "&" + ClearUri2(i)
Next Next
textBox1.Text = ClearUri(0) + "?lang=" + Main.DubFunimation + Parms textBox1.Text = ClearUri(0) + "?lang=" + Main.DubFunimation + Parms
@ -584,6 +573,8 @@ Public Class Anime_Add
'MsgBox("Test") 'MsgBox("Test")
comboBox3.Items.Clear() comboBox3.Items.Clear()
comboBox4.Items.Clear() comboBox4.Items.Clear()
comboBox3.Enabled = True
comboBox4.Enabled = True
'comboBox3.Items.Add("[First Episode]") 'comboBox3.Items.Add("[First Episode]")
'comboBox4.Items.Add("[Last Episode]") 'comboBox4.Items.Add("[Last Episode]")
Dim SeasonDropdownAnzahl As String() = Main.WebbrowserText.Split(New String() {"season-dropdown content-menu block"}, System.StringSplitOptions.RemoveEmptyEntries) Dim SeasonDropdownAnzahl As String() = Main.WebbrowserText.Split(New String() {"season-dropdown content-menu block"}, System.StringSplitOptions.RemoveEmptyEntries)
@ -641,6 +632,19 @@ Public Class Anime_Add
pictureBox4.Image = My.Resources.main_button_download_default pictureBox4.Image = My.Resources.main_button_download_default
End If End If
End If End If
Try
Dim ItemFinshedCount As Integer = 0
For i As Integer = 0 To Main.ListView1.Items.Count - 1
If Main.ItemList(i).GetIsStatusFinished() = True Then
ItemFinshedCount = ItemFinshedCount + 1
End If
Next
Main.RunningDownloads = Main.ListView1.Items.Count - ItemFinshedCount
Catch ex As Exception
Main.RunningDownloads = Main.ListView1.Items.Count
End Try
If Main.RunningDownloads < Main.MaxDL Then If Main.RunningDownloads < Main.MaxDL Then
If ListBox1.Items.Count > 0 Then If ListBox1.Items.Count > 0 Then
If GroupBox3.Visible = True Then If GroupBox3.Visible = True Then
@ -656,7 +660,7 @@ Public Class Anime_Add
If InStr(ClearUri(1), "&") Then If InStr(ClearUri(1), "&") Then
Dim ClearUri2 As String() = ClearUri(1).Split(New String() {"&"}, System.StringSplitOptions.RemoveEmptyEntries) Dim ClearUri2 As String() = ClearUri(1).Split(New String() {"&"}, System.StringSplitOptions.RemoveEmptyEntries)
Dim Parms As String = Nothing Dim Parms As String = Nothing
For i As Integer = 0 To ClearUri2.Count - 1 For i As Integer = 1 To ClearUri2.Count - 1
Parms = Parms + "&" + ClearUri2(i) Parms = Parms + "&" + ClearUri2(i)
Next Next
UriUsed = ClearUri(0) + "?lang=" + Main.DubFunimation + Parms UriUsed = ClearUri(0) + "?lang=" + Main.DubFunimation + Parms
@ -693,20 +697,30 @@ Public Class Anime_Add
Main.Funimation_Grapp_RDY = False Main.Funimation_Grapp_RDY = False
Main.WebbrowserURL = UriUsed Main.WebbrowserURL = UriUsed
'MsgBox(UriUsed)
ListBox1.Items.Remove(ListBox1.Items(0)) ListBox1.Items.Remove(ListBox1.Items(0))
'Main.b = False 'Main.b = False
StatusLabel.Text = "Status: loading ..." StatusLabel.Text = "Status: loading ..."
Main.Text = "Status: loading ..." Main.Text = "Status: loading ..."
If Main.SystemWebBrowserCookie IsNot Nothing Then If Main.SystemWebBrowserCookie = Nothing Then
GeckoFX.WebBrowser1.Navigate(UriUsed)
Else
'MsgBox(Main.SystemWebBrowserCookie)
ServicePointManager.Expect100Continue = True ServicePointManager.Expect100Continue = True
ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12 ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12
Try Try
Using client As New WebClient() 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("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: application/json, text/javascript, */*; q=0.01")
client.Headers.Add("Accept-Encoding: gzip, deflate, br") client.Headers.Add("Accept-Encoding: gzip")
client.Headers.Add("Cookie:" + Main.SystemWebBrowserCookie) client.Headers.Add("Cookie:" + Main.SystemWebBrowserCookie)
Dim HTMLString As String = DecompressString(client.DownloadData(Main.WebbrowserURL)) Dim HTMLString As String = "No Value"
Try
HTMLString = DecompressString(client.DownloadData(Main.WebbrowserURL))
Catch ex As Exception
HTMLString = client.DownloadString(Main.WebbrowserURL)
End Try
If InStr(HTMLString, My.Resources.Funimation_Player_ID) Then If InStr(HTMLString, My.Resources.Funimation_Player_ID) Then
Dim WebbrowserHeadTextSplit() As String = HTMLString.Split(New String() {"<head"}, System.StringSplitOptions.RemoveEmptyEntries) Dim WebbrowserHeadTextSplit() As String = HTMLString.Split(New String() {"<head"}, System.StringSplitOptions.RemoveEmptyEntries)
@ -727,10 +741,18 @@ Public Class Anime_Add
t.IsBackground = True t.IsBackground = True
t.Start() t.Start()
ElseIf HTMLString = "No Value" Then
Me.Invoke(New Action(Function()
Main.Text = "Status: Website error"
Me.StatusLabel.Text = "Status: no video found"
Return Nothing
End Function))
Else Else
Me.Invoke(New Action(Function() Me.Invoke(New Action(Function()
Main.Text = "Status: no video found" Main.Text = "Status: no video found"
Me.StatusLabel.Text = "fail?" Me.StatusLabel.Text = "Status: no video found"
Return Nothing Return Nothing
End Function)) End Function))
@ -740,8 +762,7 @@ Public Class Anime_Add
MsgBox(ex.ToString) MsgBox(ex.ToString)
Exit Sub Exit Sub
End Try End Try
Else
GeckoFX.WebBrowser1.Navigate(UriUsed)
End If End If
Main.Invalidate() Main.Invalidate()
End If End If
@ -817,6 +838,7 @@ Public Class Anime_Add
Dim ProcessList As New List(Of String) Dim ProcessList As New List(Of String)
Dim Dub As Boolean = False Dim Dub As Boolean = False
Dim RDY As Boolean = True Dim RDY As Boolean = True
Dim VideoFormat As String = Main.VideoFormat
Dim ffmpeg As String = Main.ffmpeg_command Dim ffmpeg As String = Main.ffmpeg_command
Dim Running As Integer = Main.RunningDownloads Dim Running As Integer = Main.RunningDownloads
Dim DlMax As Integer = Main.MaxDL Dim DlMax As Integer = Main.MaxDL
@ -838,6 +860,7 @@ Public Class Anime_Add
Me.Invoke(New Action(Function() Me.Invoke(New Action(Function()
'Main.StatusMainForm.Text = "Crunchyroll Downloader" 'Main.StatusMainForm.Text = "Crunchyroll Downloader"
VideoFormat = Main.VideoFormat
ffmpeg = Main.ffmpeg_command ffmpeg = Main.ffmpeg_command
Pfad2 = Main.Pfad Pfad2 = Main.Pfad
NameMethode = Main.CR_NameMethode NameMethode = Main.CR_NameMethode
@ -1050,7 +1073,7 @@ Public Class Anime_Add
Dim DownloadPfad As String = Chr(34) + Pfad2 + "\" + AoDTitle + ".mp4" + Chr(34) Dim DownloadPfad As String = Chr(34) + Pfad2 + "\" + AoDTitle + VideoFormat + Chr(34)
#Region "lösche doppel download" #Region "lösche doppel download"
@ -1130,7 +1153,7 @@ Public Class Anime_Add
Next Next
'Me.Invoke(New Action(Function() 'Me.Invoke(New Action(Function()
' MsgBox(m3u8_list.Count.ToString) ' 'MsgBox(m3u8_list.Count.ToString)
' Return Nothing ' Return Nothing
' End Function)) ' End Function))
If m3u8_list.Count > 1 Then If m3u8_list.Count > 1 Then
@ -1146,7 +1169,7 @@ Public Class Anime_Add
End If End If
Else Else
'Me.Invoke(New Action(Function() 'Me.Invoke(New Action(Function()
' MsgBox(HigestBitrate.ToString + vbNewLine + BitRate2(0)) ' 'MsgBox(HigestBitrate.ToString + vbNewLine + BitRate2(0))
' Return Nothing ' Return Nothing
' End Function)) ' End Function))
If HigestBitrate > CInt(BitRate2(0)) Then If HigestBitrate > CInt(BitRate2(0)) Then
@ -1164,7 +1187,7 @@ Public Class Anime_Add
End If End If
Else Else
'Me.Invoke(New Action(Function() 'Me.Invoke(New Action(Function()
' MsgBox(HigestBitrate.ToString + vbNewLine + BitRate2(0)) ' 'MsgBox(HigestBitrate.ToString + vbNewLine + BitRate2(0))
' Return Nothing ' Return Nothing
' End Function)) ' End Function))
If HigestBitrate > CInt(BitRate2(0)) Then If HigestBitrate > CInt(BitRate2(0)) Then
@ -1256,91 +1279,11 @@ Public Class Anime_Add
RDY = True RDY = True
Next Next
'#Region "SubsToMP4"
' If UsedSub = Nothing Then
' 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) + DubMetatata + " " + ffmpeg_command
' Else
' Dim DubMetatata As String = " -metadata:s:a:0 language=eng"
' Funimation_m3u8_final = "-i " + Chr(34) + Funimation_m3u8_final + Chr(34) + DubMetatata + " " + ffmpeg_command
' End If
' ElseIf HardSubFunimation = True Then
' Dim ffmpeg_hardsub As String = Nothing
' If InStr(ffmpeg_command, "-c copy") Then
' ffmpeg_hardsub = "-bsf:a aac_adtstoasc"
' Else
' ffmpeg_hardsub = ffmpeg_command
' 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 SoftSubMergeMaps As String = " -map 0:v -map 0:a -map 1"
' Dim SoftSubMergeMetatata As String = " -metadata:s:s:0 language=eng"
' Funimation_m3u8_final = "-i " + Chr(34) + Funimation_m3u8_final + Chr(34) + SoftSubMergeURLs + SoftSubMergeMaps + " " + ffmpeg_command + " -c:s mov_text" + SoftSubMergeMetatata + DubMetatata
' End If
' 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) + DubMetatata + " " + ffmpeg_command
' Else
' Dim DubMetatata As String = " -metadata:s:a:0 language=eng"
' Funimation_m3u8_final = "-i " + Chr(34) + Funimation_m3u8_final + Chr(34) + DubMetatata + " " + ffmpeg_command
' End If
' End If
'#End Region
' 'MsgBox(Funimation_m3u8_final)
' 'DownloadPfad = DownloadPfad.Replace(" \", "\")
' DownloadPfad = RemoveExtraSpaces(DownloadPfad)
' Dim L1Name_Split As String() = WebbrowserURL.Split(New String() {"/"}, System.StringSplitOptions.RemoveEmptyEntries)
' Dim L1Name As String = L1Name_Split(1).Replace("www.", "") + " | Dub : " + FunimationDub
' Me.Invoke(New Action(Function()
' ListItemAdd(Pfad_DL, L1Name, DefaultName, ResoHTMLDisplay, "Unknown", SubValuesToDisplay(), thumbnail3, Funimation_m3u8_final, Chr(34) + DownloadPfad + Chr(34))
' Return Nothing
' End Function))
' liList.Add(My.Resources.htmlvorThumbnail + thumbnail3 + My.Resources.htmlnachTumbnail + FunimationTitle + " <br> " + FunimationSeason + " " + FunimationEpisode + My.Resources.htmlvorAufloesung + ResoHTMLDisplay + My.Resources.htmlvorSoftSubs + vbNewLine + SubValuesToDisplay() + My.Resources.htmlvorHardSubs + "null" + My.Resources.htmlnachHardSubs + "<!-- " + DefaultName + "-->")
'#End Region
' Catch ex As Exception
' Me.Invoke(New Action(Function()
' StatusMainForm.Text = "Crunchyroll Downloader!"
' Return Nothing
' End Function))
' MsgBox(ex.ToString)
' End Try
' Funimation_Grapp_RDY = True
End Sub End Sub
Private Sub Anime_Add_Resize(sender As Object, e As EventArgs) Handles Me.Resize Private Sub Anime_Add_Resize(sender As Object, e As EventArgs) Handles Me.Resize
Btn_Close.Location = New Point(Me.Width - 40, 1) Btn_Close.Location = New Point(Me.Width - 40, 1)
Btn_min.Location = New Point(Me.Width - 68, 10) Btn_min.Location = New Point(Me.Width - 68, 10)
Me.WindowState = System.Windows.Forms.FormWindowState.Normal
End Sub End Sub
Private Sub Btn_min_Click(sender As Object, e As EventArgs) Handles Btn_min.Click Private Sub Btn_min_Click(sender As Object, e As EventArgs) Handles Btn_min.Click

33
Crunchyroll Downloader/CRD_List_Item.resx
View File

@ -117,6 +117,30 @@
<resheader name="writer"> <resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader> </resheader>
<metadata name="PB_Thumbnail.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="bt_pause.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="bt_del.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Label_Anime.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Label_website.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Label_Reso.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Label_Hardsub.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Label_percent.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="ToolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="ToolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>19, 12</value> <value>19, 12</value>
</metadata> </metadata>
@ -126,7 +150,16 @@
<metadata name="ContextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="ContextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>207, 15</value> <value>207, 15</value>
</metadata> </metadata>
<metadata name="PictureBox5.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="ProgressBar1.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</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>364, 15</value> <value>364, 15</value>
</metadata> </metadata>
<metadata name="$this.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
</root> </root>

28
Crunchyroll Downloader/CRD_List_Item.vb
View File

@ -27,7 +27,7 @@ Public Class CRD_List_Item
Dim ffmpeg_command As String = Nothing Dim ffmpeg_command As String = Nothing
Dim Debug2 As Boolean = False Dim Debug2 As Boolean = False
Dim MergeSubstoMP4 As Boolean = False Dim MergeSubstoMP4 As Boolean = False
Dim SaveLog As Boolean = False
Dim DownloadPfad As String = Nothing Dim DownloadPfad As String = Nothing
Dim ToDispose As Boolean = False Dim ToDispose As Boolean = False
Dim Failed As Boolean = False Dim Failed As Boolean = False
@ -184,9 +184,7 @@ Public Class CRD_List_Item
Public Sub SetDebug2(ByVal Value As Boolean) Public Sub SetDebug2(ByVal Value As Boolean)
Debug2 = Value Debug2 = Value
End Sub End Sub
Public Sub SetSaveLog(ByVal Value As Boolean)
SaveLog = Value
End Sub
Public Sub SetTargetReso(ByVal Value As Integer) Public Sub SetTargetReso(ByVal Value As Integer)
TargetReso = Value TargetReso = Value
End Sub End Sub
@ -839,6 +837,7 @@ Public Class CRD_List_Item
retryCount = retryCount - 1 retryCount = retryCount - 1
Me.Invoke(New Action(Function() Me.Invoke(New Action(Function()
Label_percent.Text = "Access Error - retrying" Label_percent.Text = "Access Error - retrying"
Debug.WriteLine(ex.ToString)
Return Nothing Return Nothing
End Function)) End Function))
@ -846,6 +845,7 @@ Public Class CRD_List_Item
'retry = False 'retry = False
Me.Invoke(New Action(Function() Me.Invoke(New Action(Function()
Label_percent.Text = "Access Error - download canceled" Label_percent.Text = "Access Error - download canceled"
Debug.WriteLine(ex.ToString)
Return Nothing Return Nothing
End Function)) End Function))
Return Nothing Return Nothing
@ -903,12 +903,14 @@ Public Class CRD_List_Item
retryCount = retryCount - 1 retryCount = retryCount - 1
Me.Invoke(New Action(Function() Me.Invoke(New Action(Function()
Label_percent.Text = "Access Error - retrying" Label_percent.Text = "Access Error - retrying"
Debug.WriteLine(ex.ToString)
Return Nothing Return Nothing
End Function)) End Function))
Else Else
Me.Invoke(New Action(Function() Me.Invoke(New Action(Function()
Label_percent.Text = "Access Error - download canceled" Label_percent.Text = "Access Error - download canceled"
Debug.WriteLine(ex.ToString)
Return Nothing Return Nothing
End Function)) End Function))
Return Nothing Return Nothing
@ -1056,22 +1058,6 @@ Public Class CRD_List_Item
Catch ex As Exception Catch ex As Exception
End Try End Try
Try
Dim logfile As String = DownloadPfad.Replace(".mp4", ".log").Replace(Chr(34), "")
If SaveLog = True Then
If File.Exists(logfile) Then
Using sw As StreamWriter = File.AppendText(logfile)
sw.Write(vbNewLine)
sw.Write(Date.Now + e.Data)
End Using
Else
File.WriteAllText(logfile, Date.Now + " " + e.Data)
End If
End If
Catch ex As Exception
End Try
#Region "Detect Auto resolution" #Region "Detect Auto resolution"
Try Try
@ -1325,7 +1311,7 @@ Public Class CRD_List_Item
Private Sub SaveToFile_Click(sender As Object, e As EventArgs) Handles SaveToFile.Click Private Sub SaveToFile_Click(sender As Object, e As EventArgs) Handles SaveToFile.Click
Try Try
Dim logfile As String = DownloadPfad.Replace(".mp4", ".log").Replace(Chr(34), "") Dim logfile As String = DownloadPfad.Replace(Main.VideoFormat, ".log").Replace(Chr(34), "")
'If File.Exists(logfile) Then 'If File.Exists(logfile) Then
Using sw As StreamWriter = File.AppendText(logfile) Using sw As StreamWriter = File.AppendText(logfile)
sw.Write(LogText.Item(0)) sw.Write(LogText.Item(0))

158
Crunchyroll Downloader/Main.vb
View File

@ -29,7 +29,7 @@ Public Class Main
Public HTMLString As String = My.Resources.Startuphtml Public HTMLString As String = My.Resources.Startuphtml
'Public RunServer As Boolean = True 'Public RunServer As Boolean = True
Public ListBoxList As New List(Of String) Public ListBoxList As New List(Of String)
Dim ItemList As New List(Of CRD_List_Item) Public ItemList As New List(Of CRD_List_Item)
Public RunningDownloads As Integer = 0 Public RunningDownloads As Integer = 0
Public UseQueue As Boolean = False Public UseQueue As Boolean = False
Public StartServer As Integer = 0 Public StartServer As Integer = 0
@ -43,9 +43,12 @@ Public Class Main
Public Debug2 As Boolean = False Public Debug2 As Boolean = False
Public LogBrowserData As Boolean = False Public LogBrowserData As Boolean = False
Public Thumbnail As String = Nothing Public Thumbnail As String = Nothing
Public MergeSubstoMP4 As Boolean = False Public MergeSubs As Boolean = False
Public VideoFormat As String = ".mp4"
Public MergeSubsFormat As String = "mov_text"
Public LoginDialog As Boolean = False Public LoginDialog As Boolean = False
Public SaveLog As Boolean = False
Public NonCR_Timeout As Integer = 5 Public NonCR_Timeout As Integer = 5
Public NonCR_URL As String = Nothing Public NonCR_URL As String = Nothing
Public DlSoftSubsRDY As Boolean = True Public DlSoftSubsRDY As Boolean = True
@ -507,8 +510,23 @@ 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")
MergeSubstoMP4 = CBool(Integer.Parse(rkg.GetValue("MergeMP4").ToString)) MergeSubs = CBool(Integer.Parse(rkg.GetValue("MergeSubs").ToString))
Catch ex As Exception Catch ex As Exception
Try
Dim rkg As RegistryKey = Registry.CurrentUser.OpenSubKey("Software\CRDownloader")
MergeSubs = CBool(Integer.Parse(rkg.GetValue("MergeMP4").ToString))
Catch ex2 As Exception
End Try
End Try
Try
Dim rkg As RegistryKey = Registry.CurrentUser.OpenSubKey("Software\CRDownloader")
Dim Format As String = rkg.GetValue("VideoFormat").ToString
If Format = ".mkv" Then
VideoFormat = ".mkv"
MergeSubsFormat = "copy"
End If
Catch ex2 As Exception
End Try End Try
Try Try
@ -547,18 +565,7 @@ 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")
SaveLog = CBool(Integer.Parse(rkg.GetValue("SaveLog").ToString))
Catch ex As Exception
End Try
Try
Dim rkg As RegistryKey = Registry.CurrentUser.OpenSubKey("Software\CRDownloader")
SaveLog = CBool(Integer.Parse(rkg.GetValue("SaveLog").ToString))
Catch ex As Exception
End Try
#Region "removed softsubtitle" #Region "removed softsubtitle"
Try Try
@ -614,9 +621,9 @@ Public Class Main
#Region "Set Variables" #Region "Set Variables"
'Item.SetUsedMap(UsedMap) 'Item.SetUsedMap(UsedMap)
Item.Setffmpeg_command(ffmpeg_command) Item.Setffmpeg_command(ffmpeg_command)
Item.SetMergeSubstoMP4(MergeSubstoMP4) Item.SetMergeSubstoMP4(MergeSubs)
Item.SetDebug2(Debug2) Item.SetDebug2(Debug2)
Item.SetSaveLog(SaveLog)
#End Region #End Region
Dim r As Rectangle Dim r As Rectangle
@ -712,6 +719,9 @@ Public Class Main
Anime_Add.ComboBox1.Items.Clear() Anime_Add.ComboBox1.Items.Clear()
Anime_Add.comboBox3.Items.Clear() Anime_Add.comboBox3.Items.Clear()
Anime_Add.comboBox4.Items.Clear() Anime_Add.comboBox4.Items.Clear()
Anime_Add.ComboBox1.Text = Nothing
Anime_Add.comboBox3.Text = Nothing
Anime_Add.comboBox4.Text = Nothing
Anime_Add.ComboBox1.Enabled = False Anime_Add.ComboBox1.Enabled = False
Anime_Add.comboBox3.Enabled = True Anime_Add.comboBox3.Enabled = True
Anime_Add.comboBox4.Enabled = True Anime_Add.comboBox4.Enabled = True
@ -744,9 +754,12 @@ Public Class Main
Anime_Add.ComboBox1.Items.Clear() Anime_Add.ComboBox1.Items.Clear()
Anime_Add.comboBox3.Items.Clear() Anime_Add.comboBox3.Items.Clear()
Anime_Add.comboBox4.Items.Clear() Anime_Add.comboBox4.Items.Clear()
Anime_Add.ComboBox1.Text = Nothing
Anime_Add.comboBox3.Text = Nothing
Anime_Add.comboBox4.Text = Nothing
Anime_Add.ComboBox1.Enabled = True Anime_Add.ComboBox1.Enabled = True
Anime_Add.comboBox3.Enabled = True Anime_Add.comboBox3.Enabled = False
Anime_Add.comboBox4.Enabled = True Anime_Add.comboBox4.Enabled = False
Dim Anzahl As String() = WebbrowserText.Split(New String() {"season-dropdown content-menu block"}, System.StringSplitOptions.RemoveEmptyEntries) Dim Anzahl As String() = WebbrowserText.Split(New String() {"season-dropdown content-menu block"}, System.StringSplitOptions.RemoveEmptyEntries)
Array.Reverse(Anzahl) Array.Reverse(Anzahl)
For i As Integer = 0 To Anzahl.Count - 2 For i As Integer = 0 To Anzahl.Count - 2
@ -1007,11 +1020,11 @@ Public Class Main
Directory.CreateDirectory(Path.GetDirectoryName(Pfad2)) Directory.CreateDirectory(Path.GetDirectoryName(Pfad2))
Catch ex As Exception Catch ex As Exception
' Ordner wurde nich erstellt ' Ordner wurde nich erstellt
Pfad2 = Pfad + "\" + CR_FilenName_Backup + ".mp4" Pfad2 = Pfad + "\" + CR_FilenName_Backup + VideoFormat
End Try End Try
End If End If
Pfad2 = Chr(34) + Pfad2 + CR_FilenName + ".mp4" + Chr(34) Pfad2 = Chr(34) + Pfad2 + CR_FilenName + VideoFormat + Chr(34)
#End Region #End Region
#Region "Subs" #Region "Subs"
@ -1436,17 +1449,28 @@ Public Class Main
Dim CR_Episode_2 As String() = CR_Episode_1(1).Split(New String() {Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries) '(New [Char]() {"-"}) Dim CR_Episode_2 As String() = CR_Episode_1(1).Split(New String() {Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries) '(New [Char]() {"-"})
CR_Anime_Folge_int = String.Join(" ", CR_Episode_2(0).Split(invalids, StringSplitOptions.RemoveEmptyEntries)).TrimEnd("."c) 'System.Text.RegularExpressions.Regex.Replace(CR_Name_2(0), "[^\w\\-]", " ") CR_Anime_Folge_int = String.Join(" ", CR_Episode_2(0).Split(invalids, StringSplitOptions.RemoveEmptyEntries)).TrimEnd("."c) 'System.Text.RegularExpressions.Regex.Replace(CR_Name_2(0), "[^\w\\-]", " ")
CR_Anime_Folge_int = RemoveExtraSpaces(CR_Anime_Folge_int) CR_Anime_Folge_int = RemoveExtraSpaces(CR_Anime_Folge_int)
If InStr(CR_Anime_Folge_int, ".") Then
Dim Folge_Double As Double = Double.Parse(CR_Anime_Folge_int, CultureInfo.InvariantCulture) Dim CleanedNumber As String = Nothing
Debug.WriteLine(String.Format("{0:00.0}", Folge_Double)) Dim myChars() As Char = CR_Anime_Folge_int.ToCharArray()
For Each ch As Char In myChars
If Char.IsDigit(ch) Then
CleanedNumber = CleanedNumber + ch.ToString
ElseIf ch = "." Then
CleanedNumber = CleanedNumber + ch.ToString
ElseIf ch = "," Then
CleanedNumber = CleanedNumber + "."
End If
Next
If CleanedNumber = Nothing Then
ElseIf InStr(CleanedNumber, ".") Then
Dim Folge_Double As Double = Double.Parse(CleanedNumber, CultureInfo.InvariantCulture)
If Folge_Double < 10 Then If Folge_Double < 10 Then
CR_Anime_Folge_int = String.Format("{0:00.0}", Folge_Double) CR_Anime_Folge_int = String.Format("{0:00.0}", Folge_Double)
If InStr(CR_Anime_Folge_int, ",") Then
CR_Anime_Folge_int = CR_Anime_Folge_int.Replace(",", ".")
End If End If
End If ElseIf Integer.Parse(CleanedNumber) < 10 Then
ElseIf Integer.Parse(CR_Anime_Folge_int) < 10 Then CR_Anime_Folge_int = "0" + CleanedNumber
CR_Anime_Folge_int = "0" + CR_Anime_Folge_int
End If End If
End If End If
@ -1549,11 +1573,11 @@ Public Class Main
Directory.CreateDirectory(Path.GetDirectoryName(Pfad2)) Directory.CreateDirectory(Path.GetDirectoryName(Pfad2))
Catch ex As Exception Catch ex As Exception
' Ordner wurde nich erstellt ' Ordner wurde nich erstellt
Pfad2 = Pfad + "\" + CR_FilenName + ".mp4" Pfad2 = Pfad + "\" + CR_FilenName + VideoFormat
End Try End Try
End If End If
Pfad2 = Chr(34) + Pfad2 + CR_FilenName + ".mp4" + Chr(34) Pfad2 = Chr(34) + Pfad2 + CR_FilenName + VideoFormat + Chr(34)
#End Region #End Region
#Region "Subs" #Region "Subs"
@ -1674,7 +1698,7 @@ Public Class Main
Dim SoftSubMergeMetatata As String = Nothing Dim SoftSubMergeMetatata As String = Nothing
If SoftSubs2.Count > 0 Then If SoftSubs2.Count > 0 Then
If MergeSubstoMP4 = True Then If MergeSubs = True Then
Dim DispositionIndex As Integer Dim DispositionIndex As Integer
For i As Integer = 0 To SoftSubs2.Count - 1 For i As Integer = 0 To SoftSubs2.Count - 1
Debug.WriteLine(SoftSubs2(i)) Debug.WriteLine(SoftSubs2(i))
@ -1753,8 +1777,8 @@ Public Class Main
End If End If
#End Region #End Region
If Reso = 42 And HybridMode = False Then If Reso = 42 And HybridMode = False Then
If MergeSubstoMP4 = True Then If MergeSubs = True Then
URL_DL = "-i " + Chr(34) + CR_URI_Master + Chr(34) + SoftSubMergeURLs + SoftSubMergeMaps + " " + ffmpeg_command + " -c:s mov_text" + SoftSubMergeMetatata + " -metadata:s:a:0 language=" + CCtoMP4CC(CR_Anime_Dub) URL_DL = "-i " + Chr(34) + CR_URI_Master + Chr(34) + SoftSubMergeURLs + SoftSubMergeMaps + " " + ffmpeg_command + " -c:s " + MergeSubsFormat + SoftSubMergeMetatata + " -metadata:s:a:0 language=" + CCtoMP4CC(CR_Anime_Dub)
Else Else
URL_DL = "-i " + Chr(34) + CR_URI_Master + Chr(34) + " -metadata:s:a:0 language=" + CCtoMP4CC(CR_Anime_Dub) + " " + ffmpeg_command URL_DL = "-i " + Chr(34) + CR_URI_Master + Chr(34) + " -metadata:s:a:0 language=" + CCtoMP4CC(CR_Anime_Dub) + " " + ffmpeg_command
End If End If
@ -1792,53 +1816,22 @@ Public Class Main
End If End If
End If End If
End If End If
#Region "old non gzip fix"
'MsgBox(Reso2)
' Dim VLC_URI_1 As String() = str.Split(New String() {Reso2 + ","}, System.StringSplitOptions.RemoveEmptyEntries)
' Dim VLC_URI_2 As String() = VLC_URI_1(1).Split(New [Char]() {Chr(34)})
' Dim VLC_URI_3 As String() = VLC_URI_2(2).Split(New [Char]() {System.Convert.ToChar("#")})
' If MergeSubstoMP4 = True Then
' URL_DL = "-i " + Chr(34) + VLC_URI_3(0).Trim() + Chr(34) + SoftSubMergeURLs + SoftSubMergeMaps + " " + ffmpeg_command + " -c:s mov_text" + SoftSubMergeMetatata + " -metadata:s:a:0 language=" + CCtoMP4CC(CR_Anime_Dub)
' 'URL_DL = "-i " + Chr(34) + VLC_URI_3(0).Trim() + Chr(34) + SoftSubMergeURLs + SoftSubMergeMaps + " " + ffmpeg_command + " -c:s mov_text" + SoftSubMergeMetatata
' Else
' URL_DL = "-i " + Chr(34) + VLC_URI_3(0).Trim() + Chr(34) + " -metadata:s:a:0 language=" + CCtoMP4CC(CR_Anime_Dub) + " " + ffmpeg_command
' 'URL_DL = VLC_URI_3(0).Trim()
' End If
' 'MsgBox(URL_DL)
'End If
#End Region
#Region "gzip fixed with http header in hybrid + ffmpeg" '"gzip fix - no cloudfront cdn"
Dim ffmpeg_url_1 As String() = str.Split(New String() {Reso2 + ","}, System.StringSplitOptions.RemoveEmptyEntries) Dim ffmpeg_url_1 As String() = str.Split(New String() {Reso2 + ","}, System.StringSplitOptions.RemoveEmptyEntries)
Dim ffmpeg_url_3 As String() = Nothing Dim ffmpeg_url_3 As String() = Nothing
'MsgBox(ffmpeg_url_1.Count.ToString)
'If ffmpeg_url_1.Count > 2 Then
' If InStr(ffmpeg_url_1(1), "&cdn=cloudfront-prod") Then
' Dim ffmpeg_url_2 As String() = ffmpeg_url_1(2).Split(New [Char]() {Chr(34)})
' ffmpeg_url_3 = ffmpeg_url_2(2).Split(New [Char]() {System.Convert.ToChar("#")})
' Else
' Dim ffmpeg_url_2 As String() = ffmpeg_url_1(1).Split(New [Char]() {Chr(34)})
' ffmpeg_url_3 = ffmpeg_url_2(2).Split(New [Char]() {System.Convert.ToChar("#")})
' End If
'Else
Dim ffmpeg_url_2 As String() = ffmpeg_url_1(1).Split(New [Char]() {Chr(34)}) Dim ffmpeg_url_2 As String() = ffmpeg_url_1(1).Split(New [Char]() {Chr(34)})
ffmpeg_url_3 = ffmpeg_url_2(2).Split(New [Char]() {System.Convert.ToChar("#")}) ffmpeg_url_3 = ffmpeg_url_2(2).Split(New [Char]() {System.Convert.ToChar("#")})
'End If
If MergeSubstoMP4 = True Then
URL_DL = "-i " + Chr(34) + ffmpeg_url_3(0).Trim() + Chr(34) + SoftSubMergeURLs + SoftSubMergeMaps + " " + ffmpeg_command + " -c:s mov_text" + SoftSubMergeMetatata + " -metadata:s:a:0 language=" + CCtoMP4CC(CR_Anime_Dub)
'URL_DL = "-i " + Chr(34) + VLC_URI_3(0).Trim() + Chr(34) + SoftSubMergeURLs + SoftSubMergeMaps + " " + ffmpeg_command + " -c:s mov_text" + SoftSubMergeMetatata If MergeSubs = True Then
URL_DL = "-i " + Chr(34) + ffmpeg_url_3(0).Trim() + Chr(34) + SoftSubMergeURLs + SoftSubMergeMaps + " " + ffmpeg_command + " -c:s " + MergeSubsFormat + SoftSubMergeMetatata + " -metadata:s:a:0 language=" + CCtoMP4CC(CR_Anime_Dub)
Else Else
URL_DL = "-i " + Chr(34) + ffmpeg_url_3(0).Trim() + Chr(34) + " -metadata:s:a:0 language=" + CCtoMP4CC(CR_Anime_Dub) + " " + ffmpeg_command URL_DL = "-i " + Chr(34) + ffmpeg_url_3(0).Trim() + Chr(34) + " -metadata:s:a:0 language=" + CCtoMP4CC(CR_Anime_Dub) + " " + ffmpeg_command
'URL_DL = VLC_URI_3(0).Trim()
End If End If
'MsgBox(URL_DL)
End If End If
#End Region
#Region "thumbnail" #Region "thumbnail"
Dim thumbnail As String() = WebbrowserText.Split(New String() {My.Resources.thumbnailString}, System.StringSplitOptions.RemoveEmptyEntries) Dim thumbnail As String() = WebbrowserText.Split(New String() {My.Resources.thumbnailString}, System.StringSplitOptions.RemoveEmptyEntries)
@ -2144,7 +2137,7 @@ Public Class Main
#Region "Name + Pfad" #Region "Name + Pfad"
Dim Video_FilenName As String = Video_Title Dim Video_FilenName As String = Video_Title
Video_FilenName = String.Join(" ", Video_FilenName.Split(invalids, StringSplitOptions.RemoveEmptyEntries)).TrimEnd("."c) 'System.Text.RegularExpressions.Regex.Replace(Video_FilenName, "[^\w\\-]", " ") Video_FilenName = String.Join(" ", Video_FilenName.Split(invalids, StringSplitOptions.RemoveEmptyEntries)).TrimEnd("."c) 'System.Text.RegularExpressions.Regex.Replace(Video_FilenName, "[^\w\\-]", " ")
Video_FilenName = RemoveExtraSpaces(Video_FilenName + ".mp4") Video_FilenName = RemoveExtraSpaces(Video_FilenName + VideoFormat)
Pfad_DL = Chr(34) + Pfad + "\" + Video_FilenName + Chr(34) Pfad_DL = Chr(34) + Pfad + "\" + Video_FilenName + Chr(34)
#End Region #End Region
@ -2219,7 +2212,7 @@ Public Class Main
End Function)) End Function))
#End Region #End Region
'AsyncWorkerX.RunAsync(AddressOf DownloadFFMPEG, URL_DL, Pfad_DL, Pfad_DL)
Grapp_non_cr_RDY = True Grapp_non_cr_RDY = True
Me.Invoke(New Action(Function() Me.Invoke(New Action(Function()
@ -2330,7 +2323,7 @@ Public Class Main
End If End If
'Dim DefaultPath As String = Pfad + "\" + DefaultName + ".mp4" 'Dim DefaultPath As String = Pfad + "\" + DefaultName + VideoFormat
'DefaultPath = DefaultPath.Replace("\\", "\") 'DefaultPath = DefaultPath.Replace("\\", "\")
#End Region #End Region
@ -2360,11 +2353,11 @@ Public Class Main
Directory.CreateDirectory(Path.GetDirectoryName(DownloadPfad)) Directory.CreateDirectory(Path.GetDirectoryName(DownloadPfad))
Catch ex As Exception Catch ex As Exception
' Ordner wurde nich erstellt ' Ordner wurde nich erstellt
DownloadPfad = Pfad + "\" + DefaultName + ".mp4" DownloadPfad = Pfad + "\" + DefaultName + VideoFormat
End Try End Try
End If End If
DownloadPfad = DownloadPfad + DefaultName + ".mp4" DownloadPfad = DownloadPfad + DefaultName + VideoFormat
#Region "lösche doppel download" #Region "lösche doppel download"
@ -2651,7 +2644,7 @@ Public Class Main
Me.Invalidate() Me.Invalidate()
Return Nothing Return Nothing
End Function)) End Function))
File.WriteAllText(DownloadPfad.Replace(".mp4", "-subtitle_error.log"), PlayerPage, Encoding.UTF8) File.WriteAllText(DownloadPfad.Replace(VideoFormat, "-subtitle_error.log"), PlayerPage, Encoding.UTF8)
End If End If
@ -2775,7 +2768,7 @@ Public Class Main
Dim SoftSubMergeMetatata As String = Nothing Dim SoftSubMergeMetatata As String = Nothing
If UsedSubs.Count > 0 Then If UsedSubs.Count > 0 Then
If MergeSubstoMP4 = True Then If MergeSubs = True Then
Dim DispositionIndex As Integer = 999 Dim DispositionIndex As Integer = 999
Dim LastMerged As String = Nothing Dim LastMerged As String = Nothing
For i As Integer = 0 To UsedSubs.Count - 1 For i As Integer = 0 To UsedSubs.Count - 1
@ -2861,9 +2854,9 @@ Public Class Main
If HardSubFound = True Then If HardSubFound = True Then
Funimation_m3u8_final = "-i " + Chr(34) + Funimation_m3u8_final + Chr(34) + " -vf subtitles=" + Chr(34) + UsedSub + Chr(34) + " " + ffmpeg_hardsub Funimation_m3u8_final = "-i " + Chr(34) + Funimation_m3u8_final + Chr(34) + " -vf subtitles=" + Chr(34) + UsedSub + Chr(34) + " " + ffmpeg_hardsub
ElseIf MergeSubstoMP4 = True Then ElseIf MergeSubs = True Then
Funimation_m3u8_final = "-i " + Chr(34) + Funimation_m3u8_final + Chr(34) + SoftSubMergeURLs + SoftSubMergeMaps + " " + ffmpeg_command + " -c:s mov_text" + SoftSubMergeMetatata + DubMetatata Funimation_m3u8_final = "-i " + Chr(34) + Funimation_m3u8_final + Chr(34) + SoftSubMergeURLs + SoftSubMergeMaps + " " + ffmpeg_command + " -c:s " + MergeSubsFormat + SoftSubMergeMetatata + DubMetatata
Else Else
@ -3274,7 +3267,7 @@ Public Class Main
#Region "funimation Einzeln" #Region "funimation Einzeln"
ElseIf InStr(htmlReq, "FunimationURL=") Then ElseIf InStr(htmlReq, "FunimationURL=") Then
Debug.WriteLine("single episode mode - Funimation") Debug.WriteLine("single episode mode - Funimation")
MsgBox(htmlReq) 'MsgBox(htmlReq)
Me.Invoke(New Action(Function() Me.Invoke(New Action(Function()
Me.Text = "Status: Download added from add-on" Me.Text = "Status: Download added from add-on"
@ -3296,7 +3289,7 @@ Public Class Main
If InStr(ClearUri(1), "&") Then If InStr(ClearUri(1), "&") Then
Dim ClearUri2 As String() = ClearUri(1).Split(New String() {"&"}, System.StringSplitOptions.RemoveEmptyEntries) Dim ClearUri2 As String() = ClearUri(1).Split(New String() {"&"}, System.StringSplitOptions.RemoveEmptyEntries)
Dim Parms As String = Nothing Dim Parms As String = Nothing
For i As Integer = 0 To ClearUri2.Count - 1 For i As Integer = 1 To ClearUri2.Count - 1
Parms = Parms + "&" + ClearUri2(i) Parms = Parms + "&" + ClearUri2(i)
Next Next
WebbrowserURL = ClearUri(0) + "?lang=" + DubFunimation + Parms WebbrowserURL = ClearUri(0) + "?lang=" + DubFunimation + Parms
@ -3349,12 +3342,11 @@ Public Class Main
'b = False 'b = False
ServicePointManager.Expect100Continue = True ServicePointManager.Expect100Continue = True
ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12 ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12
Try Try
Using client As New WebClient() 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("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: application/json, text/javascript, */*; q=0.01")
client.Headers.Add("Accept-Encoding: gzip, deflate, br") client.Headers.Add("Accept-Encoding: gzip")
client.Headers.Add("Cookie:" + SystemWebBrowserCookie) client.Headers.Add("Cookie:" + SystemWebBrowserCookie)
Dim HTMLString As String = DecompressString(client.DownloadData(WebbrowserURL)) Dim HTMLString As String = DecompressString(client.DownloadData(WebbrowserURL))

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

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

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.

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

@ -43,7 +43,7 @@
</div> </div>
<h1>Failed!</h1> <h1>Failed!</h1>
<p>System.IndexOutOfRangeException: Der Index war außerhalb des Arraybereichs. <p>System.IndexOutOfRangeException: Der Index war außerhalb des Arraybereichs.
bei Crunchyroll_Downloader.Main.ProcessRequest(NetworkStream stream, String htmlReq) in D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.0\Crunchyroll Downloader\Main.vb:Zeile 3287.</p> bei Crunchyroll_Downloader.Main.ProcessRequest(NetworkStream stream, String htmlReq) in D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.0\Crunchyroll Downloader\Main.vb:Zeile 3304.</p>
</div> </div>
</body> </body>
</html> </html>

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

@ -62,8 +62,8 @@ Partial Class Einstellungen
Me.DD_Season_Prefix = New MetroFramework.Controls.MetroComboBox() Me.DD_Season_Prefix = New MetroFramework.Controls.MetroComboBox()
Me.CR_Filename = New MetroFramework.Controls.MetroComboBox() Me.CR_Filename = New MetroFramework.Controls.MetroComboBox()
Me.GroupBox4 = New System.Windows.Forms.GroupBox() Me.GroupBox4 = New System.Windows.Forms.GroupBox()
Me.HybridMode_CB = New MetroFramework.Controls.MetroCheckBox()
Me.MergeMP4 = New MetroFramework.Controls.MetroCheckBox() Me.MergeMP4 = New MetroFramework.Controls.MetroCheckBox()
Me.CB_Format = New MetroFramework.Controls.MetroComboBox()
Me.CheckBox1 = New MetroFramework.Controls.MetroCheckBox() Me.CheckBox1 = New MetroFramework.Controls.MetroCheckBox()
Me.GroupBox2 = New System.Windows.Forms.GroupBox() Me.GroupBox2 = New System.Windows.Forms.GroupBox()
Me.Panel1 = New System.Windows.Forms.Panel() Me.Panel1 = New System.Windows.Forms.Panel()
@ -99,9 +99,9 @@ Partial Class Einstellungen
Me.Label2 = New MetroFramework.Controls.MetroLabel() Me.Label2 = New MetroFramework.Controls.MetroLabel()
Me.NumericUpDown2 = New System.Windows.Forms.NumericUpDown() Me.NumericUpDown2 = New System.Windows.Forms.NumericUpDown()
Me.GroupBox5 = New System.Windows.Forms.GroupBox() Me.GroupBox5 = New System.Windows.Forms.GroupBox()
Me.HybridMode_CB = New MetroFramework.Controls.MetroCheckBox()
Me.http_support = New MetroFramework.Controls.MetroComboBox() Me.http_support = New MetroFramework.Controls.MetroComboBox()
Me.DarkMode = New MetroFramework.Controls.MetroCheckBox() Me.DarkMode = New MetroFramework.Controls.MetroCheckBox()
Me.CB_Log = New MetroFramework.Controls.MetroCheckBox()
Me.ListViewAdd_True = New MetroFramework.Controls.MetroCheckBox() Me.ListViewAdd_True = New MetroFramework.Controls.MetroCheckBox()
Me.GroupBox1 = New System.Windows.Forms.GroupBox() Me.GroupBox1 = New System.Windows.Forms.GroupBox()
Me.Label1 = New MetroFramework.Controls.MetroLabel() Me.Label1 = New MetroFramework.Controls.MetroLabel()
@ -466,7 +466,7 @@ Partial Class Einstellungen
Me.TabPage3.Location = New System.Drawing.Point(4, 35) Me.TabPage3.Location = New System.Drawing.Point(4, 35)
Me.TabPage3.Name = "TabPage3" Me.TabPage3.Name = "TabPage3"
Me.TabPage3.Padding = New System.Windows.Forms.Padding(3) Me.TabPage3.Padding = New System.Windows.Forms.Padding(3)
Me.TabPage3.Size = New System.Drawing.Size(479, 407) Me.TabPage3.Size = New System.Drawing.Size(479, 416)
Me.TabPage3.TabIndex = 3 Me.TabPage3.TabIndex = 3
Me.TabPage3.Text = "Subtile Download" Me.TabPage3.Text = "Subtile Download"
Me.TabPage3.VerticalScrollbarBarColor = True Me.TabPage3.VerticalScrollbarBarColor = True
@ -642,10 +642,10 @@ Partial Class Einstellungen
Me.TabPage2.HorizontalScrollbarBarColor = True Me.TabPage2.HorizontalScrollbarBarColor = True
Me.TabPage2.HorizontalScrollbarHighlightOnWheel = False Me.TabPage2.HorizontalScrollbarHighlightOnWheel = False
Me.TabPage2.HorizontalScrollbarSize = 10 Me.TabPage2.HorizontalScrollbarSize = 10
Me.TabPage2.Location = New System.Drawing.Point(4, 35) Me.TabPage2.Location = New System.Drawing.Point(4, 44)
Me.TabPage2.Name = "TabPage2" Me.TabPage2.Name = "TabPage2"
Me.TabPage2.Padding = New System.Windows.Forms.Padding(3) Me.TabPage2.Padding = New System.Windows.Forms.Padding(3)
Me.TabPage2.Size = New System.Drawing.Size(493, 461) Me.TabPage2.Size = New System.Drawing.Size(493, 452)
Me.TabPage2.TabIndex = 1 Me.TabPage2.TabIndex = 1
Me.TabPage2.Text = "Output" Me.TabPage2.Text = "Output"
Me.TabPage2.VerticalScrollbarBarColor = True Me.TabPage2.VerticalScrollbarBarColor = True
@ -661,7 +661,7 @@ Partial Class Einstellungen
Me.GroupBox12.Controls.Add(Me.CR_Filename) Me.GroupBox12.Controls.Add(Me.CR_Filename)
Me.GroupBox12.Font = New System.Drawing.Font("Arial", 9.75!) Me.GroupBox12.Font = New System.Drawing.Font("Arial", 9.75!)
Me.GroupBox12.ForeColor = System.Drawing.Color.Black Me.GroupBox12.ForeColor = System.Drawing.Color.Black
Me.GroupBox12.Location = New System.Drawing.Point(8, 144) Me.GroupBox12.Location = New System.Drawing.Point(8, 11)
Me.GroupBox12.Name = "GroupBox12" Me.GroupBox12.Name = "GroupBox12"
Me.GroupBox12.Size = New System.Drawing.Size(479, 126) Me.GroupBox12.Size = New System.Drawing.Size(479, 126)
Me.GroupBox12.TabIndex = 53 Me.GroupBox12.TabIndex = 53
@ -715,46 +715,48 @@ Partial Class Einstellungen
'GroupBox4 'GroupBox4
' '
Me.GroupBox4.BackColor = System.Drawing.Color.Transparent Me.GroupBox4.BackColor = System.Drawing.Color.Transparent
Me.GroupBox4.Controls.Add(Me.HybridMode_CB)
Me.GroupBox4.Controls.Add(Me.MergeMP4) Me.GroupBox4.Controls.Add(Me.MergeMP4)
Me.GroupBox4.Controls.Add(Me.CB_Format)
Me.GroupBox4.Font = New System.Drawing.Font("Arial", 9.75!) Me.GroupBox4.Font = New System.Drawing.Font("Arial", 9.75!)
Me.GroupBox4.ForeColor = System.Drawing.Color.Black Me.GroupBox4.ForeColor = System.Drawing.Color.Black
Me.GroupBox4.Location = New System.Drawing.Point(8, 9) Me.GroupBox4.Location = New System.Drawing.Point(8, 205)
Me.GroupBox4.Name = "GroupBox4" Me.GroupBox4.Name = "GroupBox4"
Me.GroupBox4.Size = New System.Drawing.Size(479, 58) Me.GroupBox4.Size = New System.Drawing.Size(479, 78)
Me.GroupBox4.TabIndex = 42 Me.GroupBox4.TabIndex = 42
Me.GroupBox4.TabStop = False Me.GroupBox4.TabStop = False
' '
'HybridMode_CB
'
Me.HybridMode_CB.AutoSize = True
Me.HybridMode_CB.FontSize = MetroFramework.MetroCheckBoxSize.Medium
Me.HybridMode_CB.ForeColor = System.Drawing.Color.Blue
Me.HybridMode_CB.Location = New System.Drawing.Point(24, 21)
Me.HybridMode_CB.Name = "HybridMode_CB"
Me.HybridMode_CB.Size = New System.Drawing.Size(128, 19)
Me.HybridMode_CB.TabIndex = 43
Me.HybridMode_CB.Text = "hybrid download"
Me.HybridMode_CB.UseSelectable = True
'
'MergeMP4 'MergeMP4
' '
Me.MergeMP4.AutoSize = True Me.MergeMP4.AutoSize = True
Me.MergeMP4.FontSize = MetroFramework.MetroCheckBoxSize.Medium Me.MergeMP4.FontSize = MetroFramework.MetroCheckBoxSize.Medium
Me.MergeMP4.Location = New System.Drawing.Point(205, 21) Me.MergeMP4.Location = New System.Drawing.Point(248, 35)
Me.MergeMP4.Name = "MergeMP4" Me.MergeMP4.Name = "MergeMP4"
Me.MergeMP4.Size = New System.Drawing.Size(214, 19) Me.MergeMP4.Size = New System.Drawing.Size(214, 19)
Me.MergeMP4.TabIndex = 42 Me.MergeMP4.TabIndex = 42
Me.MergeMP4.Text = "Merge soft-subs with video file" Me.MergeMP4.Text = "Merge soft-subs with video file"
Me.MergeMP4.UseSelectable = True Me.MergeMP4.UseSelectable = True
' '
'CB_Format
'
Me.CB_Format.DropDownHeight = 250
Me.CB_Format.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.CB_Format.FormattingEnabled = True
Me.CB_Format.IntegralHeight = False
Me.CB_Format.ItemHeight = 23
Me.CB_Format.Items.AddRange(New Object() {"MP4", "MKV"})
Me.CB_Format.Location = New System.Drawing.Point(6, 30)
Me.CB_Format.Name = "CB_Format"
Me.CB_Format.Size = New System.Drawing.Size(225, 29)
Me.CB_Format.TabIndex = 37
Me.CB_Format.UseSelectable = True
'
'CheckBox1 'CheckBox1
' '
Me.CheckBox1.AutoSize = True Me.CheckBox1.AutoSize = True
Me.CheckBox1.BackColor = System.Drawing.Color.Transparent Me.CheckBox1.BackColor = System.Drawing.Color.Transparent
Me.CheckBox1.FontSize = MetroFramework.MetroCheckBoxSize.Medium Me.CheckBox1.FontSize = MetroFramework.MetroCheckBoxSize.Medium
Me.CheckBox1.ForeColor = System.Drawing.Color.Black Me.CheckBox1.ForeColor = System.Drawing.Color.Black
Me.CheckBox1.Location = New System.Drawing.Point(67, 281) Me.CheckBox1.Location = New System.Drawing.Point(67, 295)
Me.CheckBox1.Name = "CheckBox1" Me.CheckBox1.Name = "CheckBox1"
Me.CheckBox1.Size = New System.Drawing.Size(369, 19) Me.CheckBox1.Size = New System.Drawing.Size(369, 19)
Me.CheckBox1.TabIndex = 6 Me.CheckBox1.TabIndex = 6
@ -768,7 +770,7 @@ Partial Class Einstellungen
Me.GroupBox2.Enabled = False Me.GroupBox2.Enabled = False
Me.GroupBox2.Font = New System.Drawing.Font("Arial", 9.75!) Me.GroupBox2.Font = New System.Drawing.Font("Arial", 9.75!)
Me.GroupBox2.ForeColor = System.Drawing.Color.Black Me.GroupBox2.ForeColor = System.Drawing.Color.Black
Me.GroupBox2.Location = New System.Drawing.Point(8, 301) Me.GroupBox2.Location = New System.Drawing.Point(8, 325)
Me.GroupBox2.Name = "GroupBox2" Me.GroupBox2.Name = "GroupBox2"
Me.GroupBox2.Size = New System.Drawing.Size(480, 63) Me.GroupBox2.Size = New System.Drawing.Size(480, 63)
Me.GroupBox2.TabIndex = 40 Me.GroupBox2.TabIndex = 40
@ -920,9 +922,9 @@ Partial Class Einstellungen
Me.GB_Resolution.Controls.Add(Me.A1080p) Me.GB_Resolution.Controls.Add(Me.A1080p)
Me.GB_Resolution.Font = New System.Drawing.Font("Arial", 9.75!) Me.GB_Resolution.Font = New System.Drawing.Font("Arial", 9.75!)
Me.GB_Resolution.ForeColor = System.Drawing.Color.Black Me.GB_Resolution.ForeColor = System.Drawing.Color.Black
Me.GB_Resolution.Location = New System.Drawing.Point(8, 73) Me.GB_Resolution.Location = New System.Drawing.Point(8, 140)
Me.GB_Resolution.Name = "GB_Resolution" Me.GB_Resolution.Name = "GB_Resolution"
Me.GB_Resolution.Size = New System.Drawing.Size(479, 53) Me.GB_Resolution.Size = New System.Drawing.Size(479, 59)
Me.GB_Resolution.TabIndex = 38 Me.GB_Resolution.TabIndex = 38
Me.GB_Resolution.TabStop = False Me.GB_Resolution.TabStop = False
Me.GB_Resolution.Text = "Auflösung" Me.GB_Resolution.Text = "Auflösung"
@ -1074,9 +1076,9 @@ Partial Class Einstellungen
'GroupBox5 'GroupBox5
' '
Me.GroupBox5.BackColor = System.Drawing.Color.Transparent Me.GroupBox5.BackColor = System.Drawing.Color.Transparent
Me.GroupBox5.Controls.Add(Me.HybridMode_CB)
Me.GroupBox5.Controls.Add(Me.http_support) Me.GroupBox5.Controls.Add(Me.http_support)
Me.GroupBox5.Controls.Add(Me.DarkMode) Me.GroupBox5.Controls.Add(Me.DarkMode)
Me.GroupBox5.Controls.Add(Me.CB_Log)
Me.GroupBox5.Controls.Add(Me.ListViewAdd_True) Me.GroupBox5.Controls.Add(Me.ListViewAdd_True)
Me.GroupBox5.Font = New System.Drawing.Font("Arial", 9.75!) Me.GroupBox5.Font = New System.Drawing.Font("Arial", 9.75!)
Me.GroupBox5.ForeColor = System.Drawing.Color.Black Me.GroupBox5.ForeColor = System.Drawing.Color.Black
@ -1087,6 +1089,18 @@ Partial Class Einstellungen
Me.GroupBox5.TabStop = False Me.GroupBox5.TabStop = False
Me.GroupBox5.Text = "Other" Me.GroupBox5.Text = "Other"
' '
'HybridMode_CB
'
Me.HybridMode_CB.AutoSize = True
Me.HybridMode_CB.FontSize = MetroFramework.MetroCheckBoxSize.Medium
Me.HybridMode_CB.ForeColor = System.Drawing.Color.Blue
Me.HybridMode_CB.Location = New System.Drawing.Point(45, 38)
Me.HybridMode_CB.Name = "HybridMode_CB"
Me.HybridMode_CB.Size = New System.Drawing.Size(128, 19)
Me.HybridMode_CB.TabIndex = 46
Me.HybridMode_CB.Text = "hybrid download"
Me.HybridMode_CB.UseSelectable = True
'
'http_support 'http_support
' '
Me.http_support.DropDownHeight = 250 Me.http_support.DropDownHeight = 250
@ -1112,17 +1126,6 @@ Partial Class Einstellungen
Me.DarkMode.Text = "enable dark mode" Me.DarkMode.Text = "enable dark mode"
Me.DarkMode.UseSelectable = True Me.DarkMode.UseSelectable = True
' '
'CB_Log
'
Me.CB_Log.AutoSize = True
Me.CB_Log.FontSize = MetroFramework.MetroCheckBoxSize.Medium
Me.CB_Log.Location = New System.Drawing.Point(45, 38)
Me.CB_Log.Name = "CB_Log"
Me.CB_Log.Size = New System.Drawing.Size(85, 19)
Me.CB_Log.TabIndex = 1
Me.CB_Log.Text = "create log"
Me.CB_Log.UseSelectable = True
'
'ListViewAdd_True 'ListViewAdd_True
' '
Me.ListViewAdd_True.AutoSize = True Me.ListViewAdd_True.AutoSize = True
@ -1225,7 +1228,7 @@ Partial Class Einstellungen
Me.TabControl1.FontWeight = MetroFramework.MetroTabControlWeight.Regular Me.TabControl1.FontWeight = MetroFramework.MetroTabControlWeight.Regular
Me.TabControl1.Location = New System.Drawing.Point(22, 60) Me.TabControl1.Location = New System.Drawing.Point(22, 60)
Me.TabControl1.Name = "TabControl1" Me.TabControl1.Name = "TabControl1"
Me.TabControl1.SelectedIndex = 0 Me.TabControl1.SelectedIndex = 1
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
@ -1241,10 +1244,10 @@ Partial Class Einstellungen
Me.TabPage6.HorizontalScrollbarBarColor = True Me.TabPage6.HorizontalScrollbarBarColor = True
Me.TabPage6.HorizontalScrollbarHighlightOnWheel = False Me.TabPage6.HorizontalScrollbarHighlightOnWheel = False
Me.TabPage6.HorizontalScrollbarSize = 10 Me.TabPage6.HorizontalScrollbarSize = 10
Me.TabPage6.Location = New System.Drawing.Point(4, 44) Me.TabPage6.Location = New System.Drawing.Point(4, 35)
Me.TabPage6.Name = "TabPage6" Me.TabPage6.Name = "TabPage6"
Me.TabPage6.Padding = New System.Windows.Forms.Padding(3) Me.TabPage6.Padding = New System.Windows.Forms.Padding(3)
Me.TabPage6.Size = New System.Drawing.Size(493, 452) Me.TabPage6.Size = New System.Drawing.Size(493, 461)
Me.TabPage6.TabIndex = 4 Me.TabPage6.TabIndex = 4
Me.TabPage6.Text = "Funimation" Me.TabPage6.Text = "Funimation"
Me.TabPage6.VerticalScrollbarBarColor = True Me.TabPage6.VerticalScrollbarBarColor = True
@ -1763,11 +1766,9 @@ Partial Class Einstellungen
Friend WithEvents Button1 As Button Friend WithEvents Button1 As Button
Public WithEvents StatusLabel As MetroFramework.Controls.MetroLabel Public WithEvents StatusLabel As MetroFramework.Controls.MetroLabel
Public WithEvents SoftSubsMass As MetroFramework.Controls.MetroLabel Public WithEvents SoftSubsMass As MetroFramework.Controls.MetroLabel
Friend WithEvents CB_Log As MetroFramework.Controls.MetroCheckBox
Friend WithEvents ListViewAdd_True As MetroFramework.Controls.MetroCheckBox Friend WithEvents ListViewAdd_True As MetroFramework.Controls.MetroCheckBox
Friend WithEvents Label1 As MetroFramework.Controls.MetroLabel Friend WithEvents Label1 As MetroFramework.Controls.MetroLabel
Friend WithEvents MergeMP4 As MetroFramework.Controls.MetroCheckBox Friend WithEvents MergeMP4 As MetroFramework.Controls.MetroCheckBox
Friend WithEvents HybridMode_CB As MetroFramework.Controls.MetroCheckBox
Public WithEvents CBesES As MetroFramework.Controls.MetroCheckBox Public WithEvents CBesES As MetroFramework.Controls.MetroCheckBox
Public WithEvents CBitIT As MetroFramework.Controls.MetroCheckBox Public WithEvents CBitIT As MetroFramework.Controls.MetroCheckBox
Public WithEvents CBruRU As MetroFramework.Controls.MetroCheckBox Public WithEvents CBruRU As MetroFramework.Controls.MetroCheckBox
@ -1821,4 +1822,6 @@ Partial Class Einstellungen
Friend WithEvents FunSubDef As MetroFramework.Controls.MetroComboBox Friend WithEvents FunSubDef As MetroFramework.Controls.MetroComboBox
Friend WithEvents GroupBox14 As GroupBox Friend WithEvents GroupBox14 As GroupBox
Friend WithEvents CR_SoftSubDefault As MetroFramework.Controls.MetroComboBox Friend WithEvents CR_SoftSubDefault As MetroFramework.Controls.MetroComboBox
Friend WithEvents CB_Format As MetroFramework.Controls.MetroComboBox
Friend WithEvents HybridMode_CB As MetroFramework.Controls.MetroCheckBox
End Class End Class

3
Crunchyroll Downloader/einstellungen.resx
View File

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

58
Crunchyroll Downloader/einstellungen.vb
View File

@ -93,7 +93,7 @@ Public Class Einstellungen
End Try End Try
If Main.MergeSubstoMP4 = True Then If Main.MergeSubs = True Then
MergeMP4.Checked = True MergeMP4.Checked = True
End If End If
If Main.HybridMode = True Then If Main.HybridMode = True Then
@ -131,6 +131,12 @@ Public Class Einstellungen
CB_Fun_HardSubs.SelectedItem = "Disabled" CB_Fun_HardSubs.SelectedItem = "Disabled"
'FunimationHardsub.Checked = True 'FunimationHardsub.Checked = True
End If End If
If Main.VideoFormat = ".mkv" Then
CB_Format.SelectedItem = "MKV"
Else
CB_Format.SelectedItem = "MP4"
End If
If Main.DubFunimation = "english" Then If Main.DubFunimation = "english" Then
Fun_Dub_Over.SelectedItem = "english" Fun_Dub_Over.SelectedItem = "english"
@ -148,9 +154,7 @@ Public Class Einstellungen
Fun_Dub_Over.SelectedItem = "Disabled" Fun_Dub_Over.SelectedItem = "Disabled"
End If End If
If Main.SaveLog = True Then
CB_Log.Checked = True
End If
Try Try
GB_Resolution.Text = Main.GB_Resolution_Text GB_Resolution.Text = Main.GB_Resolution_Text
GB_SubLanguage.Text = Main.GB_SubLanguage_Text GB_SubLanguage.Text = Main.GB_SubLanguage_Text
@ -469,12 +473,22 @@ Public Class Einstellungen
rk.SetValue("CR_NameMethode", 3, RegistryValueKind.String) rk.SetValue("CR_NameMethode", 3, RegistryValueKind.String)
End If End If
If MergeMP4.Checked = True Then If CB_Format.Text = "MKV" Then
Main.MergeSubstoMP4 = True Main.VideoFormat = ".mkv"
rk.SetValue("MergeMP4", "1", RegistryValueKind.String) Main.MergeSubsFormat = "copy"
rk.SetValue("VideoFormat", ".mkv", RegistryValueKind.String)
Else Else
Main.MergeSubstoMP4 = False Main.VideoFormat = ".mp4"
rk.SetValue("MergeMP4", "0", RegistryValueKind.String) Main.MergeSubsFormat = "mov_text"
rk.SetValue("VideoFormat", ".mp4", RegistryValueKind.String)
End If
If MergeMP4.Checked = True Then
Main.MergeSubs = True
rk.SetValue("MergeSubs", "1", RegistryValueKind.String)
Else
Main.MergeSubs = False
rk.SetValue("MergeSubs", "0", RegistryValueKind.String)
End If End If
If HybridMode_CB.Checked = True Then If HybridMode_CB.Checked = True Then
Main.HybridMode = True Main.HybridMode = True
@ -577,13 +591,6 @@ Public Class Einstellungen
If CB_Log.Checked = True Then
Main.SaveLog = True
rk.SetValue("SaveLog", "1", RegistryValueKind.String)
Else
Main.SaveLog = False
rk.SetValue("SaveLog", "0", RegistryValueKind.String)
End If
If CheckBox1.Enabled = False Then If CheckBox1.Enabled = False Then
@ -770,14 +777,7 @@ Public Class Einstellungen
End If End If
End Sub End Sub
Private Sub HybridMode_CB_Click(sender As Object, e As EventArgs) Handles HybridMode_CB.Click
If HybridMode_CB.Checked = True Then
If AAuto.Checked = True Then
MsgBox("Resolution '[Auto]' and 'Hybride Mode' does not work together", MsgBoxStyle.Information)
HybridMode_CB.Checked = False
End If
End If
End Sub
Private Sub PictureBox5_Click(sender As Object, e As EventArgs) Handles PictureBox5.Click Private Sub PictureBox5_Click(sender As Object, e As EventArgs) Handles PictureBox5.Click
If Main.SoftSubs.Count > 0 Then If Main.SoftSubs.Count > 0 Then
@ -1198,6 +1198,16 @@ Public Class Einstellungen
End If End If
End Sub End Sub
Private Sub HybridMode_CB_Click(sender As Object, e As EventArgs) Handles HybridMode_CB.Click
If HybridMode_CB.Checked = True Then
If AAuto.Checked = True Then
MsgBox("Resolution '[Auto]' and 'Hybride Mode' does not work together", MsgBoxStyle.Information)
HybridMode_CB.Checked = False
End If
End If
End Sub
#End Region #End Region

2
Crunchyroll Downloader/network_scan.vb
View File

@ -273,7 +273,7 @@ Public Class network_scan
Dim m3u8Final As String = "-headers " + My.Resources.ffmpeg_user_agend + " -i " + Chr(34) + RequestURL + Chr(34) + " -map " + RequestMap + " -map 0:a" + Main.ffmpeg_command Dim m3u8Final As String = "-headers " + My.Resources.ffmpeg_user_agend + " -i " + Chr(34) + RequestURL + Chr(34) + " -map " + RequestMap + " -map 0:a" + Main.ffmpeg_command
'MsgBox(m3u8Final) 'MsgBox(m3u8Final)
Dim DisplayReso As String = RequestReso.ToString + "p" Dim DisplayReso As String = RequestReso.ToString + "p"
Dim Pfad2 As String = Chr(34) + FilePfad + ".mp4" + Chr(34) Dim Pfad2 As String = Chr(34) + FilePfad + Main.VideoFormat + Chr(34)
Dim Title As String = FileName '+ ".mp4" Dim Title As String = FileName '+ ".mp4"
Dim L1Name_Split As String() = Main.WebbrowserURL.Split(New String() {"/"}, System.StringSplitOptions.RemoveEmptyEntries) Dim L1Name_Split As String() = Main.WebbrowserURL.Split(New String() {"/"}, System.StringSplitOptions.RemoveEmptyEntries)
Dim L1Name As String = L1Name_Split(1) Dim L1Name As String = L1Name_Split(1)

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.

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

Binary file not shown.