mirror of
https://github.com/hama3254/Crunchyroll-Downloader-v3.0.git
synced 2024-11-13 03:35:05 +01:00
added crash detection
added crash detection
This commit is contained in:
hama3254
parent
c99ee236c8
commit
170bfb90fc
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
14
Crunchyroll Downloader/CRD_List_Item.Designer.vb
generated
14
Crunchyroll Downloader/CRD_List_Item.Designer.vb
generated
@ -33,6 +33,7 @@ Partial Class CRD_List_Item
|
||||
Me.Label_percent = New System.Windows.Forms.Label()
|
||||
Me.ProgressBar1 = New System.Windows.Forms.ProgressBar()
|
||||
Me.ToolTip1 = New System.Windows.Forms.ToolTip(Me.components)
|
||||
Me.Timer1 = New System.Windows.Forms.Timer(Me.components)
|
||||
CType(Me.PB_Thumbnail, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
CType(Me.bt_pause, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
CType(Me.bt_del, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
@ -51,7 +52,7 @@ Partial Class CRD_List_Item
|
||||
'
|
||||
'bt_pause
|
||||
'
|
||||
Me.bt_pause.BackgroundImage = Global.Crunchyroll_Downloader.My.Resources.main_pause
|
||||
Me.bt_pause.BackgroundImage = Global.Crunchyroll_Downloader.My.Resources.Resources.main_pause
|
||||
Me.bt_pause.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
|
||||
Me.bt_pause.Location = New System.Drawing.Point(740, 15)
|
||||
Me.bt_pause.Name = "bt_pause"
|
||||
@ -113,9 +114,9 @@ Partial Class CRD_List_Item
|
||||
'
|
||||
Me.Label_percent.Anchor = System.Windows.Forms.AnchorStyles.Right
|
||||
Me.Label_percent.Font = New System.Drawing.Font("Consolas", 12.0!)
|
||||
Me.Label_percent.Location = New System.Drawing.Point(456, 101)
|
||||
Me.Label_percent.Location = New System.Drawing.Point(455, 101)
|
||||
Me.Label_percent.Name = "Label_percent"
|
||||
Me.Label_percent.Size = New System.Drawing.Size(340, 19)
|
||||
Me.Label_percent.Size = New System.Drawing.Size(355, 19)
|
||||
Me.Label_percent.TabIndex = 7
|
||||
Me.Label_percent.Text = "Status Label : speed, size and percent"
|
||||
Me.Label_percent.TextAlign = System.Drawing.ContentAlignment.MiddleRight
|
||||
@ -124,10 +125,14 @@ Partial Class CRD_List_Item
|
||||
'
|
||||
Me.ProgressBar1.Location = New System.Drawing.Point(195, 70)
|
||||
Me.ProgressBar1.Name = "ProgressBar1"
|
||||
Me.ProgressBar1.Size = New System.Drawing.Size(601, 20)
|
||||
Me.ProgressBar1.Size = New System.Drawing.Size(615, 20)
|
||||
Me.ProgressBar1.Style = System.Windows.Forms.ProgressBarStyle.Continuous
|
||||
Me.ProgressBar1.TabIndex = 8
|
||||
'
|
||||
'Timer1
|
||||
'
|
||||
Me.Timer1.Interval = 1000
|
||||
'
|
||||
'CRD_List_Item
|
||||
'
|
||||
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
|
||||
@ -162,4 +167,5 @@ Partial Class CRD_List_Item
|
||||
Friend WithEvents Label_percent As Label
|
||||
Friend WithEvents ProgressBar1 As ProgressBar
|
||||
Friend WithEvents ToolTip1 As ToolTip
|
||||
Friend WithEvents Timer1 As Timer
|
||||
End Class
|
||||
|
||||
@ -120,4 +120,7 @@
|
||||
<metadata name="ToolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>19, 12</value>
|
||||
</metadata>
|
||||
<metadata name="Timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>118, 12</value>
|
||||
</metadata>
|
||||
</root>
|
||||
@ -7,8 +7,10 @@ Imports System.ComponentModel
|
||||
Public Class CRD_List_Item
|
||||
Dim ZeitGesamtInteger As Integer = 0
|
||||
Dim ListOfStreams As New List(Of String)
|
||||
Dim proc As New Process
|
||||
Dim proc As Process
|
||||
Dim Canceld As Boolean = False
|
||||
|
||||
Dim Label_website_Text As String = Nothing
|
||||
Dim StatusRunning As Boolean = True
|
||||
Dim UsedMap As String = Nothing
|
||||
Dim ffmpeg_command As String = Nothing
|
||||
@ -34,6 +36,7 @@ Public Class CRD_List_Item
|
||||
#Region "Set UI"
|
||||
Public Sub SetLabelWebsite(ByVal Text As String)
|
||||
Label_website.Text = Text
|
||||
Label_website_Text = Text
|
||||
End Sub
|
||||
Public Sub SetLabelAnimeTitel(ByVal Text As String)
|
||||
Label_Anime.Text = Text
|
||||
@ -117,7 +120,7 @@ Public Class CRD_List_Item
|
||||
Private Sub bt_pause_Click(sender As Object, e As EventArgs) Handles bt_pause.Click
|
||||
If proc.HasExited = True Then
|
||||
If ProgressBar1.Value < 100 Then
|
||||
MsgBox("Something is wrong here, the download process seems to have crashed", MsgBoxStyle.Exclamation)
|
||||
MsgBox("The download process seems to have crashed", MsgBoxStyle.Exclamation)
|
||||
Label_percent.Text = "Press the play button again to retry."
|
||||
ProgressBar1.Value = 100
|
||||
Retry = True
|
||||
@ -138,6 +141,7 @@ Public Class CRD_List_Item
|
||||
End If
|
||||
DownloadFFMPEG(HistoryDL_URL, HistoryDL_Pfad, HistoryFilename)
|
||||
StatusRunning = True
|
||||
Label_website.Text = Label_website_Text
|
||||
End If
|
||||
Exit Sub
|
||||
End If
|
||||
@ -155,6 +159,7 @@ Public Class CRD_List_Item
|
||||
ToolTip1.SetToolTip(Me, Text)
|
||||
End Sub
|
||||
Private Sub Item_Load(sender As Object, e As EventArgs) Handles MyBase.Load
|
||||
Timer1.Enabled = True
|
||||
Dim locationY As Integer = 0
|
||||
bt_del.SetBounds(775, locationY + 10, 35, 29)
|
||||
bt_pause.SetBounds(740, locationY + 15, 25, 20)
|
||||
@ -164,7 +169,7 @@ Public Class CRD_List_Item
|
||||
Label_Anime.Location = New Point(195, locationY + 42)
|
||||
Label_Reso.Location = New Point(195, locationY + 101)
|
||||
Label_Hardsub.Location = New Point(300, locationY + 101)
|
||||
Label_percent.SetBounds(480, locationY + 101, 340, 19)
|
||||
Label_percent.SetBounds(455, locationY + 101, 355, 19)
|
||||
Label_percent.AutoSize = False
|
||||
ProgressBar1.SetBounds(195, locationY + 70, 601, 20)
|
||||
End Sub
|
||||
@ -181,7 +186,7 @@ Public Class CRD_List_Item
|
||||
Label_Anime.Location = New Point(195, locationY + 42)
|
||||
Label_Reso.Location = New Point(195, locationY + 101)
|
||||
Label_Hardsub.Location = New Point(300, locationY + 101)
|
||||
Label_percent.SetBounds(456, locationY + 101, 340, 19)
|
||||
Label_percent.SetBounds(455, locationY + 101, 355, 19)
|
||||
Label_percent.AutoSize = False
|
||||
ProgressBar1.SetBounds(195, locationY + 70, 601, 20)
|
||||
End Sub
|
||||
@ -222,6 +227,7 @@ Public Class CRD_List_Item
|
||||
startinfo.RedirectStandardInput = True
|
||||
startinfo.RedirectStandardOutput = True
|
||||
startinfo.CreateNoWindow = True
|
||||
proc = New Process
|
||||
AddHandler proc.ErrorDataReceived, AddressOf TestOutput
|
||||
AddHandler proc.OutputDataReceived, AddressOf TestOutput
|
||||
proc.StartInfo = startinfo
|
||||
@ -373,6 +379,7 @@ Public Class CRD_List_Item
|
||||
If MessageBox.Show("Are you sure you want to cancel the Download?", "Cancel Download!", MessageBoxButtons.YesNo) = DialogResult.No Then
|
||||
Exit Sub
|
||||
End If
|
||||
Canceld = True
|
||||
KillRunningTask()
|
||||
End If
|
||||
|
||||
@ -404,5 +411,19 @@ Public Class CRD_List_Item
|
||||
Next
|
||||
End Sub
|
||||
|
||||
Private Sub Timer1_Tick(sender As Object, e As EventArgs) Handles Timer1.Tick
|
||||
If proc.HasExited = True Then
|
||||
If ProgressBar1.Value < 100 Then
|
||||
If Canceld = False Then
|
||||
Label_website.Text = "The download process seems to have crashed"
|
||||
Label_percent.Text = "Press the play button again to retry."
|
||||
ProgressBar1.Value = 100
|
||||
Retry = True
|
||||
StatusRunning = False
|
||||
End If
|
||||
End If
|
||||
|
||||
End If
|
||||
End Sub
|
||||
End Class
|
||||
|
||||
|
||||
25
Crunchyroll Downloader/Form1.Designer.vb
generated
25
Crunchyroll Downloader/Form1.Designer.vb
generated
@ -25,6 +25,8 @@ Partial Class Form1
|
||||
Me.RichTextBox1 = New System.Windows.Forms.RichTextBox()
|
||||
Me.TextBox1 = New System.Windows.Forms.TextBox()
|
||||
Me.Button1 = New System.Windows.Forms.Button()
|
||||
Me.Button2 = New System.Windows.Forms.Button()
|
||||
Me.ComboBox1 = New System.Windows.Forms.ComboBox()
|
||||
Me.SuspendLayout()
|
||||
'
|
||||
'RichTextBox1
|
||||
@ -44,18 +46,37 @@ Partial Class Form1
|
||||
'
|
||||
'Button1
|
||||
'
|
||||
Me.Button1.Location = New System.Drawing.Point(81, 739)
|
||||
Me.Button1.Location = New System.Drawing.Point(12, 715)
|
||||
Me.Button1.Name = "Button1"
|
||||
Me.Button1.Size = New System.Drawing.Size(75, 23)
|
||||
Me.Button1.TabIndex = 2
|
||||
Me.Button1.Text = "Button1"
|
||||
Me.Button1.UseVisualStyleBackColor = True
|
||||
'
|
||||
'Button2
|
||||
'
|
||||
Me.Button2.Location = New System.Drawing.Point(1191, 715)
|
||||
Me.Button2.Name = "Button2"
|
||||
Me.Button2.Size = New System.Drawing.Size(75, 23)
|
||||
Me.Button2.TabIndex = 3
|
||||
Me.Button2.Text = "Button2"
|
||||
Me.Button2.UseVisualStyleBackColor = True
|
||||
'
|
||||
'ComboBox1
|
||||
'
|
||||
Me.ComboBox1.FormattingEnabled = True
|
||||
Me.ComboBox1.Location = New System.Drawing.Point(39, 754)
|
||||
Me.ComboBox1.Name = "ComboBox1"
|
||||
Me.ComboBox1.Size = New System.Drawing.Size(1227, 21)
|
||||
Me.ComboBox1.TabIndex = 4
|
||||
'
|
||||
'Form1
|
||||
'
|
||||
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
|
||||
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
|
||||
Me.ClientSize = New System.Drawing.Size(1332, 843)
|
||||
Me.Controls.Add(Me.ComboBox1)
|
||||
Me.Controls.Add(Me.Button2)
|
||||
Me.Controls.Add(Me.Button1)
|
||||
Me.Controls.Add(Me.TextBox1)
|
||||
Me.Controls.Add(Me.RichTextBox1)
|
||||
@ -69,4 +90,6 @@ Partial Class Form1
|
||||
Friend WithEvents RichTextBox1 As RichTextBox
|
||||
Friend WithEvents TextBox1 As TextBox
|
||||
Friend WithEvents Button1 As Button
|
||||
Friend WithEvents Button2 As Button
|
||||
Friend WithEvents ComboBox1 As ComboBox
|
||||
End Class
|
||||
|
||||
@ -8,4 +8,41 @@
|
||||
TextBox1.Text = "nope"
|
||||
End If
|
||||
End Sub
|
||||
|
||||
Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click
|
||||
Dim SplittString As String = Nothing
|
||||
If InStr(RichTextBox1.Text, My.Resources.Funimation_Subtitle_String) Then
|
||||
SplittString = My.Resources.Funimation_Subtitle_String
|
||||
ElseIf InStr(RichTextBox1.Text, My.Resources.Funimation_Subtitle_String2) Then
|
||||
SplittString = My.Resources.Funimation_Subtitle_String2
|
||||
Else
|
||||
'some error
|
||||
End If
|
||||
Dim SubTitle1() As String = RichTextBox1.Text.Split(New String() {SplittString}, System.StringSplitOptions.RemoveEmptyEntries)
|
||||
MsgBox(SubTitle1.Count.ToString)
|
||||
Dim Subs_in_srt As New List(Of String)
|
||||
Dim Subs_in_vtt As New List(Of String)
|
||||
Dim Subs_in_dfxp As New List(Of String)
|
||||
|
||||
For i As Integer = 0 To SubTitle1.Count - 1
|
||||
Dim SubTitle2() As String = SubTitle1(i).Split(New String() {Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries)
|
||||
|
||||
ComboBox1.Items.Add(SubTitle2(SubTitle2.Count - 1))
|
||||
'If InStr(SubTitle2(SubTitle2.Count - 1), ".srt") Then
|
||||
' Subs_in_srt.Add(SubTitle2(SubTitle2.Count - 1))
|
||||
'ElseIf InStr(SubTitle2(SubTitle2.Count - 1), ".vtt") Then
|
||||
' Subs_in_vtt.Add(SubTitle2(SubTitle2.Count - 1))
|
||||
'ElseIf InStr(SubTitle2(SubTitle2.Count - 1), ".dfxp") Then
|
||||
' Subs_in_dfxp.Add(SubTitle2(SubTitle2.Count - 1))
|
||||
'End If
|
||||
Next
|
||||
'Dim UsedSub As String = Nothing
|
||||
'If Subs_in_srt.Count > 0 Then
|
||||
' ComboBox1.Items.Add(Subs_in_srt.Item(0))
|
||||
'ElseIf Subs_in_vtt.Count > 0 Then
|
||||
' ComboBox1.Items.Add(Subs_in_vtt.Item(0))
|
||||
'ElseIf Subs_in_dfxp.Count > 0 Then
|
||||
' ComboBox1.Items.Add(Subs_in_dfxp.Item(0))
|
||||
'End If
|
||||
End Sub
|
||||
End Class
|
||||
@ -159,24 +159,6 @@ Public Class GeckoFX
|
||||
Me.Close()
|
||||
End If
|
||||
'ElseIf CBool(InStr(WebBrowser1.Url.ToString, "https://www.anime-on-demand.de/anime/")) Then
|
||||
ElseIf CBool(InStr(WebBrowser1.Url.ToString, "funimation.com/player")) Then
|
||||
'todo softsub download
|
||||
'MsgBox(WebBrowser1.Document.Body.OuterHtml)
|
||||
If InStr(WebBrowser1.Document.Body.OuterHtml, ".srt") Then
|
||||
Dim SubTitle1() As String = WebBrowser1.Document.Body.OuterHtml.Split(New String() {".srt"}, System.StringSplitOptions.RemoveEmptyEntries)
|
||||
Dim SubTitle2() As String = SubTitle1(0).Split(New String() {Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries)
|
||||
Main.WebbrowserSoftSubURL = SubTitle2(SubTitle2.Count - 1) + ".srt"
|
||||
ElseIf InStr(WebBrowser1.Document.Body.OuterHtml, ".vtt") Then
|
||||
Dim SubTitle1() As String = WebBrowser1.Document.Body.OuterHtml.Split(New String() {".vtt"}, System.StringSplitOptions.RemoveEmptyEntries)
|
||||
Dim SubTitle2() As String = SubTitle1(0).Split(New String() {Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries)
|
||||
Main.WebbrowserSoftSubURL = SubTitle2(SubTitle2.Count - 1) + ".vtt"
|
||||
ElseIf InStr(WebBrowser1.Document.Body.OuterHtml, ".dfxp") Then
|
||||
Dim SubTitle1() As String = WebBrowser1.Document.Body.OuterHtml.Split(New String() {".dfxp"}, System.StringSplitOptions.RemoveEmptyEntries)
|
||||
Dim SubTitle2() As String = SubTitle1(0).Split(New String() {Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries)
|
||||
Main.WebbrowserSoftSubURL = SubTitle2(SubTitle2.Count - 1) + ".dfxp"
|
||||
Else
|
||||
Main.WebbrowserSoftSubURL = Nothing
|
||||
End If
|
||||
|
||||
'MsgBox(Main.WebbrowserSoftSubURL)
|
||||
' Anime_Add.StatusLabel.Text =
|
||||
|
||||
@ -94,7 +94,7 @@ Public Class Main
|
||||
Public LabelResoNotFoundText As String = "resolution not found" + vbNewLine + "Select another one below"
|
||||
Public LabelLangNotFoundText As String = "language not found" + vbNewLine + "Select another one below"
|
||||
Public ButtonResoNotFoundText As String = "Submit"
|
||||
Public CB_SuB_Nothing As String = "[ without (none) ]"
|
||||
Public CB_SuB_Nothing As String = "[ null ]"
|
||||
Dim StatusToolTip As ToolTip = New ToolTip()
|
||||
Dim StatusToolTipText As String
|
||||
Public RunGecko As String = "Startup"
|
||||
@ -1840,16 +1840,15 @@ Public Class Main
|
||||
Dim FunimationName3 As String = FunimationName2(FunimationName2.Count - 1).Replace("</a>", "")
|
||||
FunimationName3 = System.Text.RegularExpressions.Regex.Replace(FunimationName3, "[^\w\\-]", " ")
|
||||
FunimationName3 = RemoveExtraSpaces(FunimationName3)
|
||||
Dim DownloadPfad As String = Chr(34) + Pfad + "\" + FunimationName3 + ".mp4" + Chr(34)
|
||||
#End Region
|
||||
|
||||
#Region "m3u8 URL"
|
||||
Dim Player_ID() As String = WebbrowserText.Split(New String() {My.Resources.Funimation_Player_ID}, System.StringSplitOptions.RemoveEmptyEntries)
|
||||
Dim Player_ID2() As String = Player_ID(1).Split(New String() {"/"}, System.StringSplitOptions.RemoveEmptyEntries)
|
||||
Dim iFrameURL As String = "https://www.funimation.com/player/" + Player_ID2(0) + "/?bdub=0&qid="
|
||||
WebbrowserSoftSubURL = Nothing
|
||||
Me.Invoke(New Action(Function()
|
||||
Anime_Add.StatusLabel.Text = iFrameURL
|
||||
GeckoFX.WebBrowser1.Navigate(iFrameURL)
|
||||
' Anime_Add.StatusLabel.Text = iFrameURL
|
||||
|
||||
Return Nothing
|
||||
End Function))
|
||||
|
||||
@ -1929,7 +1928,101 @@ Public Class Main
|
||||
#End Region
|
||||
Dim ResoHTMLDisplay As String = Resu.ToString + "p"
|
||||
|
||||
Dim DownloadPfad As String = Chr(34) + Pfad + "\" + FunimationName3 + ".mp4" + Chr(34)
|
||||
#Region "Subs"
|
||||
Dim SubsClient As New WebClient
|
||||
SubsClient.Encoding = Encoding.UTF8
|
||||
If WebbrowserCookie = Nothing Then
|
||||
Else
|
||||
SubsClient.Headers.Add(HttpRequestHeader.Cookie, WebbrowserCookie)
|
||||
End If
|
||||
Dim PlayerPage As String = SubsClient.DownloadString("https://www.funimation.com/player/" + Player_ID2(0) + "/?bdub=0&qid=")
|
||||
Dim SplittString As String = Nothing
|
||||
If InStr(PlayerPage, My.Resources.Funimation_Subtitle_String) Then
|
||||
SplittString = My.Resources.Funimation_Subtitle_String
|
||||
ElseIf InStr(PlayerPage, My.Resources.Funimation_Subtitle_String2) Then
|
||||
SplittString = My.Resources.Funimation_Subtitle_String2
|
||||
|
||||
End If
|
||||
Dim UsedSub As String = Nothing
|
||||
If SplittString = Nothing Then
|
||||
If InStr(PlayerPage, ".srt") Then
|
||||
Dim SubTitle1() As String = PlayerPage.Split(New String() {".srt"}, System.StringSplitOptions.RemoveEmptyEntries)
|
||||
Dim SubTitle2() As String = SubTitle1(0).Split(New String() {Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries)
|
||||
UsedSub = SubTitle2(SubTitle2.Count - 1) + ".srt"
|
||||
ElseIf InStr(PlayerPage, ".vtt") Then
|
||||
Dim SubTitle1() As String = PlayerPage.Split(New String() {".vtt"}, System.StringSplitOptions.RemoveEmptyEntries)
|
||||
Dim SubTitle2() As String = SubTitle1(0).Split(New String() {Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries)
|
||||
UsedSub = SubTitle2(SubTitle2.Count - 1) + ".vtt"
|
||||
ElseIf InStr(PlayerPage, ".dfxp") Then
|
||||
Dim SubTitle1() As String = PlayerPage.Split(New String() {".dfxp"}, System.StringSplitOptions.RemoveEmptyEntries)
|
||||
Dim SubTitle2() As String = SubTitle1(0).Split(New String() {Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries)
|
||||
UsedSub = SubTitle2(SubTitle2.Count - 1) + ".dfxp"
|
||||
Else
|
||||
MsgBox("No Subtitle found in the website, a logfile was created.", "No Subtitle", MsgBoxStyle.Exclamation)
|
||||
File.WriteAllText(Path.Combine(Application.StartupPath + "No Subtitle for" + FunimationName3 + ".log"), PlayerPage, Encoding.UTF8)
|
||||
End If
|
||||
Else
|
||||
|
||||
|
||||
Dim SubTitle1() As String = PlayerPage.Split(New String() {SplittString}, System.StringSplitOptions.RemoveEmptyEntries)
|
||||
Dim Subs_in_srt As New List(Of String)
|
||||
Dim Subs_in_vtt As New List(Of String)
|
||||
Dim Subs_in_dfxp As New List(Of String)
|
||||
|
||||
For i As Integer = 0 To SubTitle1.Count - 1
|
||||
Dim SubTitle2() As String = SubTitle1(0).Split(New String() {Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries)
|
||||
|
||||
|
||||
If InStr(SubTitle2(SubTitle2.Count - 1), ".srt") Then
|
||||
Subs_in_srt.Add(SubTitle2(SubTitle2.Count - 1))
|
||||
ElseIf InStr(SubTitle2(SubTitle2.Count - 1), ".vtt") Then
|
||||
Subs_in_vtt.Add(SubTitle2(SubTitle2.Count - 1))
|
||||
ElseIf InStr(SubTitle2(SubTitle2.Count - 1), ".dfxp") Then
|
||||
Subs_in_dfxp.Add(SubTitle2(SubTitle2.Count - 1))
|
||||
End If
|
||||
Next
|
||||
|
||||
If Subs_in_srt.Count > 0 Then
|
||||
UsedSub = Subs_in_srt.Item(0)
|
||||
ElseIf Subs_in_vtt.Count > 0 Then
|
||||
UsedSub = Subs_in_vtt.Item(0)
|
||||
ElseIf Subs_in_dfxp.Count > 0 Then
|
||||
UsedSub = Subs_in_dfxp.Item(0)
|
||||
End If
|
||||
|
||||
If MergeSubstoMP4 = True Then
|
||||
Else
|
||||
'MsgBox(WebbrowserSoftSubURL)
|
||||
Dim str2 As String = client0.DownloadString(WebbrowserSoftSubURL)
|
||||
Dim SubtitelFormat As String = ".srt"
|
||||
If InStr(WebbrowserSoftSubURL, ".vtt") Then
|
||||
SubtitelFormat = ".vtt"
|
||||
ElseIf InStr(WebbrowserSoftSubURL, ".dfxp") Then
|
||||
SubtitelFormat = ".dfxp"
|
||||
End If
|
||||
Dim Pfad3 As String = DownloadPfad.Replace(Chr(34), "")
|
||||
Dim Pfad4 As String = Pfad3.Replace(".mp4", SubtitelFormat)
|
||||
File.WriteAllText(Pfad4, str2, Encoding.UTF8)
|
||||
End If
|
||||
|
||||
End If
|
||||
#End Region
|
||||
|
||||
#Region "SubsToMP4"
|
||||
If MergeSubstoMP4 = True Then
|
||||
If UsedSub = Nothing Then
|
||||
Else
|
||||
Dim SoftSubMergeURLs As String = " -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
|
||||
End If
|
||||
End If
|
||||
|
||||
#End Region
|
||||
|
||||
|
||||
|
||||
Dim L1Name_Split As String() = WebbrowserURL.Split(New String() {"/"}, System.StringSplitOptions.RemoveEmptyEntries)
|
||||
Dim L1Name As String = L1Name_Split(1).Replace("www.", "")
|
||||
Me.Invoke(New Action(Function()
|
||||
@ -1937,20 +2030,7 @@ Public Class Main
|
||||
Return Nothing
|
||||
End Function))
|
||||
#End Region
|
||||
If WebbrowserSoftSubURL = Nothing Then
|
||||
Else
|
||||
'MsgBox(WebbrowserSoftSubURL)
|
||||
Dim str2 As String = client0.DownloadString(WebbrowserSoftSubURL)
|
||||
Dim SubtitelFormat As String = ".srt"
|
||||
If InStr(WebbrowserSoftSubURL, ".vtt") Then
|
||||
SubtitelFormat = ".vtt"
|
||||
ElseIf InStr(WebbrowserSoftSubURL, ".dfxp") Then
|
||||
SubtitelFormat = ".dfxp"
|
||||
End If
|
||||
Dim Pfad3 As String = DownloadPfad.Replace(Chr(34), "")
|
||||
Dim Pfad4 As String = Pfad3.Replace(".mp4", SubtitelFormat)
|
||||
File.WriteAllText(Pfad4, str2, Encoding.UTF8)
|
||||
End If
|
||||
|
||||
Catch ex As Exception
|
||||
|
||||
MsgBox(ex.ToString)
|
||||
|
||||
@ -303,6 +303,24 @@ Namespace My.Resources
|
||||
End Get
|
||||
End Property
|
||||
|
||||
'''<summary>
|
||||
''' Sucht eine lokalisierte Zeichenfolge, die ", "kind": "subtitle", "type": "CC", "language": "en" ähnelt.
|
||||
'''</summary>
|
||||
Friend ReadOnly Property Funimation_Subtitle_String() As String
|
||||
Get
|
||||
Return ResourceManager.GetString("Funimation_Subtitle_String", resourceCulture)
|
||||
End Get
|
||||
End Property
|
||||
|
||||
'''<summary>
|
||||
''' Sucht eine lokalisierte Zeichenfolge, die ", "kind": "subtitle", "type": "Full", "language": "en" ähnelt.
|
||||
'''</summary>
|
||||
Friend ReadOnly Property Funimation_Subtitle_String2() As String
|
||||
Get
|
||||
Return ResourceManager.GetString("Funimation_Subtitle_String2", resourceCulture)
|
||||
End Get
|
||||
End Property
|
||||
|
||||
'''<summary>
|
||||
''' Sucht eine lokalisierte Zeichenfolge, die <meta property="og:image" content=" ähnelt.
|
||||
'''</summary>
|
||||
@ -700,7 +718,7 @@ Namespace My.Resources
|
||||
''' .imagestyle{width:156px;height:88px;display:block;margin-bottom:4px} .ulStyle{margin:0 0 0 -10px;display:block;position:relative;margin-top:8px}
|
||||
''' .ulStyle li{margin-left:12px;float:left;display:block;position:relative}
|
||||
''' .listyle{width:156px;display:block;background:#fff;padding:16px;margin-bottom:14px;position:relative;background-color:#b5b3b3}
|
||||
''' .progressbar{height:14px;backgro [Rest der Zeichenfolge wurde abgeschnitten]"; ähnelt.
|
||||
''' .progressbar{height:14p [Rest der Zeichenfolge wurde abgeschnitten]"; ähnelt.
|
||||
'''</summary>
|
||||
Friend ReadOnly Property Startuphtml() As String
|
||||
Get
|
||||
|
||||
@ -385,4 +385,10 @@ I delete the curremt session with the unlock, if you want to be logged in with t
|
||||
<data name="Funimation_thumbnail" xml:space="preserve">
|
||||
<value><meta property="og:image" content="</value>
|
||||
</data>
|
||||
<data name="Funimation_Subtitle_String" xml:space="preserve">
|
||||
<value>", "kind": "subtitle", "type": "CC", "language": "en"</value>
|
||||
</data>
|
||||
<data name="Funimation_Subtitle_String2" xml:space="preserve">
|
||||
<value>", "kind": "subtitle", "type": "Full", "language": "en"</value>
|
||||
</data>
|
||||
</root>
|
||||
Binary file not shown.
Binary file not shown.
@ -147,6 +147,16 @@ Crunchyroll Downloader
|
||||
Sucht eine lokalisierte Zeichenfolge, die "src": ähnelt.
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:Crunchyroll_Downloader.My.Resources.Resources.Funimation_Subtitle_String">
|
||||
<summary>
|
||||
Sucht eine lokalisierte Zeichenfolge, die ", "kind": "subtitle", "type": "CC", "language": "en" ähnelt.
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:Crunchyroll_Downloader.My.Resources.Resources.Funimation_Subtitle_String2">
|
||||
<summary>
|
||||
Sucht eine lokalisierte Zeichenfolge, die ", "kind": "subtitle", "type": "Full", "language": "en" ähnelt.
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:Crunchyroll_Downloader.My.Resources.Resources.Funimation_thumbnail">
|
||||
<summary>
|
||||
Sucht eine lokalisierte Zeichenfolge, die <meta property="og:image" content=" ähnelt.
|
||||
@ -377,7 +387,7 @@ Crunchyroll Downloader
|
||||
.imagestyle{width:156px;height:88px;display:block;margin-bottom:4px} .ulStyle{margin:0 0 0 -10px;display:block;position:relative;margin-top:8px}
|
||||
.ulStyle li{margin-left:12px;float:left;display:block;position:relative}
|
||||
.listyle{width:156px;display:block;background:#fff;padding:16px;margin-bottom:14px;position:relative;background-color:#b5b3b3}
|
||||
.progressbar{height:14px;backgro [Rest der Zeichenfolge wurde abgeschnitten]"; ähnelt.
|
||||
.progressbar{height:14p [Rest der Zeichenfolge wurde abgeschnitten]"; ähnelt.
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:Crunchyroll_Downloader.My.Resources.Resources.thumbnailString">
|
||||
|
||||
1146
Crunchyroll Downloader/einstellungen.Designer.vb
generated
1146
Crunchyroll Downloader/einstellungen.Designer.vb
generated
File diff suppressed because it is too large
Load Diff
@ -120,13 +120,10 @@
|
||||
<metadata name="ToolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>17, 17</value>
|
||||
</metadata>
|
||||
<metadata name="MenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>346, 17</value>
|
||||
</metadata>
|
||||
<metadata name="MenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>346, 17</value>
|
||||
</metadata>
|
||||
<metadata name="ToolTip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>461, 17</value>
|
||||
</metadata>
|
||||
<metadata name="MenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>346, 17</value>
|
||||
</metadata>
|
||||
</root>
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -147,6 +147,16 @@ Crunchyroll Downloader
|
||||
Sucht eine lokalisierte Zeichenfolge, die "src": ähnelt.
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:Crunchyroll_Downloader.My.Resources.Resources.Funimation_Subtitle_String">
|
||||
<summary>
|
||||
Sucht eine lokalisierte Zeichenfolge, die ", "kind": "subtitle", "type": "CC", "language": "en" ähnelt.
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:Crunchyroll_Downloader.My.Resources.Resources.Funimation_Subtitle_String2">
|
||||
<summary>
|
||||
Sucht eine lokalisierte Zeichenfolge, die ", "kind": "subtitle", "type": "Full", "language": "en" ähnelt.
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:Crunchyroll_Downloader.My.Resources.Resources.Funimation_thumbnail">
|
||||
<summary>
|
||||
Sucht eine lokalisierte Zeichenfolge, die <meta property="og:image" content=" ähnelt.
|
||||
@ -377,7 +387,7 @@ Crunchyroll Downloader
|
||||
.imagestyle{width:156px;height:88px;display:block;margin-bottom:4px} .ulStyle{margin:0 0 0 -10px;display:block;position:relative;margin-top:8px}
|
||||
.ulStyle li{margin-left:12px;float:left;display:block;position:relative}
|
||||
.listyle{width:156px;display:block;background:#fff;padding:16px;margin-bottom:14px;position:relative;background-color:#b5b3b3}
|
||||
.progressbar{height:14px;backgro [Rest der Zeichenfolge wurde abgeschnitten]"; ähnelt.
|
||||
.progressbar{height:14p [Rest der Zeichenfolge wurde abgeschnitten]"; ähnelt.
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:Crunchyroll_Downloader.My.Resources.Resources.thumbnailString">
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue
Block a user