mirror of
https://github.com/hama3254/Crunchyroll-Downloader-v3.0.git
synced 2024-12-24 23:21:49 +01:00
fix us unblock
fix us unblock
This commit is contained in:
hama3254
parent
7c3502aeb0
commit
29fe55aa06
1
.gitignore
vendored
1
.gitignore
vendored
@ -1,2 +1,3 @@
|
|||||||
|
|
||||||
Crunchyroll Downloader/bin/x86/Debug/Crunchyroll-Downloader-v3.0.zip
|
Crunchyroll Downloader/bin/x86/Debug/Crunchyroll-Downloader-v3.0.zip
|
||||||
|
*.zip
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1128,105 +1128,103 @@ Public Class Main
|
|||||||
End Sub
|
End Sub
|
||||||
|
|
||||||
Sub TestOutput(ByVal sender As Object, ByVal e As DataReceivedEventArgs)
|
Sub TestOutput(ByVal sender As Object, ByVal e As DataReceivedEventArgs)
|
||||||
If Thumbnail = Nothing Then
|
Try
|
||||||
Thumbnail = e.Data
|
Dim pr As Process = sender
|
||||||
Else
|
Dim FileNameSplit As String() = pr.StartInfo.Arguments.ToString().Split(New String() {Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries)
|
||||||
Thumbnail = Thumbnail + vbNewLine + e.Data
|
Dim FileName As String = Chr(34) + FileNameSplit(FileNameSplit.Count - 1) + Chr(34)
|
||||||
End If
|
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
|
End If
|
||||||
Next
|
|
||||||
End If
|
|
||||||
|
|
||||||
|
|
||||||
If Me.Visible = False Or AbourtList.Contains(FileName) Then
|
If Me.Visible = False Or AbourtList.Contains(FileName) Then
|
||||||
' Try
|
' Try
|
||||||
pr.Kill()
|
pr.Kill()
|
||||||
pr.WaitForExit(500)
|
pr.WaitForExit(500)
|
||||||
'Catch ex As Exception
|
'Catch ex As Exception
|
||||||
'End Try
|
'End Try
|
||||||
RaiseEvent UpdateUI(FileName, 200, 0, 0)
|
RaiseEvent UpdateUI(FileName, 200, 0, 0)
|
||||||
End If
|
End If
|
||||||
Me.Invoke(New Action(Function()
|
Me.Invoke(New Action(Function()
|
||||||
For i As Integer = 0 To PB_list.Count - 1
|
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
|
If InStr(e.Data, "Duration: ") Then
|
||||||
Dim ZeitGesamt As String() = e.Data.Split(New String() {"Duration: "}, System.StringSplitOptions.RemoveEmptyEntries)
|
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 ZeitGesamt2 As String() = ZeitGesamt(1).Split(New [Char]() {System.Convert.ToChar(".")})
|
||||||
Dim ZeitGesamtSplit() As String = ZeitGesamt2(0).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))
|
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
|
ElseIf InStr(e.Data, " time=") Then
|
||||||
'MsgBox(e.Data)
|
'MsgBox(e.Data)
|
||||||
Dim ZeitFertig As String() = e.Data.Split(New String() {" time="}, System.StringSplitOptions.RemoveEmptyEntries)
|
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 ZeitFertig2 As String() = ZeitFertig(1).Split(New [Char]() {System.Convert.ToChar(".")})
|
||||||
Dim ZeitFertigSplit() As String = ZeitFertig2(0).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 ZeitFertigInteger As Integer = CInt(ZeitFertigSplit(0)) * 3600 + CInt(ZeitFertigSplit(1)) * 60 + CInt(ZeitFertigSplit(2))
|
||||||
Dim bitrate3 As String = 0
|
Dim bitrate3 As String = 0
|
||||||
If InStr(e.Data, "bitrate=") Then
|
If InStr(e.Data, "bitrate=") Then
|
||||||
Dim bitrate As String() = e.Data.Split(New String() {"bitrate="}, System.StringSplitOptions.RemoveEmptyEntries)
|
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)
|
Dim bitrate2 As String() = bitrate(1).Split(New String() {"kbits/s"}, System.StringSplitOptions.RemoveEmptyEntries)
|
||||||
|
|
||||||
If InStr(bitrate2(0), ".") Then
|
If InStr(bitrate2(0), ".") Then
|
||||||
Dim bitrateTemo As String() = bitrate2(0).Split(New String() {"."}, System.StringSplitOptions.RemoveEmptyEntries)
|
Dim bitrateTemo As String() = bitrate2(0).Split(New String() {"."}, System.StringSplitOptions.RemoveEmptyEntries)
|
||||||
bitrate3 = bitrateTemo(0)
|
bitrate3 = bitrateTemo(0)
|
||||||
ElseIf InStr(bitrate2(0), ",") Then
|
ElseIf InStr(bitrate2(0), ",") Then
|
||||||
Dim bitrateTemo As String() = bitrate2(0).Split(New String() {","}, System.StringSplitOptions.RemoveEmptyEntries)
|
Dim bitrateTemo As String() = bitrate2(0).Split(New String() {","}, System.StringSplitOptions.RemoveEmptyEntries)
|
||||||
bitrate3 = bitrateTemo(0)
|
bitrate3 = bitrateTemo(0)
|
||||||
|
End If
|
||||||
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
|
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
|
||||||
End If
|
|
||||||
|
|
||||||
Next
|
Next
|
||||||
|
|
||||||
Return Nothing
|
Return Nothing
|
||||||
End Function))
|
End Function))
|
||||||
|
Catch ex As Exception
|
||||||
|
|
||||||
|
End Try
|
||||||
|
|
||||||
End Sub
|
End Sub
|
||||||
|
|
||||||
|
|||||||
@ -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.1.2")>
|
<Assembly: AssemblyVersion("3.1.3")>
|
||||||
<Assembly: AssemblyFileVersion("3.1.2")>
|
<Assembly: AssemblyFileVersion("3.1.3")>
|
||||||
<Assembly: NeutralResourcesLanguage("")>
|
<Assembly: NeutralResourcesLanguage("")>
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -206,16 +206,12 @@ Public Class einstellungen
|
|||||||
|
|
||||||
Main.LoginOnly = "US_UnBlock"
|
Main.LoginOnly = "US_UnBlock"
|
||||||
Dim wb As New WebClient
|
Dim wb As New WebClient
|
||||||
|
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())
|
||||||
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())
|
'MsgBox(Session)
|
||||||
|
|
||||||
If CBool(InStr(Session, "bad_request")) Then
|
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
|
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
|
If CBool(InStr(Session, "bad_request")) Then
|
||||||
MsgBox(Main.CR_Unlock_Error_String, MsgBoxStyle.OkOnly)
|
MsgBox(Main.CR_Unlock_Error_String, MsgBoxStyle.OkOnly)
|
||||||
@ -223,6 +219,9 @@ Public Class einstellungen
|
|||||||
ElseIf CBool(InStr(Session, "Unauthenticated request")) Then
|
ElseIf CBool(InStr(Session, "Unauthenticated request")) Then
|
||||||
MsgBox(Main.CR_Unlock_Error_String, MsgBoxStyle.OkOnly)
|
MsgBox(Main.CR_Unlock_Error_String, MsgBoxStyle.OkOnly)
|
||||||
Exit Sub
|
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
|
Else
|
||||||
'MsgBox(Session)
|
'MsgBox(Session)
|
||||||
GeckoFX.Show()
|
GeckoFX.Show()
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue
Block a user