diff --git a/.vs/Crunchyroll Downloader/v15/.suo b/.vs/Crunchyroll Downloader/v15/.suo index 055b2a3..b1f462e 100644 Binary files a/.vs/Crunchyroll Downloader/v15/.suo and b/.vs/Crunchyroll Downloader/v15/.suo differ diff --git a/.vs/Crunchyroll Downloader/v15/Server/sqlite3/storage.ide-shm b/.vs/Crunchyroll Downloader/v15/Server/sqlite3/storage.ide-shm index 7fa7d86..37115db 100644 Binary files a/.vs/Crunchyroll Downloader/v15/Server/sqlite3/storage.ide-shm and b/.vs/Crunchyroll Downloader/v15/Server/sqlite3/storage.ide-shm differ diff --git a/.vs/Crunchyroll Downloader/v15/Server/sqlite3/storage.ide-wal b/.vs/Crunchyroll Downloader/v15/Server/sqlite3/storage.ide-wal index b73b1a0..d0b2868 100644 Binary files a/.vs/Crunchyroll Downloader/v15/Server/sqlite3/storage.ide-wal and b/.vs/Crunchyroll Downloader/v15/Server/sqlite3/storage.ide-wal differ diff --git a/Crunchyroll Downloader/ApplicationEvents.vb b/Crunchyroll Downloader/ApplicationEvents.vb index 5a29f00..04c7c18 100644 --- a/Crunchyroll Downloader/ApplicationEvents.vb +++ b/Crunchyroll Downloader/ApplicationEvents.vb @@ -34,7 +34,7 @@ Namespace My Try - Dim sUserAgent As String = "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:70.0) Gecko/20100101 Firefox/79.0" + Dim sUserAgent As String = "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:81.0) Gecko/20100101 Firefox/81.0" 'sUserAgent = "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/44.0.2403.157 Safari/537.36" 'MsgBox(Xpcom.XulRunnerVersion) diff --git a/Crunchyroll Downloader/CRD_List_Item.vb b/Crunchyroll Downloader/CRD_List_Item.vb index 8632303..457759a 100644 --- a/Crunchyroll Downloader/CRD_List_Item.vb +++ b/Crunchyroll Downloader/CRD_List_Item.vb @@ -338,9 +338,10 @@ Public Class CRD_List_Item If InStr(text, "RESOLUTION=") Then 'master m3u8 no fragments Dim new_m3u8_2() As String = text.Split(New String() {vbLf}, System.StringSplitOptions.RemoveEmptyEntries) If TargetReso = 42 Then + TargetReso = 1080 + End If - Else - For i As Integer = 0 To new_m3u8_2.Count - 1 + For i As Integer = 0 To new_m3u8_2.Count - 1 'MsgBox("x" + Main.Resu.ToString) If CBool(InStr(new_m3u8_2(i), "x" + TargetReso.ToString)) = True Then m3u8_url_1 = new_m3u8_2(i + 1) @@ -360,10 +361,9 @@ Public Class CRD_List_Item text = client0.DownloadString(m3u8_url_3) End If + + End If - - - End If Dim LoadedKeys As New List(Of String) LoadedKeys.Add("Nothing") Dim KeyFileCache As String = Nothing @@ -543,7 +543,7 @@ Public Class CRD_List_Item Dim exepath As String = Application.StartupPath + "\ffmpeg.exe" Dim startinfo As New System.Diagnostics.ProcessStartInfo - Dim cmd As String = "-allowed_extensions ALL " + DL_URL + " " + DL_Pfad '+ " " + ffmpeg_command + " " + DL_Pfad 'start ffmpeg with command strFFCMD string + Dim cmd As String = "-headers " + Chr(34) + "User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:81.0) Gecko/20100101 Firefox/81.0" + Chr(34) + " -allowed_extensions ALL " + DL_URL + " " + DL_Pfad '+ " " + ffmpeg_command + " " + DL_Pfad 'start ffmpeg with command strFFCMD string If Debug2 = True Then MsgBox(cmd) @@ -584,7 +584,7 @@ Public Class CRD_List_Item Dim exepath As String = Application.StartupPath + "\ffmpeg.exe" Dim startinfo As New System.Diagnostics.ProcessStartInfo - Dim cmd As String = DLCommand + " " + DL_Pfad 'start ffmpeg with command strFFCMD string + Dim cmd As String = "-headers " + Chr(34) + "User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:81.0) Gecko/20100101 Firefox/81.0" + Chr(34) + " " + DLCommand + " " + DL_Pfad 'start ffmpeg with command strFFCMD string If Debug2 = True Then MsgBox(cmd) @@ -736,7 +736,7 @@ Public Class CRD_List_Item 'MsgBox(BaseURL + SiteList(i) + vbNewLine + Pfad_DL + "\" + SiteList(i)) Dim iWert As Integer = i Using client As New WebClient() - client.Headers.Add("User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:70.0) Gecko/20100101 Firefox/79.0") + client.Headers.Add("User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:81.0) Gecko/20100101 Firefox/81.0") client.DownloadFile(BaseURL + SiteList(i), Pfad_DL + "\" + SiteList(i)) Pause(1) End Using diff --git a/Crunchyroll Downloader/GeckoFX.vb b/Crunchyroll Downloader/GeckoFX.vb index 020802f..341bc4c 100644 --- a/Crunchyroll Downloader/GeckoFX.vb +++ b/Crunchyroll Downloader/GeckoFX.vb @@ -26,28 +26,31 @@ Public Class GeckoFX Main.LoginOnly = "US_UnBlock" Else Try - Dim cookieGrapp As String = WebBrowser1.Document.Body.OuterHtml '.Replace(vbTab, "").Replace(" ", "") - If Main.Debug2 = True Then - MsgBox(cookieGrapp) - End If - Dim cookieGrapp2() As String = cookieGrapp.Split(New String() {""}, System.StringSplitOptions.RemoveEmptyEntries) - Dim cookieGrapp3() As String = cookieGrapp2(1).Split(New String() {""}, System.StringSplitOptions.RemoveEmptyEntries) - keks = cookieGrapp3(0) - If Main.Debug2 = True Then - MsgBox(keks) + + If CBool(InStr(WebBrowser1.Document.Uri, "https://api.crunchyroll.com/login.0.json")) Then + Main.LoginOnly = "US_UnBlock_Finsihed" + Else + Dim cookieGrapp As String = WebBrowser1.Document.Body.OuterHtml '.Replace(vbTab, "").Replace(" ", "") + If Main.Debug2 = True Then + MsgBox(cookieGrapp) + End If + Dim cookieGrapp2() As String = cookieGrapp.Split(New String() {""}, System.StringSplitOptions.RemoveEmptyEntries) + Dim cookieGrapp3() As String = cookieGrapp2(1).Split(New String() {""}, System.StringSplitOptions.RemoveEmptyEntries) + keks = cookieGrapp3(0) + If Main.Debug2 = True Then + MsgBox(keks) + End If + + WebBrowser1.Navigate("https://www.crunchyroll.com/logout") + Main.Pause(5) + WebBrowser1.Navigate("javascript:document.cookie =" + Chr(34) + "session_id=" + keks + "; expires=Thu, 04 Jan 2022 00:00:00 UTC; path=/;" + Chr(34) + ";") + Main.Pause(1) + WebBrowser1.Navigate("javascript:document.cookie =" + Chr(34) + "sess_id=" + keks + "; expires=Thu, 04 Jan 2022 00:00:00 UTC; path=/;" + Chr(34) + ";") + Main.Pause(1) + WebBrowser1.Navigate("https://www.crunchyroll.com/") + Main.LoginOnly = "US_UnBlock_Finsihed" End If - WebBrowser1.Navigate("https://www.crunchyroll.com/logout") - Main.Pause(5) - WebBrowser1.Navigate("javascript:document.cookie =" + Chr(34) + "session_id=" + keks + "; expires=Thu, 04 Jan 2022 00:00:00 UTC; path=/;" + Chr(34) + ";") - Main.Pause(1) - WebBrowser1.Navigate("javascript:document.cookie =" + Chr(34) + "sess_id=" + keks + "; expires=Thu, 04 Jan 2022 00:00:00 UTC; path=/;" + Chr(34) + ";") - Main.Pause(1) - If Main.LoginDialog = True Then - 'Login.ShowDialog() - Else - WebBrowser1.Navigate("https://www.crunchyroll.com/") - End If Catch ex As Exception MsgBox(ex.ToString) End Try diff --git a/Crunchyroll Downloader/Main.vb b/Crunchyroll Downloader/Main.vb index f19a41e..4e25110 100644 --- a/Crunchyroll Downloader/Main.vb +++ b/Crunchyroll Downloader/Main.vb @@ -346,7 +346,7 @@ Public Class Main Dim Thumbnail As Image = My.Resources.main_del Try Dim wc As New WebClient() - wc.Headers.Add("User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:70.0) Gecko/20100101 Firefox/79.0") + wc.Headers.Add("User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:81.0) Gecko/20100101 Firefox/81.0") Dim bytes As Byte() = wc.DownloadData(ThumbnialURL) Dim ms As New MemoryStream(bytes) Thumbnail = System.Drawing.Image.FromStream(ms) diff --git a/Crunchyroll Downloader/My Project/AssemblyInfo.vb b/Crunchyroll Downloader/My Project/AssemblyInfo.vb index 39914af..b233230 100644 --- a/Crunchyroll Downloader/My Project/AssemblyInfo.vb +++ b/Crunchyroll Downloader/My Project/AssemblyInfo.vb @@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/Crunchyroll Downloader/bin/x86/Debug/Crunchyroll Downloader.exe b/Crunchyroll Downloader/bin/x86/Debug/Crunchyroll Downloader.exe index 0eae055..9a66d26 100644 Binary files a/Crunchyroll Downloader/bin/x86/Debug/Crunchyroll Downloader.exe and b/Crunchyroll Downloader/bin/x86/Debug/Crunchyroll Downloader.exe differ diff --git a/Crunchyroll Downloader/bin/x86/Debug/Crunchyroll Downloader.pdb b/Crunchyroll Downloader/bin/x86/Debug/Crunchyroll Downloader.pdb index 579b25c..dee9b81 100644 Binary files a/Crunchyroll Downloader/bin/x86/Debug/Crunchyroll Downloader.pdb and b/Crunchyroll Downloader/bin/x86/Debug/Crunchyroll Downloader.pdb differ diff --git a/Crunchyroll Downloader/bin/x86/Debug/WebInterface/index - Kopie.html b/Crunchyroll Downloader/bin/x86/Debug/WebInterface/index - Kopie.html deleted file mode 100644 index f5e37f5..0000000 --- a/Crunchyroll Downloader/bin/x86/Debug/WebInterface/index - Kopie.html +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - CRD - - - -image error -Deutsch -
- -image error - -
- -RWBY
Staffel 2 Folge 4 5 - -
- -
- -
-Finished - 133,83MB -
-
-1080p - - image errorDeutsch - -
- -
- -
- -image error - - \ No newline at end of file diff --git a/Crunchyroll Downloader/bin/x86/Debug/WebInterface/index.html b/Crunchyroll Downloader/bin/x86/Debug/WebInterface/index.html index d5a2cd6..00ce397 100644 --- a/Crunchyroll Downloader/bin/x86/Debug/WebInterface/index.html +++ b/Crunchyroll Downloader/bin/x86/Debug/WebInterface/index.html @@ -27,7 +27,7 @@ .liClass{margin-bottom:8px} -Status: no video found +Crunchyroll Downloader image error