mirror of
https://github.com/hama3254/Crunchyroll-Downloader-v3.0.git
synced 2024-06-02 22:28:44 +02:00
fix funimation 403
-funimation 403 fix (user agent changed) - [Hybride Mode] cache extendet to merged subs
This commit is contained in:
hama3254
parent
57efa19966
commit
b41b783a99
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -124,11 +124,18 @@ Public Class CRD_List_Item
|
|||
End Sub
|
||||
#End Region
|
||||
Public Sub KillRunningTask()
|
||||
If proc.HasExited Then
|
||||
If HybridRunning = True Then
|
||||
Canceld = True
|
||||
Else
|
||||
proc.Kill()
|
||||
proc.WaitForExit(500)
|
||||
Label_percent.Text = "canceled -%"
|
||||
Try
|
||||
If proc.HasExited Then
|
||||
Else
|
||||
proc.Kill()
|
||||
proc.WaitForExit(500)
|
||||
Label_percent.Text = "canceled -%"
|
||||
End If
|
||||
Catch ex As Exception
|
||||
End Try
|
||||
End If
|
||||
End Sub
|
||||
|
||||
|
|
@ -324,7 +331,37 @@ Public Class CRD_List_Item
|
|||
HistoryDL_URL = DL_URL
|
||||
HistoryDL_Pfad = DL_Pfad
|
||||
HistoryFilename = Filename
|
||||
'MsgBox(DL_URL)
|
||||
Dim Folder As String = einstellungen.GeräteID()
|
||||
Dim Pfad2 As String = Path.GetDirectoryName(DL_Pfad.Replace(Chr(34), "")) + "\" + Folder + "\"
|
||||
If Not Directory.Exists(Path.GetDirectoryName(Pfad2)) Then
|
||||
' Nein! Jetzt erstellen...
|
||||
Try
|
||||
Directory.CreateDirectory(Path.GetDirectoryName(Pfad2))
|
||||
Catch ex As Exception
|
||||
MsgBox("Temp folder creation failed")
|
||||
Return Nothing
|
||||
Exit Function
|
||||
' Ordner wurde nich erstellt
|
||||
'Pfad2 = Pfad + "\" + CR_FilenName_Backup + ".mp4"
|
||||
End Try
|
||||
End If
|
||||
Dim MergeSub As String() = DL_URL.Split(New String() {"-i " + Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries)
|
||||
|
||||
If MergeSub.Count > 1 Then
|
||||
For i As Integer = 1 To MergeSub.Count - 1
|
||||
Dim SubsURL As String() = MergeSub(i).Split(New [Char]() {Chr(34)})
|
||||
Dim SubsClient As New WebClient
|
||||
SubsClient.Encoding = Encoding.UTF8
|
||||
If Main.WebbrowserCookie = Nothing Then
|
||||
Else
|
||||
SubsClient.Headers.Add(HttpRequestHeader.Cookie, Main.WebbrowserCookie)
|
||||
End If
|
||||
Dim SubsFile As String = einstellungen.GeräteID() + ".txt"
|
||||
SubsClient.DownloadFile(SubsURL(0), Pfad2 + "\" + SubsFile)
|
||||
DL_URL = DL_URL.Replace(SubsURL(0), Pfad2 + "\" + SubsFile)
|
||||
Next
|
||||
End If
|
||||
|
||||
Dim m3u8_url As String() = DL_URL.Split(New [Char]() {Chr(34)})
|
||||
Dim m3u8_url_1 As String = Nothing
|
||||
|
|
@ -373,26 +410,14 @@ Public Class CRD_List_Item
|
|||
Dim nummerint As Integer = 0 '-1
|
||||
Dim m3u8FFmpeg As String = Nothing
|
||||
Dim ts_dl As String = Nothing
|
||||
Dim Folder As String = einstellungen.GeräteID()
|
||||
Dim Pfad2 As String = Path.GetDirectoryName(DL_Pfad.Replace(Chr(34), "")) + "\" + Folder + "\"
|
||||
|
||||
HybridModePath = Pfad2
|
||||
'MsgBox(HybridModePath)
|
||||
If Debug2 = True Then
|
||||
MsgBox(Pfad2)
|
||||
End If
|
||||
Dim PauseTime As Integer = 0
|
||||
If Not Directory.Exists(Path.GetDirectoryName(Pfad2)) Then
|
||||
' Nein! Jetzt erstellen...
|
||||
Try
|
||||
Directory.CreateDirectory(Path.GetDirectoryName(Pfad2))
|
||||
Catch ex As Exception
|
||||
MsgBox("Temp folder creation failed")
|
||||
Return Nothing
|
||||
Exit Function
|
||||
' Ordner wurde nich erstellt
|
||||
'Pfad2 = Pfad + "\" + CR_FilenName_Backup + ".mp4"
|
||||
End Try
|
||||
End If
|
||||
|
||||
Dim di As New IO.DirectoryInfo(Pfad2)
|
||||
For i As Integer = 0 To textLenght.Length - 1
|
||||
If InStr(textLenght(i), ".ts") Then
|
||||
|
|
@ -543,8 +568,8 @@ Public Class CRD_List_Item
|
|||
Dim exepath As String = Application.StartupPath + "\ffmpeg.exe"
|
||||
Dim startinfo As New System.Diagnostics.ProcessStartInfo
|
||||
|
||||
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
|
||||
|
||||
Dim cmd As String = "-allowed_extensions ALL " + DL_URL + " " + DL_Pfad '+ " " + ffmpeg_command + " " + DL_Pfad 'start ffmpeg with command strFFCMD string
|
||||
' MsgBox(cmd) -headers " + Chr(34) + "User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:81.0) Gecko/20100101 Firefox/81.0" + Chr(34) +
|
||||
If Debug2 = True Then
|
||||
MsgBox(cmd)
|
||||
End If
|
||||
|
|
|
|||
|
|
@ -1531,7 +1531,7 @@ Public Class Main
|
|||
End If
|
||||
Pfad_DL = Pfad2
|
||||
Dim L1Name_Split As String() = WebbrowserURL.Split(New String() {"/"}, System.StringSplitOptions.RemoveEmptyEntries)
|
||||
Dim L1Name As String = L1Name_Split(1).Replace("www.", "")
|
||||
Dim L1Name As String = L1Name_Split(1).Replace("www.", "") + " | Dub : " + HardSubValuesToDisplay(Chr(34) + CR_Anime_Dub + Chr(34))
|
||||
Me.Invoke(New Action(Function()
|
||||
ListItemAdd(Pfad_DL, L1Name, L2Name, ResoHTMLDisplay, Subsprache3, SubValuesToDisplay(), thumbnail3, URL_DL, Pfad_DL)
|
||||
Return Nothing
|
||||
|
|
@ -2395,7 +2395,7 @@ Public Class Main
|
|||
'Funimation_m3u8_final = "-i " + Chr(34) + Funimation_m3u8_final + Chr(34) + DubMetatata + " " + ffmpeg_command
|
||||
End If
|
||||
|
||||
Dim SoftSubMergeURLs As String = " -i " + Chr(34) + UsedSub + Chr(34)
|
||||
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
|
||||
|
|
|
|||
|
|
@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices
|
|||
' übernehmen, indem Sie "*" eingeben:
|
||||
' <Assembly: AssemblyVersion("1.0.*")>
|
||||
|
||||
<Assembly: AssemblyVersion("3.5.5")>
|
||||
<Assembly: AssemblyFileVersion("3.5.5")>
|
||||
<Assembly: AssemblyVersion("3.5.6")>
|
||||
<Assembly: AssemblyFileVersion("3.5.6")>
|
||||
<Assembly: NeutralResourcesLanguage("en")>
|
||||
|
|
|
|||
|
|
@ -303,6 +303,15 @@ Namespace My.Resources
|
|||
End Get
|
||||
End Property
|
||||
|
||||
'''<summary>
|
||||
''' Sucht eine lokalisierte Zeichenfolge, die "User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:81.0) Gecko/20100101 Firefox/81.0" ähnelt.
|
||||
'''</summary>
|
||||
Friend ReadOnly Property ffmpeg_user_agend() As String
|
||||
Get
|
||||
Return ResourceManager.GetString("ffmpeg_user_agend", resourceCulture)
|
||||
End Get
|
||||
End Property
|
||||
|
||||
'''<summary>
|
||||
''' Sucht eine lokalisierte Zeichenfolge, die src="/player/ ähnelt.
|
||||
'''</summary>
|
||||
|
|
|
|||
|
|
@ -473,4 +473,7 @@ I delete the curremt session with the unlock, if you want to be logged in with t
|
|||
<value><a class="main_titel">Placeholder</a>
|
||||
<img alt="image error" src="balken.png" class="class-balken"></value>
|
||||
</data>
|
||||
<data name="ffmpeg_user_agend" xml:space="preserve">
|
||||
<value>"User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:81.0) Gecko/20100101 Firefox/81.0"</value>
|
||||
</data>
|
||||
</root>
|
||||
Binary file not shown.
Binary file not shown.
|
|
@ -150,6 +150,11 @@ Crunchyroll Downloader
|
|||
</body></html> ähnelt.
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:Crunchyroll_Downloader.My.Resources.Resources.ffmpeg_user_agend">
|
||||
<summary>
|
||||
Sucht eine lokalisierte Zeichenfolge, die "User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:81.0) Gecko/20100101 Firefox/81.0" ähnelt.
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:Crunchyroll_Downloader.My.Resources.Resources.Funimation_Player_ID">
|
||||
<summary>
|
||||
Sucht eine lokalisierte Zeichenfolge, die src="/player/ ähnelt.
|
||||
|
|
|
|||
|
|
@ -0,0 +1,22 @@
|
|||
Operating System: Microsoft Windows 10 Pro
|
||||
|
||||
Crunchyroll URL: http://www.crunchyroll.com/de/rwby/episode-45-world-of-remnant-1-dust-658499
|
||||
|
||||
subtitle language: None
|
||||
|
||||
video resolution: 360
|
||||
|
||||
error message: System.InvalidCastException: Ungültige Konvertierung von der Zeichenfolge enUS in Typ Integer. ---> System.FormatException: Die Eingabezeichenfolge hat das falsche Format.
|
||||
bei Microsoft.VisualBasic.CompilerServices.Conversions.ParseDouble(String Value, NumberFormatInfo NumberFormat)
|
||||
bei Microsoft.VisualBasic.CompilerServices.Conversions.ToInteger(String Value)
|
||||
--- Ende der internen Ausnahmestapelüberwachung ---
|
||||
bei Microsoft.VisualBasic.CompilerServices.Conversions.ToInteger(String Value)
|
||||
bei Crunchyroll_Downloader.Main.GrappURL() in D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.0\Crunchyroll Downloader\Main.vb:Zeile 1534.
|
||||
bei Microsoft.VisualBasic.CompilerServices.Conversions.ToInteger(String Value)
|
||||
bei Crunchyroll_Downloader.Main.GrappURL() in D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.0\Crunchyroll Downloader\Main.vb:Zeile 1534.
|
||||
|
||||
softsubs enabled?: System.Collections.Generic.List`1[System.String]
|
||||
|
||||
Crunchyroll Downloader Version: 3.5.6
|
||||
|
||||
detected location from Crunchyroll: at
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -150,6 +150,11 @@ Crunchyroll Downloader
|
|||
</body></html> ähnelt.
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:Crunchyroll_Downloader.My.Resources.Resources.ffmpeg_user_agend">
|
||||
<summary>
|
||||
Sucht eine lokalisierte Zeichenfolge, die "User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:81.0) Gecko/20100101 Firefox/81.0" ähnelt.
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:Crunchyroll_Downloader.My.Resources.Resources.Funimation_Player_ID">
|
||||
<summary>
|
||||
Sucht eine lokalisierte Zeichenfolge, die src="/player/ ähnelt.
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue
Block a user