fix keyframe usage as download url

fix keyframe usage as download url
This commit is contained in:
hama3254 2021-11-19 16:53:12 +01:00
parent a612282220
commit e688d8fe00
10 changed files with 116 additions and 103 deletions

Binary file not shown.

View File

@ -5131,6 +5131,7 @@ Public Class Main
If My.Computer.FileSystem.FileExists(Pfad5) Then 'Pfad = Kompeltter Pfad mit Dateinamen + ENdung If My.Computer.FileSystem.FileExists(Pfad5) Then 'Pfad = Kompeltter Pfad mit Dateinamen + ENdung
Me.Invoke(New Action(Function() As Object Me.Invoke(New Action(Function() As Object
Me.Text = "Status: File already exists." Me.Text = "Status: File already exists."
Anime_Add.StatusLabel.Text = "Status: File already exists."
Me.Invalidate() Me.Invalidate()
Return Nothing Return Nothing
End Function)) End Function))
@ -5140,6 +5141,7 @@ Public Class Main
My.Computer.FileSystem.DeleteFile(Pfad5) My.Computer.FileSystem.DeleteFile(Pfad5)
Me.Invoke(New Action(Function() As Object Me.Invoke(New Action(Function() As Object
Me.Text = "Status: Old file overwritten." Me.Text = "Status: Old file overwritten."
Anime_Add.StatusLabel.Text = "Status: Old file overwritten."
Me.Invalidate() Me.Invalidate()
Return Nothing Return Nothing
End Function)) End Function))
@ -5149,6 +5151,7 @@ Public Class Main
Else Else
Me.Invoke(New Action(Function() As Object Me.Invoke(New Action(Function() As Object
Me.Text = "Crunchyroll Downloader" Me.Text = "Crunchyroll Downloader"
Anime_Add.StatusLabel.Text = "idle"
Me.Invalidate() Me.Invalidate()
Return Nothing Return Nothing
End Function)) End Function))
@ -5415,6 +5418,7 @@ Public Class Main
End If End If
Me.Invoke(New Action(Function() As Object Me.Invoke(New Action(Function() As Object
Me.Text = "Status: Video found!" Me.Text = "Status: Video found!"
Anime_Add.StatusLabel.Text = "Status: Video found!"
Me.Invalidate() Me.Invalidate()
Return Nothing Return Nothing
End Function)) End Function))
@ -5479,7 +5483,7 @@ Public Class Main
Catch ex As Exception Catch ex As Exception
Debug.WriteLine(keyfileurl3 + vbNewLine + vbNewLine + ex.ToString) Debug.WriteLine(keyfileurl3 + vbNewLine + vbNewLine + ex.ToString)
End Try End Try
ElseIf CBool(InStr(Streams(i), ResoFunBackup)) Then ElseIf CBool(InStr(Streams(i), ResoFunBackup)) And FunimationBackupm3u8 = Nothing Then
Dim Streams2() As String = Streams(i).Split(New String() {"https://"}, System.StringSplitOptions.RemoveEmptyEntries) Dim Streams2() As String = Streams(i).Split(New String() {"https://"}, System.StringSplitOptions.RemoveEmptyEntries)
Dim Streams3() As String = Streams2(1).Split(New String() {"#EXT-"}, System.StringSplitOptions.RemoveEmptyEntries) Dim Streams3() As String = Streams2(1).Split(New String() {"#EXT-"}, System.StringSplitOptions.RemoveEmptyEntries)
Dim StreamURL As String = "https://" + Streams3(0).Trim Dim StreamURL As String = "https://" + Streams3(0).Trim
@ -5530,6 +5534,7 @@ Public Class Main
Me.Invoke(New Action(Function() As Object Me.Invoke(New Action(Function() As Object
Me.Text = "Status: Resolution not found!" Me.Text = "Status: Resolution not found!"
Anime_Add.StatusLabel.Text = "Status: Resolution not found!"
Me.Invalidate() Me.Invalidate()
DialogTaskString = "Funimation_Resolution" DialogTaskString = "Funimation_Resolution"
ResoNotFoundString = str1 ResoNotFoundString = str1
@ -5587,6 +5592,7 @@ Public Class Main
Else Else
Me.Invoke(New Action(Function() As Object Me.Invoke(New Action(Function() As Object
Me.Text = "Status: Resolution found!" Me.Text = "Status: Resolution found!"
Anime_Add.StatusLabel.Text = "Status: Resolution found!"
Me.Invalidate() Me.Invalidate()
Return Nothing Return Nothing
End Function)) End Function))
@ -5595,12 +5601,15 @@ Public Class Main
Else Else
Me.Invoke(New Action(Function() As Object Me.Invoke(New Action(Function() As Object
Me.Text = "Status: Substitles only mode - skipped video" Me.Text = "Status: Substitles only mode - skipped video"
Anime_Add.StatusLabel.Text = "Status: Substitles only mode - skipped video"
Me.Invalidate() Me.Invalidate()
Return Nothing Return Nothing
End Function)) End Function))
End If End If
'MsgBox(FunimationName3) 'MsgBox(FunimationName3)
'MsgBox(Funimation_m3u8_final) Debug.WriteLine("Funimation_m3u8_final: " + Funimation_m3u8_final)
Funimation_m3u8_final = Funimation_m3u8_final.Replace(Chr(34), "")
Dim ResoHTMLDisplay As String = Reso.ToString + "p" Dim ResoHTMLDisplay As String = Reso.ToString + "p"
@ -5724,6 +5733,8 @@ Public Class Main
#Region "ffmpeg command" #Region "ffmpeg command"
Dim DubMetatata As String = Nothing Dim DubMetatata As String = Nothing
If FunimationDub = "Japanese" Then If FunimationDub = "Japanese" Then
DubMetatata = " -metadata:s:a:0 language=jpn" DubMetatata = " -metadata:s:a:0 language=jpn"
@ -5780,6 +5791,7 @@ Public Class Main
#End Region #End Region
Me.Invoke(New Action(Function() As Object Me.Invoke(New Action(Function() As Object
Me.Text = "Crunchyroll Downloader" Me.Text = "Crunchyroll Downloader"
Anime_Add.StatusLabel.Text = "idle"
Me.Invalidate() Me.Invalidate()
Return Nothing Return Nothing
End Function)) End Function))
@ -5787,6 +5799,7 @@ Public Class Main
Catch ex As Exception Catch ex As Exception
Me.Invoke(New Action(Function() As Object Me.Invoke(New Action(Function() As Object
Me.Text = "Crunchyroll Downloader!" Me.Text = "Crunchyroll Downloader!"
Anime_Add.StatusLabel.Text = "idle"
Me.Invalidate() Me.Invalidate()
Return Nothing Return Nothing
End Function)) End Function))

View File

@ -18,7 +18,7 @@ Public Class Einstellungen
Private Sub Einstellungen_Load(sender As Object, e As EventArgs) Handles MyBase.Load Private Sub Einstellungen_Load(sender As Object, e As EventArgs) Handles MyBase.Load
Label6.Text = "You have: v" + Application.ProductVersion.ToString + " Chromium-U9.2" Label6.Text = "You have: v" + Application.ProductVersion.ToString + " Chromium-U9.3"
BackgroundWorker1.RunWorkerAsync() BackgroundWorker1.RunWorkerAsync()