diff --git a/.gitignore b/.gitignore index 72e06b7..e2fc9c7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ Crunchyroll Downloader/bin/x86/Debug/Crunchyroll-Downloader-v3.0.zip +*.zip diff --git a/.vs/Crunchyroll Downloader/v15/.suo b/.vs/Crunchyroll Downloader/v15/.suo index 4b842b6..a4559d9 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 9bae549..dbfd00b 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 ec6c2a6..be40b82 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/Main.vb b/Crunchyroll Downloader/Main.vb index 9c3cf74..19927bb 100644 --- a/Crunchyroll Downloader/Main.vb +++ b/Crunchyroll Downloader/Main.vb @@ -1128,105 +1128,103 @@ Public Class Main End Sub Sub TestOutput(ByVal sender As Object, ByVal e As DataReceivedEventArgs) - If Thumbnail = Nothing Then - Thumbnail = e.Data - Else - Thumbnail = Thumbnail + vbNewLine + e.Data - End If + Try + Dim pr As Process = sender + Dim FileNameSplit As String() = pr.StartInfo.Arguments.ToString().Split(New String() {Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries) + Dim FileName As String = Chr(34) + FileNameSplit(FileNameSplit.Count - 1) + Chr(34) + If CBool(InStr(e.Data, "Stream #")) And CBool(InStr(e.Data, "Video")) = True Then + 'MsgBox(True.ToString + vbNewLine + e.Data) + ListOfStreams.Add(e.Data) + End If + If InStr(e.Data, "Stream #") And InStr(e.Data, " -> ") Then + 'UsesStreams.Add(e.Data) + 'MsgBox(e.Data) + Dim StreamSearch() As String = e.Data.Split(New String() {" -> "}, System.StringSplitOptions.RemoveEmptyEntries) + Dim StreamSearch2 As String = StreamSearch(0) + ":" + For i As Integer = 0 To ListOfStreams.Count - 1 + If CBool(InStr(ListOfStreams(i), StreamSearch2)) Then 'And CBool(InStr(ListOfStreams(i), " Video:")) Then + 'MsgBox(ListOfStreams(i)) + Dim ResoSearch() As String = ListOfStreams(i).Split(New String() {"x"}, System.StringSplitOptions.RemoveEmptyEntries) + 'MsgBox(ResoSearch(1)) + If CBool(InStr(ResoSearch(2), " [")) = True Then + Dim ResoSearch2() As String = ResoSearch(2).Split(New String() {" ["}, System.StringSplitOptions.RemoveEmptyEntries) + For ii As Integer = 0 To PB_list.Count - 1 + If PB_list(ii).Name = FileName Then + Dim p As PictureBox = PB_list(ii) + p.Image = p.BackgroundImage + Dim g As Graphics = Graphics.FromImage(p.Image) + Dim TextPointL4 As Point = New Point(195, 101) + Dim Weiß As Brush = New SolidBrush(Color.FromArgb(242, 242, 242)) + g.FillRectangle(Weiß, TextPointL4.X - 3, TextPointL4.Y - 3, 70, 30) + g.DrawString(ResoSearch2(0) + "p", FontLabel.Font, Brushes.Black, TextPointL4) + Dim brGradient As Brush = New SolidBrush(Color.FromArgb(125, 0, 0)) + g.Dispose() + Exit For + End If + Next + End If - Dim pr As Process = sender - Dim FileNameSplit As String() = pr.StartInfo.Arguments.ToString().Split(New String() {Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries) - Dim FileName As String = Chr(34) + FileNameSplit(FileNameSplit.Count - 1) + Chr(34) - If CBool(InStr(e.Data, "Stream #")) And CBool(InStr(e.Data, "Video")) = True Then - 'MsgBox(True.ToString + vbNewLine + e.Data) - ListOfStreams.Add(e.Data) - End If - If InStr(e.Data, "Stream #") And InStr(e.Data, " -> ") Then - 'UsesStreams.Add(e.Data) - 'MsgBox(e.Data) - Dim StreamSearch() As String = e.Data.Split(New String() {" -> "}, System.StringSplitOptions.RemoveEmptyEntries) - Dim StreamSearch2 As String = StreamSearch(0) + ":" - For i As Integer = 0 To ListOfStreams.Count - 1 - If CBool(InStr(ListOfStreams(i), StreamSearch2)) Then 'And CBool(InStr(ListOfStreams(i), " Video:")) Then - 'MsgBox(ListOfStreams(i)) - Dim ResoSearch() As String = ListOfStreams(i).Split(New String() {"x"}, System.StringSplitOptions.RemoveEmptyEntries) - 'MsgBox(ResoSearch(1)) - If CBool(InStr(ResoSearch(2), " [")) = True Then - Dim ResoSearch2() As String = ResoSearch(2).Split(New String() {" ["}, System.StringSplitOptions.RemoveEmptyEntries) - For ii As Integer = 0 To PB_list.Count - 1 - If PB_list(ii).Name = FileName Then - Dim p As PictureBox = PB_list(ii) - p.Image = p.BackgroundImage - Dim g As Graphics = Graphics.FromImage(p.Image) - Dim TextPointL4 As Point = New Point(195, 101) - Dim Weiß As Brush = New SolidBrush(Color.FromArgb(242, 242, 242)) - g.FillRectangle(Weiß, TextPointL4.X - 3, TextPointL4.Y - 3, 70, 30) - g.DrawString(ResoSearch2(0) + "p", FontLabel.Font, Brushes.Black, TextPointL4) - Dim brGradient As Brush = New SolidBrush(Color.FromArgb(125, 0, 0)) - g.Dispose() - Exit For - End If - Next End If - - End If - Next - End If + Next + End If - If Me.Visible = False Or AbourtList.Contains(FileName) Then - ' Try - pr.Kill() - pr.WaitForExit(500) - 'Catch ex As Exception - 'End Try - RaiseEvent UpdateUI(FileName, 200, 0, 0) - End If - Me.Invoke(New Action(Function() - For i As Integer = 0 To PB_list.Count - 1 + If Me.Visible = False Or AbourtList.Contains(FileName) Then + ' Try + pr.Kill() + pr.WaitForExit(500) + 'Catch ex As Exception + 'End Try + RaiseEvent UpdateUI(FileName, 200, 0, 0) + End If + Me.Invoke(New Action(Function() + For i As Integer = 0 To PB_list.Count - 1 - If PB_list(i).Name = FileName Then + If PB_list(i).Name = FileName Then - If InStr(e.Data, "Duration: ") Then - Dim ZeitGesamt As String() = e.Data.Split(New String() {"Duration: "}, System.StringSplitOptions.RemoveEmptyEntries) - Dim ZeitGesamt2 As String() = ZeitGesamt(1).Split(New [Char]() {System.Convert.ToChar(".")}) - Dim ZeitGesamtSplit() As String = ZeitGesamt2(0).Split(New [Char]() {System.Convert.ToChar(":")}) - Dim ZeitGesamtInteger As Integer = CInt(ZeitGesamtSplit(0)) * 3600 + CInt(ZeitGesamtSplit(1)) * 60 + CInt(ZeitGesamtSplit(2)) + If InStr(e.Data, "Duration: ") Then + Dim ZeitGesamt As String() = e.Data.Split(New String() {"Duration: "}, System.StringSplitOptions.RemoveEmptyEntries) + Dim ZeitGesamt2 As String() = ZeitGesamt(1).Split(New [Char]() {System.Convert.ToChar(".")}) + Dim ZeitGesamtSplit() As String = ZeitGesamt2(0).Split(New [Char]() {System.Convert.ToChar(":")}) + Dim ZeitGesamtInteger As Integer = CInt(ZeitGesamtSplit(0)) * 3600 + CInt(ZeitGesamtSplit(1)) * 60 + CInt(ZeitGesamtSplit(2)) - ListView1.Items.Item(i).Text = ZeitGesamtInteger + ListView1.Items.Item(i).Text = ZeitGesamtInteger - ElseIf InStr(e.Data, " time=") Then - 'MsgBox(e.Data) - Dim ZeitFertig As String() = e.Data.Split(New String() {" time="}, System.StringSplitOptions.RemoveEmptyEntries) - Dim ZeitFertig2 As String() = ZeitFertig(1).Split(New [Char]() {System.Convert.ToChar(".")}) - Dim ZeitFertigSplit() As String = ZeitFertig2(0).Split(New [Char]() {System.Convert.ToChar(":")}) - Dim ZeitFertigInteger As Integer = CInt(ZeitFertigSplit(0)) * 3600 + CInt(ZeitFertigSplit(1)) * 60 + CInt(ZeitFertigSplit(2)) - Dim bitrate3 As String = 0 - If InStr(e.Data, "bitrate=") Then - Dim bitrate As String() = e.Data.Split(New String() {"bitrate="}, System.StringSplitOptions.RemoveEmptyEntries) - Dim bitrate2 As String() = bitrate(1).Split(New String() {"kbits/s"}, System.StringSplitOptions.RemoveEmptyEntries) + ElseIf InStr(e.Data, " time=") Then + 'MsgBox(e.Data) + Dim ZeitFertig As String() = e.Data.Split(New String() {" time="}, System.StringSplitOptions.RemoveEmptyEntries) + Dim ZeitFertig2 As String() = ZeitFertig(1).Split(New [Char]() {System.Convert.ToChar(".")}) + Dim ZeitFertigSplit() As String = ZeitFertig2(0).Split(New [Char]() {System.Convert.ToChar(":")}) + Dim ZeitFertigInteger As Integer = CInt(ZeitFertigSplit(0)) * 3600 + CInt(ZeitFertigSplit(1)) * 60 + CInt(ZeitFertigSplit(2)) + Dim bitrate3 As String = 0 + If InStr(e.Data, "bitrate=") Then + Dim bitrate As String() = e.Data.Split(New String() {"bitrate="}, System.StringSplitOptions.RemoveEmptyEntries) + Dim bitrate2 As String() = bitrate(1).Split(New String() {"kbits/s"}, System.StringSplitOptions.RemoveEmptyEntries) - If InStr(bitrate2(0), ".") Then - Dim bitrateTemo As String() = bitrate2(0).Split(New String() {"."}, System.StringSplitOptions.RemoveEmptyEntries) - bitrate3 = bitrateTemo(0) - ElseIf InStr(bitrate2(0), ",") Then - Dim bitrateTemo As String() = bitrate2(0).Split(New String() {","}, System.StringSplitOptions.RemoveEmptyEntries) - bitrate3 = bitrateTemo(0) + If InStr(bitrate2(0), ".") Then + Dim bitrateTemo As String() = bitrate2(0).Split(New String() {"."}, System.StringSplitOptions.RemoveEmptyEntries) + bitrate3 = bitrateTemo(0) + ElseIf InStr(bitrate2(0), ",") Then + Dim bitrateTemo As String() = bitrate2(0).Split(New String() {","}, System.StringSplitOptions.RemoveEmptyEntries) + bitrate3 = bitrateTemo(0) + End If End If + Dim bitrateInt As Double = CInt(bitrate3) / 1024 + Dim FileSize As Double = CInt(ListView1.Items.Item(i).Text) * bitrateInt / 8 + Dim DownloadFinished As Double = ZeitFertigInteger * bitrateInt / 8 + Dim percent As Integer = ZeitFertigInteger / CInt(ListView1.Items.Item(i).Text) * 100 + RaiseEvent UpdateUI(FileName, percent, Math.Round(DownloadFinished, 2, MidpointRounding.AwayFromZero), Math.Round(FileSize, 2, MidpointRounding.AwayFromZero)) End If - Dim bitrateInt As Double = CInt(bitrate3) / 1024 - Dim FileSize As Double = CInt(ListView1.Items.Item(i).Text) * bitrateInt / 8 - Dim DownloadFinished As Double = ZeitFertigInteger * bitrateInt / 8 - Dim percent As Integer = ZeitFertigInteger / CInt(ListView1.Items.Item(i).Text) * 100 - RaiseEvent UpdateUI(FileName, percent, Math.Round(DownloadFinished, 2, MidpointRounding.AwayFromZero), Math.Round(FileSize, 2, MidpointRounding.AwayFromZero)) End If - End If - Next + Next - Return Nothing - End Function)) + Return Nothing + End Function)) + Catch ex As Exception + + End Try End Sub diff --git a/Crunchyroll Downloader/My Project/AssemblyInfo.vb b/Crunchyroll Downloader/My Project/AssemblyInfo.vb index 2928e03..727b786 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 f51334c..548bc3f 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 02f96a4..b790ac5 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/Crunchyroll-Downloader v3.1.2.zip b/Crunchyroll Downloader/bin/x86/Debug/Crunchyroll-Downloader v3.1.2.zip deleted file mode 100644 index cc3ca1a..0000000 Binary files a/Crunchyroll Downloader/bin/x86/Debug/Crunchyroll-Downloader v3.1.2.zip and /dev/null differ diff --git a/Crunchyroll Downloader/bin/x86/Debug/log.txt-main.16308 b/Crunchyroll Downloader/bin/x86/Debug/log.txt-main.16308 deleted file mode 100644 index 421c433..0000000 Binary files a/Crunchyroll Downloader/bin/x86/Debug/log.txt-main.16308 and /dev/null differ diff --git a/Crunchyroll Downloader/bin/x86/Release/Crunchyroll Downloader.exe b/Crunchyroll Downloader/bin/x86/Release/Crunchyroll Downloader.exe index 28d7098..92f30c1 100644 Binary files a/Crunchyroll Downloader/bin/x86/Release/Crunchyroll Downloader.exe and b/Crunchyroll Downloader/bin/x86/Release/Crunchyroll Downloader.exe differ diff --git a/Crunchyroll Downloader/bin/x86/Release/Crunchyroll Downloader.pdb b/Crunchyroll Downloader/bin/x86/Release/Crunchyroll Downloader.pdb index f65871e..1902510 100644 Binary files a/Crunchyroll Downloader/bin/x86/Release/Crunchyroll Downloader.pdb and b/Crunchyroll Downloader/bin/x86/Release/Crunchyroll Downloader.pdb differ diff --git a/Crunchyroll Downloader/bin/x86/Release/Crunchyroll-Downloader v3.1.1.zip b/Crunchyroll Downloader/bin/x86/Release/Crunchyroll-Downloader v3.1.1.zip deleted file mode 100644 index 2c204e7..0000000 Binary files a/Crunchyroll Downloader/bin/x86/Release/Crunchyroll-Downloader v3.1.1.zip and /dev/null differ diff --git a/Crunchyroll Downloader/bin/x86/Release/log.txt-main.2940 b/Crunchyroll Downloader/bin/x86/Release/log.txt-main.2940 deleted file mode 100644 index 03ca89e..0000000 Binary files a/Crunchyroll Downloader/bin/x86/Release/log.txt-main.2940 and /dev/null differ diff --git a/Crunchyroll Downloader/einstellungen.vb b/Crunchyroll Downloader/einstellungen.vb index 9c4752a..b68b86e 100644 --- a/Crunchyroll Downloader/einstellungen.vb +++ b/Crunchyroll Downloader/einstellungen.vb @@ -206,16 +206,12 @@ Public Class einstellungen Main.LoginOnly = "US_UnBlock" Dim wb As New WebClient - - Dim Session As String = wb.DownloadString("http://api-manga.crunchyroll.com/cr_start_session?api_ver=1.0&device_type=com.crunchyroll.windows.desktop&access_token=LNDJgOit5yaRIWN&device_id=" + GeräteID()) - + Dim Session As String = wb.DownloadString("https://api1.cr-unblocker.com/getsession.php?version=1.1&device_type=com.crunchyroll.windows.desktop&access_token=LNDJgOit5yaRIWN&device_id=" + GeräteID()) + 'MsgBox(Session) If CBool(InStr(Session, "bad_request")) Then - Session = wb.DownloadString("http://api-manga.crunchyroll.com/cr_start_session?api_ver=1.0&device_type=com.crunchyroll.iphone&access_token=QWjz212GspMHH9h&device_id=" + GeräteID()) + Session = wb.DownloadString("https://api2.cr-unblocker.com/start_session?version=1.1&device_type=com.crunchyroll.iphone&access_token=QWjz212GspMHH9h&device_id=" + GeräteID()) End If - If CBool(InStr(Session, "bad_request")) Then - Session = wb.DownloadString("http://api-manga.crunchyroll.com/cr_start_session?api_ver=1.0&device_type=com.crunchyroll.manga.android&access_token=FLpcfZH4CbW4muO&device_id=" + GeräteID()) - End If If CBool(InStr(Session, "bad_request")) Then MsgBox(Main.CR_Unlock_Error_String, MsgBoxStyle.OkOnly) @@ -223,6 +219,9 @@ Public Class einstellungen ElseIf CBool(InStr(Session, "Unauthenticated request")) Then MsgBox(Main.CR_Unlock_Error_String, MsgBoxStyle.OkOnly) Exit Sub + ElseIf CBool(InStr(Session, chr(34) + "country_code" + chr(34) + ":" + chr(34) + "US" + chr(34))) = False Then + MsgBox(Main.CR_Unlock_Error_String, MsgBoxStyle.OkOnly) + Exit Sub Else 'MsgBox(Session) GeckoFX.Show() diff --git a/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.exe b/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.exe index f51334c..548bc3f 100644 Binary files a/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.exe and b/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.exe differ diff --git a/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.pdb b/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.pdb index 02f96a4..b790ac5 100644 Binary files a/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.pdb and b/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.pdb differ diff --git a/Crunchyroll Downloader/obj/x86/Release/Crunchyroll Downloader.exe b/Crunchyroll Downloader/obj/x86/Release/Crunchyroll Downloader.exe index 28d7098..92f30c1 100644 Binary files a/Crunchyroll Downloader/obj/x86/Release/Crunchyroll Downloader.exe and b/Crunchyroll Downloader/obj/x86/Release/Crunchyroll Downloader.exe differ diff --git a/Crunchyroll Downloader/obj/x86/Release/Crunchyroll Downloader.pdb b/Crunchyroll Downloader/obj/x86/Release/Crunchyroll Downloader.pdb index f65871e..1902510 100644 Binary files a/Crunchyroll Downloader/obj/x86/Release/Crunchyroll Downloader.pdb and b/Crunchyroll Downloader/obj/x86/Release/Crunchyroll Downloader.pdb differ diff --git a/Crunchyroll Downloader/obj/x86/Release/Crunchyroll Downloader.vbproj.GenerateResource.cache b/Crunchyroll Downloader/obj/x86/Release/Crunchyroll Downloader.vbproj.GenerateResource.cache index 958d2b0..820e78d 100644 Binary files a/Crunchyroll Downloader/obj/x86/Release/Crunchyroll Downloader.vbproj.GenerateResource.cache and b/Crunchyroll Downloader/obj/x86/Release/Crunchyroll Downloader.vbproj.GenerateResource.cache differ diff --git a/Crunchyroll Downloader/obj/x86/Release/Crunchyroll_Downloader.Resources.resources b/Crunchyroll Downloader/obj/x86/Release/Crunchyroll_Downloader.Resources.resources index 3708bf8..22486b2 100644 Binary files a/Crunchyroll Downloader/obj/x86/Release/Crunchyroll_Downloader.Resources.resources and b/Crunchyroll Downloader/obj/x86/Release/Crunchyroll_Downloader.Resources.resources differ