multi episode changes, error handling and single episode seletion

-new error handling for multi download (for reversed order)
-single episode selection now possible in the multi downloader !
This commit is contained in:
hama3254 2020-02-14 17:22:54 +01:00
parent 295b0b8320
commit 9a6bb024cb
28 changed files with 78 additions and 35 deletions

Binary file not shown.

View File

@ -239,13 +239,13 @@
<Content Include="Firefox\softokn3.dll" />
<Content Include="Firefox\xul.dll" />
<Content Include="icon.ico" />
<None Include="Resources\Help_Background.PNG" />
<None Include="Resources\softsubs_download_hover.png" />
<None Include="Resources\softsubs_download_gray.png" />
<None Include="Resources\softsubs_download.png" />
<None Include="packages.config" />
<None Include="Resources\main-del-hover.png" />
<None Include="Resources\main-del.png" />
<None Include="Resources\mainb-del.png" />
<None Include="Resources\balken.png" />
<None Include="Resources\backgroud.png" />
<None Include="Resources\credits-background.png" />

View File

@ -360,11 +360,14 @@ Public Class GeckoFX
Main.Pause(1)
Button2.Text = "network scan is in progess " + Math.Abs(i).ToString
Next
If InStr(Main.WebbrowserURL, "https://www.anime-on-demand.de/anime/") Then
If InStr(Main.WebbrowserURL, "anime-on-demand.de/anime/") Then
Main.WebbrowserTitle = WebBrowser1.Document.GetElementsByClassName("jw-title-primary").First.TextContent
If Main.Debug2 = True Then
MsgBox(Main.WebbrowserTitle)
End If
'Main.Thumbnail = WebBrowser1.Document.GetElementsByClassName("fullwidth-image anime-top-image").First.TextContent
Else
Main.WebbrowserTitle = WebBrowser1.DocumentTitle
End If
Dim line As String = Nothing

View File

@ -4,8 +4,8 @@ Imports System.IO
Imports Microsoft.Win32
Imports System.ComponentModel
Public Class Main
Dim Debug1 As Boolean = False
Dim Debug2 As Boolean = False
Public Debug1 As Boolean = False
Public Debug2 As Boolean = False
Public LoggingBrowser As Boolean = False
Public Thumbnail As String = Nothing
Public MergeSubstoMP4 As Boolean = False
@ -477,12 +477,18 @@ Public Class Main
Try
Dim Anzahl As String() = Website.Split(New String() {"wrapper container-shadow hover-classes"}, System.StringSplitOptions.RemoveEmptyEntries)
Array.Reverse(Anzahl)
Dim c As Integer = Anime_Add.comboBox4.SelectedIndex - Anime_Add.comboBox3.SelectedIndex + 1
'AnzahlGesamt.Text = c.ToString
Gesamt = c.ToString
Dim c As Integer = 0
Aktuell = "0"
If Anime_Add.comboBox4.SelectedIndex > Anime_Add.comboBox3.SelectedIndex Then
If Anime_Add.comboBox4.SelectedIndex > Anime_Add.comboBox3.SelectedIndex Or Anime_Add.comboBox4.SelectedIndex = Anime_Add.comboBox3.SelectedIndex Then
c = Anime_Add.comboBox4.SelectedIndex - Anime_Add.comboBox3.SelectedIndex + 1
Else
Dim TempCB3 As Integer = Anime_Add.comboBox3.SelectedIndex
Dim TempCB4 As Integer = Anime_Add.comboBox4.SelectedIndex
Anime_Add.comboBox3.SelectedIndex = TempCB4
Anime_Add.comboBox4.SelectedIndex = TempCB3
c = Anime_Add.comboBox4.SelectedIndex - Anime_Add.comboBox3.SelectedIndex + 1
End If
Gesamt = c.ToString
For i As Integer = Anime_Add.comboBox3.SelectedIndex To Anime_Add.comboBox4.SelectedIndex
For e As Integer = 0 To Integer.MaxValue
@ -509,25 +515,24 @@ Public Class Main
Dim d As Integer = i - Anime_Add.comboBox3.SelectedIndex + 1
Dim URLGrapp As String() = Anzahl(i).Split(New String() {"<a href=" + Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries)
Dim URLGrapp2 As String() = URLGrapp(1).Split(New String() {Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries)
'MsgBox("https://www.crunchyroll.com" + URLGrapp2(0))
If Debug2 = True Then
MsgBox("https://www.crunchyroll.com" + URLGrapp2(0))
End If
Grapp_RDY = False
b = False
GeckoFX.WebBrowser1.Navigate("https://www.crunchyroll.com" + URLGrapp2(0))
'Await Task.Delay(500)
'GrappURL()
Aktuell = d.ToString
' AnzahlFertig.Text = d.ToString
Anime_Add.Add_Display.Text = Aktuell + " / " + Gesamt
Next
End If
Catch ex As Exception
If Debug2 = True Then
MsgBox(ex.ToString)
End If
Anime_Add.comboBox4.Items.Clear()
Anime_Add.comboBox3.Items.Clear()
' MsgBox(Error_Mass_DL, MsgBoxStyle.Information)
'MsgBox(ex.ToString)
Aktuell = 0.ToString
Gesamt = 0.ToString
@ -1486,7 +1491,7 @@ Public Class Main
End If
End If
If Debug1 = True Then
If Debug2 = True Then
MsgBox(cmd)
End If
@ -1967,14 +1972,25 @@ Public Class Main
Private Sub pictureBox2_DoubleClick(sender As Object, e As EventArgs) Handles pictureBox2.DoubleClick
If Debug1 = True Then
Debug2 = True
MsgBox("Debug activated")
ElseIf Debug2 = True Then
If Debug2 = True Then
einstellungen.Close()
Try
My.Computer.Clipboard.SetText(WebbrowserText)
MsgBox("webbrowser text copyed to the clipboard")
Catch ex As Exception
End Try
Else
Debug2 = True
einstellungen.Close()
MsgBox("Debug activated")
End If
Else
Debug1 = True
einstellungen.Close()
'MsgBox("Debug activated")
End If
End Sub
End Class

View File

@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("3.2")>
<Assembly: AssemblyFileVersion("3.2")>
<Assembly: AssemblyVersion("3.2.2")>
<Assembly: AssemblyFileVersion("3.2.2")>
<Assembly: NeutralResourcesLanguage("")>

View File

@ -287,6 +287,16 @@ Namespace My.Resources
End Get
End Property
'''<summary>
''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property Help_Background() As System.Drawing.Bitmap
Get
Dim obj As Object = ResourceManager.GetObject("Help_Background", resourceCulture)
Return CType(obj,System.Drawing.Bitmap)
End Get
End Property
'''<summary>
''' Sucht eine lokalisierte Zeichenfolge, die &quot;,&quot;resolution&quot;:&quot;adaptive&quot; ähnelt.
'''</summary>

View File

@ -354,4 +354,7 @@
<data name="softsubs_download_hover" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\softsubs_download_hover.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Help_Background" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Help_Background.PNG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>

Binary file not shown.

After

Width:  |  Height:  |  Size: 27 KiB

View File

@ -137,6 +137,11 @@ Crunchyroll Downloader
Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
</summary>
</member>
<member name="P:Crunchyroll_Downloader.My.Resources.Resources.Help_Background">
<summary>
Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
</summary>
</member>
<member name="P:Crunchyroll_Downloader.My.Resources.Resources.hls_endString">
<summary>
Sucht eine lokalisierte Zeichenfolge, die &quot;,&quot;resolution&quot;:&quot;adaptive&quot; ähnelt.

View File

@ -201,15 +201,16 @@ Public Class einstellungen
Main.SubFolder = 2
rk.SetValue("SubFolder", 2, RegistryValueKind.String)
End If
If FFMPEG_Command.SelectedText = "" Then
Else
rk.SetValue("ffmpeg_command", FFMPEG_Command.SelectedText, RegistryValueKind.String)
If FFMPEG_Command.Text = "" Then
Else
rk.SetValue("ffmpeg_command", FFMPEG_Command.Text, RegistryValueKind.String)
Main.ffmpeg_command = FFMPEG_Command.Text
End If
If FFMPEG_Command.SelectedText = " -c:v hevc_nvenc -preset fast -b:v 6M -bsf:a aac_adtstoasc " Then
NumericUpDown1.Value = 4
ElseIf FFMPEG_Command.SelectedText = " -c:v libx265 -preset fast -b:v 6M -bsf:a aac_adtstoasc " Then
If FFMPEG_Command.Text = " -c:v hevc_nvenc -preset fast -b:v 6M -bsf:a aac_adtstoasc " Then
NumericUpDown1.Value = 2
ElseIf FFMPEG_Command.Text = " -c:v libx265 -preset fast -b:v 6M -bsf:a aac_adtstoasc " Then
NumericUpDown1.Value = 1
End If
rk.SetValue("SL_DL", NumericUpDown1.Value, RegistryValueKind.String)
@ -486,9 +487,9 @@ Public Class einstellungen
Private Sub FFMPEG_Command_SelectedIndexChanged(sender As Object, e As EventArgs) Handles FFMPEG_Command.SelectedIndexChanged
If CheckBox1.Checked = True Then
MsgBox("Other commands than " + Chr(34) + " -c copy -bsf:a aac_adtstoasc " + Chr(34) + "convert the Video into h265/hevc!", MsgBoxStyle.Information)
If FFMPEG_Command.SelectedText = " -c:v hevc_nvenc -preset fast -b:v 6M -bsf:a aac_adtstoasc " Then
If FFMPEG_Command.Text = " -c:v hevc_nvenc -preset fast -b:v 6M -bsf:a aac_adtstoasc " Then
MsgBox("This command requires a Nvidia GTX 6xx/7xx (Kepler generation) or higher.", MsgBoxStyle.Information)
ElseIf FFMPEG_Command.SelectedText = " -c:v libx265 -preset fast -b:v 6M -bsf:a aac_adtstoasc " Then
ElseIf FFMPEG_Command.Text = " -c:v libx265 -preset fast -b:v 6M -bsf:a aac_adtstoasc " Then
MsgBox("CPU encoding is low and uses all resources of the computer.", MsgBoxStyle.Information) ' -c:v libx265 -preset fast -b:v 6M -bsf:a aac_adtstoasc
End If
End If

View File

@ -137,6 +137,11 @@ Crunchyroll Downloader
Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
</summary>
</member>
<member name="P:Crunchyroll_Downloader.My.Resources.Resources.Help_Background">
<summary>
Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
</summary>
</member>
<member name="P:Crunchyroll_Downloader.My.Resources.Resources.hls_endString">
<summary>
Sucht eine lokalisierte Zeichenfolge, die &quot;,&quot;resolution&quot;:&quot;adaptive&quot; ähnelt.