Subfolder changes

-Subfolder for AoD
-Subfolder settings changed
-naming for AoD
This commit is contained in:
hama3254 2020-12-02 21:01:30 +01:00
parent 09e39fef4d
commit facaaaa02b
30 changed files with 3681 additions and 366 deletions

Binary file not shown.

View File

@ -273,9 +273,9 @@ Partial Class Anime_Add
Me.ClientSize = New System.Drawing.Size(630, 275) Me.ClientSize = New System.Drawing.Size(630, 275)
Me.Controls.Add(Me.pictureBox3) Me.Controls.Add(Me.pictureBox3)
Me.Controls.Add(Me.pictureBox4) Me.Controls.Add(Me.pictureBox4)
Me.Controls.Add(Me.groupBox2)
Me.Controls.Add(Me.groupBox1) Me.Controls.Add(Me.groupBox1)
Me.Controls.Add(Me.GroupBox3) Me.Controls.Add(Me.GroupBox3)
Me.Controls.Add(Me.groupBox2)
Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None
Me.Name = "Anime_Add" Me.Name = "Anime_Add"
Me.Text = "Add" Me.Text = "Add"

View File

@ -11,20 +11,29 @@ Public Class Anime_Add
Dim AoD_DubList As New List(Of String) Dim AoD_DubList As New List(Of String)
Dim AoD_Mode As Boolean = False Dim AoD_Mode As Boolean = False
Dim AoD_DL_running As Boolean = False Dim AoD_DL_running As Boolean = False
Public AoDHTML As String = Nothing
Private Sub ComboBox2_SelectedIndexChanged(sender As Object, e As EventArgs) Handles ComboBox2.SelectedIndexChanged Private Sub ComboBox2_SelectedIndexChanged(sender As Object, e As EventArgs) Handles ComboBox2.SelectedIndexChanged
Try Try
If ComboBox2.Text = Main.SubFolder_Nothing Then If ComboBox2.Text = SubFolder_Nothing Then
Dim rk As RegistryKey = Registry.CurrentUser.CreateSubKey("Software\CRDownloader") Dim rk As RegistryKey = Registry.CurrentUser.CreateSubKey("Software\CRDownloader")
rk.SetValue("SubFolder_Value", Main.SubFolder_Nothing, RegistryValueKind.String) rk.SetValue("SubFolder_Value", SubFolder_Nothing, RegistryValueKind.String)
ElseIf ComboBox2.Text = Main.SubFolder_automatic Then SubFolder_Value = SubFolder_Nothing
ElseIf ComboBox2.Text = SubFolder_automatic Then
Dim rk As RegistryKey = Registry.CurrentUser.CreateSubKey("Software\CRDownloader") Dim rk As RegistryKey = Registry.CurrentUser.CreateSubKey("Software\CRDownloader")
rk.SetValue("SubFolder_Value", Main.SubFolder_automatic, RegistryValueKind.String) rk.SetValue("SubFolder_Value", SubFolder_automatic, RegistryValueKind.String)
SubFolder_Value = SubFolder_automatic
ElseIf ComboBox2.Text = SubFolder_automatic2 Then
Dim rk As RegistryKey = Registry.CurrentUser.CreateSubKey("Software\CRDownloader")
rk.SetValue("SubFolder_Value", SubFolder_automatic2, RegistryValueKind.String)
SubFolder_Value = SubFolder_automatic2
Else Else
Dim rk As RegistryKey = Registry.CurrentUser.CreateSubKey("Software\CRDownloader") Dim rk As RegistryKey = Registry.CurrentUser.CreateSubKey("Software\CRDownloader")
rk.SetValue("SubFolder_Value", ComboBox2.Text, RegistryValueKind.String) rk.SetValue("SubFolder_Value", ComboBox2.Text, RegistryValueKind.String)
SubFolder_Value = ComboBox2.Text
End If End If
Catch ex As Exception Catch ex As Exception
ComboBox2.Text = Main.SubFolder_Nothing ComboBox2.Text = SubFolder_Nothing
End Try End Try
End Sub End Sub
@ -64,27 +73,35 @@ Public Class Anime_Add
Me.Location = New Point(Main.Location.X + Main.Width / 2 - Me.Width / 2, Main.Location.Y + Main.Height / 2 - Me.Height / 2) Me.Location = New Point(Main.Location.X + Main.Width / 2 - Me.Width / 2, Main.Location.Y + Main.Height / 2 - Me.Height / 2)
TextBox4.Text = Main.Pfad TextBox4.Text = Main.Pfad
Dim SubFolder_Value As String ' Dim SubFolder_Value As String
Try Try
Dim rkg As RegistryKey = Registry.CurrentUser.OpenSubKey("Software\CRDownloader") Dim rkg As RegistryKey = Registry.CurrentUser.OpenSubKey("Software\CRDownloader")
SubFolder_Value = rkg.GetValue("SubFolder_Value").ToString SubFolder_Value = rkg.GetValue("SubFolder_Value").ToString
If SubFolder_Value = Main.SubFolder_Nothing Then If SubFolder_Value = SubFolder_Nothing Then
ComboBox2.Items.Add(Main.SubFolder_automatic) ComboBox2.Items.Add(SubFolder_automatic)
ComboBox2.Items.Add(Main.SubFolder_Nothing) ComboBox2.Items.Add(SubFolder_automatic2)
ElseIf SubFolder_Value = Main.SubFolder_automatic Then ComboBox2.Items.Add(SubFolder_Nothing)
ComboBox2.Items.Add(Main.SubFolder_automatic) ElseIf SubFolder_Value = SubFolder_automatic Then
ComboBox2.Items.Add(Main.SubFolder_Nothing) ComboBox2.Items.Add(SubFolder_automatic)
ComboBox2.Items.Add(SubFolder_automatic2)
ComboBox2.Items.Add(SubFolder_Nothing)
ElseIf SubFolder_Value = SubFolder_automatic2 Then
ComboBox2.Items.Add(SubFolder_automatic)
ComboBox2.Items.Add(SubFolder_automatic2)
ComboBox2.Items.Add(SubFolder_Nothing)
Else Else
ComboBox2.Items.Add(Main.SubFolder_automatic) ComboBox2.Items.Add(SubFolder_automatic)
ComboBox2.Items.Add(Main.SubFolder_Nothing) ComboBox2.Items.Add(SubFolder_automatic2)
ComboBox2.Items.Add(SubFolder_Nothing)
ComboBox2.Items.Add(SubFolder_Value) ComboBox2.Items.Add(SubFolder_Value)
End If End If
Catch ex As Exception Catch ex As Exception
ComboBox2.Items.Add(Main.SubFolder_automatic) ComboBox2.Items.Add(SubFolder_automatic)
ComboBox2.Items.Add(Main.SubFolder_Nothing) ComboBox2.Items.Add(SubFolder_automatic2)
ComboBox2.SelectedItem = Main.SubFolder_Nothing ComboBox2.Items.Add(SubFolder_Nothing)
SubFolder_Value = Main.SubFolder_Nothing ComboBox2.SelectedItem = SubFolder_Nothing
SubFolder_Value = SubFolder_Nothing
End Try End Try
Try Try
@ -123,9 +140,10 @@ Public Class Anime_Add
Dim rk0 As RegistryKey = Registry.CurrentUser.CreateSubKey("Software\CRDownloader") Dim rk0 As RegistryKey = Registry.CurrentUser.CreateSubKey("Software\CRDownloader")
rk0.SetValue("Ordner", Main.Pfad, RegistryValueKind.String) rk0.SetValue("Ordner", Main.Pfad, RegistryValueKind.String)
ComboBox2.Items.Add(Main.SubFolder_automatic) ComboBox2.Items.Add(SubFolder_automatic)
ComboBox2.Items.Add(Main.SubFolder_Nothing) ComboBox2.Items.Add(SubFolder_automatic2)
ComboBox2.SelectedItem = Main.SubFolder_Nothing ComboBox2.Items.Add(SubFolder_Nothing)
ComboBox2.SelectedItem = SubFolder_Nothing
TextBox4.Text = Main.Pfad TextBox4.Text = Main.Pfad
Try Try
Dim di As New System.IO.DirectoryInfo(Main.Pfad) Dim di As New System.IO.DirectoryInfo(Main.Pfad)
@ -334,6 +352,7 @@ Public Class Anime_Add
'I/nsHttp Cookie: 'I/nsHttp Cookie:
Try Try
Using client As New WebClient() Using client As New WebClient()
client.Encoding = System.Text.Encoding.UTF8
client.Headers.Add("User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:82.0) Gecko/20100101 Firefox/82.0") client.Headers.Add("User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:82.0) Gecko/20100101 Firefox/82.0")
client.Headers.Add("ACCEPT: application/json, text/javascript, */*; q=0.01") client.Headers.Add("ACCEPT: application/json, text/javascript, */*; q=0.01")
client.Headers.Add("Accept-Encoding: gzip, deflate, br") client.Headers.Add("Accept-Encoding: gzip, deflate, br")
@ -366,6 +385,7 @@ Public Class Anime_Add
'I/nsHttp Cookie: 'I/nsHttp Cookie:
Try Try
Using client As New WebClient() Using client As New WebClient()
client.Encoding = System.Text.Encoding.UTF8
client.Headers.Add("User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:82.0) Gecko/20100101 Firefox/82.0") client.Headers.Add("User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:82.0) Gecko/20100101 Firefox/82.0")
client.Headers.Add("ACCEPT: application/json, text/javascript, */*; q=0.01") client.Headers.Add("ACCEPT: application/json, text/javascript, */*; q=0.01")
client.Headers.Add("Accept-Encoding: gzip, deflate, br") client.Headers.Add("Accept-Encoding: gzip, deflate, br")
@ -391,7 +411,7 @@ Public Class Anime_Add
End If End If
AoD_Mode = True AoD_Mode = True
If AoD_DubList.Count And AoD_OmUList.Count > 0 Then If AoD_DubList.Count And AoD_OmUList.Count > 0 Then
ComboBox1.Items.Clear()
GroupBox3.Visible = False GroupBox3.Visible = False
groupBox2.Visible = True groupBox2.Visible = True
groupBox1.Visible = False groupBox1.Visible = False
@ -402,7 +422,7 @@ Public Class Anime_Add
ComboBox1.Items.Add("OmU") ComboBox1.Items.Add("OmU")
FillAoDDropDown() FillAoDDropDown()
ElseIf AoD_DubList.Count Or AoD_OmUList.Count > 0 Then ElseIf AoD_DubList.Count Or AoD_OmUList.Count > 0 Then
ComboBox1.Items.Clear()
GroupBox3.Visible = False GroupBox3.Visible = False
groupBox2.Visible = True groupBox2.Visible = True
groupBox1.Visible = False groupBox1.Visible = False
@ -692,12 +712,23 @@ Public Class Anime_Add
#End Region #End Region
Private Sub FillAoDDropDown() Private Sub FillAoDDropDown()
For i As Integer = 0 To AoD_OmuList.Count - 1 comboBox3.Items.Clear()
Dim DropDownTitle As String() = AoD_OmuList(i).Split(New String() {My.Resources.AoD_Titel}, System.StringSplitOptions.RemoveEmptyEntries) comboBox4.Items.Clear()
If AoD_OmUList.Count > 0 Then
For i As Integer = 0 To AoD_OmUList.Count - 1
Dim DropDownTitle As String() = AoD_OmUList(i).Split(New String() {My.Resources.AoD_Titel}, System.StringSplitOptions.RemoveEmptyEntries)
Dim DropDownTitle2 As String() = DropDownTitle(1).Split(New String() {Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries) Dim DropDownTitle2 As String() = DropDownTitle(1).Split(New String() {Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries)
comboBox3.Items.Add(DropDownTitle2(0)) comboBox3.Items.Add(DropDownTitle2(0))
comboBox4.Items.Add(DropDownTitle2(0)) comboBox4.Items.Add(DropDownTitle2(0))
Next Next
ElseIf AoD_DubList.Count > 0 Then
For i As Integer = 0 To AoD_DubList.Count - 1
Dim DropDownTitle As String() = AoD_DubList(i).Split(New String() {My.Resources.AoD_Titel}, System.StringSplitOptions.RemoveEmptyEntries)
Dim DropDownTitle2 As String() = DropDownTitle(1).Split(New String() {Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries)
comboBox3.Items.Add(DropDownTitle2(0))
comboBox4.Items.Add(DropDownTitle2(0))
Next
End If
End Sub End Sub
Public Sub Add_AoD() Public Sub Add_AoD()
@ -706,17 +737,26 @@ Public Class Anime_Add
Dim RDY As Boolean = True Dim RDY As Boolean = True
Dim Running As Integer = Main.RunningDownloads Dim Running As Integer = Main.RunningDownloads
Dim DlMax As Integer = Main.MaxDL Dim DlMax As Integer = Main.MaxDL
Dim Pfad0 As String = Main.Pfad
Dim Pfad2 As String = Main.Pfad Dim Pfad2 As String = Main.Pfad
Dim NameMethode As Integer = Main.CR_NameMethode
Dim c As Integer = 0 Dim c As Integer = 0
Dim SubExit As Boolean = False Dim SubExit As Boolean = False
Dim CB3 As Integer = 0 Dim CB3 As Integer = 0
Dim CB4 As Integer = 0 Dim CB4 As Integer = 0
Dim TargetReso As String = Main.Reso Dim TargetReso As String = Main.Reso
Dim AoD_1080pPlus As Boolean = False Dim AoD_1080pPlus As Boolean = False
Dim AoDTempReso As String = "6666x6666"
Dim AoD_Season As String = Nothing
Dim AoD_Anime_Title As String = Nothing
Dim AoD_Episode_Title As String = Nothing
Dim AoD_Episode_Number As String = Nothing
Me.Invoke(New Action(Function() Me.Invoke(New Action(Function()
'Main.StatusMainForm.Text = "Crunchyroll Downloader" 'Main.StatusMainForm.Text = "Crunchyroll Downloader"
Pfad2 = Main.Pfad Pfad2 = Main.Pfad
NameMethode = Main.CR_NameMethode
If Main.AoD_Reso = 0 Then If Main.AoD_Reso = 0 Then
TargetReso = Main.Reso TargetReso = Main.Reso
ElseIf Main.AoD_Reso = 576 Then ElseIf Main.AoD_Reso = 576 Then
@ -779,6 +819,9 @@ Public Class Anime_Add
Exit Sub Exit Sub
End If End If
For i As Integer = CB3 To CB4 For i As Integer = CB3 To CB4
Dim ii As Integer = i Dim ii As Integer = i
@ -818,14 +861,99 @@ Public Class Anime_Add
Return Nothing Return Nothing
End Function)) End Function))
Dim AoDTitle1() As String = ProcessList.Item(i).Split(New String() {My.Resources.AoD_Titel}, System.StringSplitOptions.RemoveEmptyEntries) Dim AoDTitle1() As String = ProcessList.Item(i).Split(New String() {My.Resources.AoD_Titel}, System.StringSplitOptions.RemoveEmptyEntries)
Dim AoDTitle2() As String = AoDTitle1(1).Split(New String() {Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries) Dim AoDTitle2() As String = AoDTitle1(1).Split(New String() {Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries)
Dim AoDTitle As String = AoDTitle2(0) Dim AoDTitle As String = AoDTitle2(0)
Try
If InStr(AoDHTML, My.Resources.AoD_HTML_Episode_Title) Then ' Serie
Dim AoDTitle0() As String = AoDHTML.Split(New String() {My.Resources.AoD_HTML_Episode_Title}, System.StringSplitOptions.RemoveEmptyEntries)
Dim AoDTitle00() As String = AoDTitle0(ii + 1).Split(New String() {Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries)
Dim AoD_EpisodeSplit() As String = AoDTitle00(0).Split(New String() {" - "}, System.StringSplitOptions.RemoveEmptyEntries)
AoD_Episode_Number = System.Text.RegularExpressions.Regex.Replace(AoD_EpisodeSplit(0), "[^\w\\-]", " ").Trim(" ")
AoD_Episode_Title = System.Text.RegularExpressions.Regex.Replace(AoD_EpisodeSplit(1), "[^\w\\-]", " ").Trim(" ")
Dim AoDTitle3() As String = AoDHTML.Split(New String() {My.Resources.AoD_HTML_Anime_Title}, System.StringSplitOptions.RemoveEmptyEntries)
Dim AoDTitle4() As String = AoDTitle3(1).Split(New String() {"</h1>"}, System.StringSplitOptions.RemoveEmptyEntries)
If InStr(AoDTitle4(0), " - ") Then
Dim AoD_Anime_Season_split() As String = AoDTitle4(0).Split(New String() {" - "}, System.StringSplitOptions.RemoveEmptyEntries)
AoD_Anime_Title = System.Text.RegularExpressions.Regex.Replace(AoD_Anime_Season_split(0), "[^\w\\-]", " ").Trim(" ")
AoD_Season = System.Text.RegularExpressions.Regex.Replace(AoD_Anime_Season_split(1), "[^\w\\-]", " ").Trim(" ")
Else
AoD_Anime_Title = System.Text.RegularExpressions.Regex.Replace(AoDTitle4(0), "[^\w\\-]", " ").Trim(" ")
End If
Else 'keine Serie aka Film
Dim AoDMovie1() As String = AoDHTML.Split(New String() {My.Resources.AoD_HTML_Anime_Title}, System.StringSplitOptions.RemoveEmptyEntries)
Dim AoDMovie2() As String = AoDMovie1(1).Split(New String() {"</h1>"}, System.StringSplitOptions.RemoveEmptyEntries)
If InStr(AoDMovie2(0), " - ") Then
Dim AoDMovie_split() As String = AoDMovie2(0).Split(New String() {" - "}, System.StringSplitOptions.RemoveEmptyEntries)
AoD_Anime_Title = System.Text.RegularExpressions.Regex.Replace(AoDMovie_split(0), "[^\w\\-]", " ").Trim(" ")
AoD_Episode_Number = System.Text.RegularExpressions.Regex.Replace(AoDMovie_split(1), "[^\w\\-]", " ").Trim(" ")
AoD_Episode_Title = System.Text.RegularExpressions.Regex.Replace(AoDMovie_split(1), "[^\w\\-]", " ").Trim(" ")
Else
AoD_Anime_Title = System.Text.RegularExpressions.Regex.Replace(AoDMovie2(0), "[^\w\\-]", " ").Trim(" ")
End If
End If
If NameMethode = 0 Then
If AoD_Season = Nothing Then
AoDTitle = AoD_Anime_Title + " " + AoD_Episode_Number
Else
AoDTitle = AoD_Anime_Title + " " + AoD_Season + " " + AoD_Episode_Number
End If
ElseIf NameMethode = 1 Then
If AoD_Season = Nothing Then
AoDTitle = AoD_Anime_Title + " " + AoD_Episode_Title
Else
AoDTitle = AoD_Anime_Title + " " + AoD_Season + " " + AoD_Episode_Title
End If
ElseIf NameMethode = 2 Then
If AoD_Season = Nothing Then
AoDTitle = AoD_Anime_Title + " " + AoD_Episode_Number + " " + AoD_Episode_Title
Else
AoDTitle = AoD_Anime_Title + " " + AoD_Season + " " + AoD_Episode_Number + " " + AoD_Episode_Title
End If
End If
Catch ex As Exception
End Try
AoDTitle = System.Text.RegularExpressions.Regex.Replace(AoDTitle, "[^\w\\-]", " ").Trim(" ") AoDTitle = System.Text.RegularExpressions.Regex.Replace(AoDTitle, "[^\w\\-]", " ").Trim(" ")
AoDTitle = Main.RemoveExtraSpaces(AoDTitle) AoDTitle = Main.RemoveExtraSpaces(AoDTitle)
Pfad2 = UseSubfolder(AoD_Anime_Title, AoD_Season, Pfad2)
If Not Directory.Exists(Path.GetDirectoryName(Pfad2)) Then
' Nein! Jetzt erstellen...
Try
Directory.CreateDirectory(Path.GetDirectoryName(Pfad2))
Catch ex As Exception
' Ordner wurde nich erstellt
Pfad2 = Pfad0
End Try
End If
Dim DownloadPfad As String = Chr(34) + Pfad2 + "\" + AoDTitle + ".mp4" + Chr(34) Dim DownloadPfad As String = Chr(34) + Pfad2 + "\" + AoDTitle + ".mp4" + Chr(34)
#Region "lösche doppel download" #Region "lösche doppel download"
Dim Pfad5 As String = DownloadPfad.Replace(Chr(34), "") Dim Pfad5 As String = DownloadPfad.Replace(Chr(34), "")
@ -894,7 +1022,8 @@ Public Class Anime_Add
' End Function)) ' End Function))
m3u8_list.Add(new_m3u8(i2) + vbCrLf + new_m3u8(i2 + 1)) m3u8_list.Add(new_m3u8(i2) + vbCrLf + new_m3u8(i2 + 1))
End If End If
ElseIf CBool(InStr(new_m3u8(i2), AoDTempReso)) = True Then
m3u8_list.Add(new_m3u8(i2) + vbCrLf + new_m3u8(i2 + 1))
End If End If
Next Next
@ -955,9 +1084,33 @@ Public Class Anime_Add
m3u8_url_Temp = new_m3u8_2(1) m3u8_url_Temp = new_m3u8_2(1)
End If End If
Next Next
Else ElseIf m3u8_list.Count = 1 Then
Dim new_m3u8_2() As String = m3u8_list.Item(0).Split(New String() {vbLf}, System.StringSplitOptions.RemoveEmptyEntries) Dim new_m3u8_2() As String = m3u8_list.Item(0).Split(New String() {vbLf}, System.StringSplitOptions.RemoveEmptyEntries)
m3u8_url_Temp = new_m3u8_2(1) m3u8_url_Temp = new_m3u8_2(1)
Else
Me.Invoke(New Action(Function()
Me.Text = "Status: Resolution not found!"
Me.Invalidate()
Main.DialogTaskString = "AoD_Resolution"
Main.ResoNotFoundString = text
ErrorDialog.ShowDialog()
AoDTempReso = Main.ResoBackString
Return Nothing
End Function))
Dim m3u8BackupReso() As String = text.Split(New String() {vbLf}, System.StringSplitOptions.RemoveEmptyEntries)
For i2 As Integer = 0 To m3u8BackupReso.Count - 1
Dim ii2 As Integer = i2
If CBool(InStr(m3u8BackupReso(i2), AoDTempReso)) = True Then
m3u8_url_Temp = m3u8BackupReso(ii2 + 1)
End If
Next
End If End If
If InStr(m3u8_url_Temp, "https://") Then If InStr(m3u8_url_Temp, "https://") Then
@ -981,6 +1134,11 @@ Public Class Anime_Add
If AoD_1080pPlus = True Then If AoD_1080pPlus = True Then
DisplayReso = "1080p+" DisplayReso = "1080p+"
End If End If
If AoDTempReso = "6666x6666" Then
Else
Dim ResoSplit() As String = AoDTempReso.Split(New String() {"x"}, System.StringSplitOptions.RemoveEmptyEntries)
DisplayReso = ResoSplit(1) + "p"
End If
Dim L1Name As String = "anime-on-demand.de" 'L1Name_Split(1).Replace("www.", "") + " | Dub : " + FunimationDub Dim L1Name As String = "anime-on-demand.de" 'L1Name_Split(1).Replace("www.", "") + " | Dub : " + FunimationDub
Me.Invoke(New Action(Function() Me.Invoke(New Action(Function()
Main.ListItemAdd(Pfad2, L1Name, AoDTitle, DisplayReso, "Unknown", "None", AoDThumbnail, AoDm3u8Final, DownloadPfad) Main.ListItemAdd(Pfad2, L1Name, AoDTitle, DisplayReso, "Unknown", "None", AoDThumbnail, AoDm3u8Final, DownloadPfad)

View File

@ -32,6 +32,10 @@ Public Class CRD_List_Item
Dim HybridModePath As String = Nothing Dim HybridModePath As String = Nothing
Dim HybridRunning As Boolean = False Dim HybridRunning As Boolean = False
Dim TargetReso As Integer = 1080 Dim TargetReso As Integer = 1080
Dim HybrideLog As String = Nothing
#Region "Remove from list" #Region "Remove from list"
Public Sub DisposeItem(ByVal Dispose As Boolean) Public Sub DisposeItem(ByVal Dispose As Boolean)
If Dispose = True Then If Dispose = True Then
@ -143,16 +147,16 @@ Public Class CRD_List_Item
End If End If
End Sub End Sub
Private Sub bt_del_MouseEnter(sender As Object, e As EventArgs) Handles bt_del.MouseEnter Private Sub BT_del_MouseEnter(sender As Object, e As EventArgs) Handles bt_del.MouseEnter
Dim p As PictureBox = sender Dim p As PictureBox = sender
p.BackgroundImage = My.Resources.main_del_hover p.BackgroundImage = My.Resources.main_del_hover
End Sub End Sub
Private Sub bt_del_MouseLeave(sender As Object, e As EventArgs) Handles bt_del.MouseLeave Private Sub BT_del_MouseLeave(sender As Object, e As EventArgs) Handles bt_del.MouseLeave
Dim p As PictureBox = sender Dim p As PictureBox = sender
p.BackgroundImage = My.Resources.main_del p.BackgroundImage = My.Resources.main_del
End Sub End Sub
Private Sub bt_pause_MouseEnter(sender As Object, e As EventArgs) Handles bt_pause.MouseEnter Private Sub BT_pause_MouseEnter(sender As Object, e As EventArgs) Handles bt_pause.MouseEnter
Dim p As PictureBox = sender Dim p As PictureBox = sender
If StatusRunning = True Then If StatusRunning = True Then
p.BackgroundImage = My.Resources.main_pause_hover p.BackgroundImage = My.Resources.main_pause_hover
@ -161,7 +165,7 @@ Public Class CRD_List_Item
End If End If
End Sub End Sub
Private Sub bt_pause_MouseLeave(sender As Object, e As EventArgs) Handles bt_pause.MouseLeave Private Sub BT_pause_MouseLeave(sender As Object, e As EventArgs) Handles bt_pause.MouseLeave
Dim p As PictureBox = sender Dim p As PictureBox = sender
If StatusRunning = True Then If StatusRunning = True Then
p.BackgroundImage = My.Resources.main_pause p.BackgroundImage = My.Resources.main_pause
@ -170,7 +174,7 @@ Public Class CRD_List_Item
End If End If
End Sub End Sub
Private Sub bt_pause_Click(sender As Object, e As EventArgs) Handles bt_pause.Click Private Sub BT_pause_Click(sender As Object, e As EventArgs) Handles bt_pause.Click
If Canceld = True And HybridRunning = True Then If Canceld = True And HybridRunning = True Then
If Main.RunningDownloads < Main.MaxDL Then If Main.RunningDownloads < Main.MaxDL Then
@ -333,10 +337,18 @@ Public Class CRD_List_Item
End Sub End Sub
#Region "Download Cache" #Region "Download Cache"
Private Sub tsDownloadAsync(ByVal DL_URL As String, ByVal DL_Pfad As String)
Public WithEvents WC_TS As WebClient
Private Sub TS_DownloadAsync(ByVal DL_URL As String, ByVal DL_Pfad As String)
HybrideLog = HybrideLog + vbNewLine + DL_Pfad + " - " + DL_URL
Try Try
Dim wc_ts As New WebClient 'Dim wc_ts As New WebClient
wc_ts.DownloadFile(New Uri(DL_URL), DL_Pfad) WC_TS = New WebClient
WC_TS.DownloadFile(New Uri(DL_URL), DL_Pfad)
Catch ex As Exception Catch ex As Exception
Try Try
Dim wc_ts As New WebClient Dim wc_ts As New WebClient
@ -348,7 +360,7 @@ Public Class CRD_List_Item
End Try End Try
End Sub End Sub
Private Function tsStatusAsync(ByVal prozent As Integer, ByVal di As IO.DirectoryInfo, ByVal Filename As String, ByVal pausetime As Integer) Private Function TS_StatusAsync(ByVal prozent As Integer, ByVal di As IO.DirectoryInfo, ByVal Filename As String, ByVal pausetime As Integer)
Dim Now As Date = Date.Now Dim Now As Date = Date.Now
Dim FinishedSize As Double = 0 Dim FinishedSize As Double = 0
@ -379,11 +391,16 @@ Public Class CRD_List_Item
ElseIf prozent < 0 Then ElseIf prozent < 0 Then
prozent = 0 prozent = 0
End If End If
Try
Me.Invoke(New Action(Function() Me.Invoke(New Action(Function()
ProgressBar1.Value = prozent ProgressBar1.Value = prozent
Label_percent.Text = DataRateString + "MB\s " + Math.Round(FinishedSize, 2, MidpointRounding.AwayFromZero).ToString + "MB/" + Math.Round(AproxFinalSize, 2, MidpointRounding.AwayFromZero).ToString + "MB " + prozent.ToString + "%" Label_percent.Text = DataRateString + "MB\s " + Math.Round(FinishedSize, 2, MidpointRounding.AwayFromZero).ToString + "MB/" + Math.Round(AproxFinalSize, 2, MidpointRounding.AwayFromZero).ToString + "MB " + prozent.ToString + "%"
Return Nothing Return Nothing
End Function)) End Function))
Catch ex As Exception
End Try
'RaiseEvent UpdateUI(Filename, prozent, FinishedSize, AproxFinalSize, Color.FromArgb(247, 140, 37), DataRateString + "MB\s") 'RaiseEvent UpdateUI(Filename, prozent, FinishedSize, AproxFinalSize, Color.FromArgb(247, 140, 37), DataRateString + "MB\s")
Return Nothing Return Nothing
@ -499,7 +516,6 @@ Public Class CRD_List_Item
Dim ts_dl As String = Nothing Dim ts_dl As String = Nothing
HybridModePath = Pfad2 HybridModePath = Pfad2
'MsgBox(HybridModePath)
If Debug2 = True Then If Debug2 = True Then
MsgBox(Pfad2) MsgBox(Pfad2)
End If End If
@ -539,8 +555,11 @@ Public Class CRD_List_Item
Next Next
Return Nothing Return Nothing
Exit Function Exit Function
'ElseIf nummerint < Threads Then
' Thread.Sleep(2000)
' Exit For
Else Else
Thread.Sleep(1000)
Exit For Exit For
End If End If
Next Next
@ -567,15 +586,16 @@ Public Class CRD_List_Item
curi = path + textLenght(i) curi = path + textLenght(i)
End If End If
Dim Evaluator = New Thread(Sub() Me.tsDownloadAsync(curi, Pfad2 + nummer4D + ".ts")) Dim Evaluator = New Thread(Sub() Me.TS_DownloadAsync(curi, Pfad2 + nummer4D + ".ts"))
Evaluator.Start() Evaluator.Start()
ThreadList.Add(Evaluator) ThreadList.Add(Evaluator)
m3u8FFmpeg = m3u8FFmpeg + Pfad2 + nummer4D + ".ts" + vbLf m3u8FFmpeg = m3u8FFmpeg + Pfad2 + nummer4D + ".ts" + vbLf '+ "#" + curi + vbLf
Dim FragmentsFinised = (ThreadList.Count + nummerint) / FragmentsInt * 100 Dim FragmentsFinised = (ThreadList.Count + nummerint) / FragmentsInt * 100
tsStatusAsync(FragmentsFinised, di, Filename, PauseTime) TS_StatusAsync(FragmentsFinised, di, Filename, PauseTime)
ElseIf textLenght(i) = "#EXT-X-PLAYLIST-TYPE:VOD" Then ElseIf textLenght(i) = "#EXT-X-PLAYLIST-TYPE:VOD" Then
ElseIf InStr(textLenght(i), "URI=" + Chr(34)) Then ElseIf InStr(textLenght(i), "URI=" + Chr(34)) Then
Dim KeyLine As String = textLenght(i) Dim KeyLine As String = textLenght(i)
If InStr(KeyLine, "https://") Then If InStr(KeyLine, "https://") Then
@ -713,10 +733,14 @@ Public Class CRD_List_Item
Exit For Exit For
End If End If
Next Next
tsStatusAsync(100, di, Filename, PauseTime) TS_StatusAsync(100, di, Filename, PauseTime)
DL_URL = DL_URL.Replace(m3u8_url(1), Pfad2 + "index" + Folder + ".m3u8") DL_URL = DL_URL.Replace(m3u8_url(1), Pfad2 + "index" + Folder + ".m3u8")
Using sink3 As New StreamWriter(Path.GetDirectoryName(DL_Pfad.Replace(Chr(34), "")) + "\hybridelog.log", False, utf8WithoutBom)
sink3.WriteLine(HybrideLog)
End Using
'MsgBox(DL_URL) 'MsgBox(DL_URL)
Dim exepath As String = Application.StartupPath + "\ffmpeg.exe" Dim exepath As String = Application.StartupPath + "\ffmpeg.exe"
@ -809,7 +833,7 @@ Public Class CRD_List_Item
' End Function)) ' End Function))
End Sub End Sub
Sub ffmpegOutput(ByVal sender As Object, ByVal e As DataReceivedEventArgs) Sub FFMPEGOutput(ByVal sender As Object, ByVal e As DataReceivedEventArgs)
'timeout = DateTime.Now 'timeout = DateTime.Now
'MsgBox(timeout) 'MsgBox(timeout)
Try Try
@ -928,7 +952,7 @@ Public Class CRD_List_Item
If HybridMode = True Then If HybridMode = True Then
Thread.Sleep(5000) Thread.Sleep(5000)
Try Try
System.IO.Directory.Delete(HybridModePath, True) 'System.IO.Directory.Delete(HybridModePath, True)
Catch ex As Exception Catch ex As Exception
End Try End Try
End If End If
@ -975,7 +999,7 @@ Public Class CRD_List_Item
End Sub End Sub
#End Region #End Region
Private Sub bt_del_Click(sender As Object, e As EventArgs) Handles bt_del.Click Private Sub BT_del_Click(sender As Object, e As EventArgs) Handles bt_del.Click
If Canceld = True Then If Canceld = True Then
If MessageBox.Show("The Download is not running anymore, press ok to remove it from the list.", "Remove from list!", MessageBoxButtons.OKCancel) = DialogResult.Cancel Then If MessageBox.Show("The Download is not running anymore, press ok to remove it from the list.", "Remove from list!", MessageBoxButtons.OKCancel) = DialogResult.Cancel Then
Exit Sub Exit Sub
@ -1075,5 +1099,10 @@ Public Class CRD_List_Item
ProgressBar1.Width = Me.Width - 223 ProgressBar1.Width = Me.Width - 223
End Sub End Sub
End Class End Class

View File

@ -190,6 +190,7 @@
<Compile Include="CRD_List_Item.vb"> <Compile Include="CRD_List_Item.vb">
<SubType>UserControl</SubType> <SubType>UserControl</SubType>
</Compile> </Compile>
<Compile Include="Subfolder.vb" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<EmbeddedResource Include="Anime_Add.resx"> <EmbeddedResource Include="Anime_Add.resx">

View File

@ -81,6 +81,26 @@
End If End If
Next Next
Dim Reso_avaible1 As String() = Main.ResoNotFoundString.Split(New String() {"RESOLUTION="}, System.StringSplitOptions.RemoveEmptyEntries)
For i As Integer = 0 To ResoList.Count - 1
Dim Reso_avaible As String() = ResoList.Item(i).Split(New String() {"RESOLUTION="}, System.StringSplitOptions.RemoveEmptyEntries)
ComboBox1.Items.Add(Reso_avaible(1))
Next
SurroundingSub()
Try
ComboBox1.SelectedIndex = 0
Catch ex As Exception
End Try
ElseIf Main.DialogTaskString = "AoD_Resolution" Then
StatusLabel.Text = Main.LabelResoNotFoundText
Dim ResoList As New List(Of String)
Dim m3u8_split As String() = Main.ResoNotFoundString.Split(New String() {vbLf}, System.StringSplitOptions.RemoveEmptyEntries)
For i As Integer = 0 To m3u8_split.Count - 1
If InStr(m3u8_split(i), "RESOLUTION=") Then
ResoList.Add(m3u8_split(i))
End If
Next
Dim Reso_avaible1 As String() = Main.ResoNotFoundString.Split(New String() {"RESOLUTION="}, System.StringSplitOptions.RemoveEmptyEntries) Dim Reso_avaible1 As String() = Main.ResoNotFoundString.Split(New String() {"RESOLUTION="}, System.StringSplitOptions.RemoveEmptyEntries)
For i As Integer = 0 To ResoList.Count - 1 For i As Integer = 0 To ResoList.Count - 1
Dim Reso_avaible As String() = ResoList.Item(i).Split(New String() {"RESOLUTION="}, System.StringSplitOptions.RemoveEmptyEntries) Dim Reso_avaible As String() = ResoList.Item(i).Split(New String() {"RESOLUTION="}, System.StringSplitOptions.RemoveEmptyEntries)
@ -142,16 +162,16 @@
PictureBox9.Image = My.Resources.DialogNotFound_Submit PictureBox9.Image = My.Resources.DialogNotFound_Submit
End Sub End Sub
Private Sub pictureBox3_Click(sender As Object, e As EventArgs) Handles pictureBox3.Click Private Sub PictureBox3_Click(sender As Object, e As EventArgs) Handles pictureBox3.Click
Main.UserCloseDialog = True Main.UserCloseDialog = True
Me.Close() Me.Close()
End Sub End Sub
Private Sub pictureBox3_MouseEnter(sender As Object, e As EventArgs) Handles pictureBox3.MouseEnter Private Sub PictureBox3_MouseEnter(sender As Object, e As EventArgs) Handles pictureBox3.MouseEnter
pictureBox3.BackColor = SystemColors.Control pictureBox3.BackColor = SystemColors.Control
End Sub End Sub
Private Sub pictureBox3_MouseLeave(sender As Object, e As EventArgs) Handles pictureBox3.MouseLeave Private Sub PictureBox3_MouseLeave(sender As Object, e As EventArgs) Handles pictureBox3.MouseLeave
pictureBox3.BackColor = Color.Transparent pictureBox3.BackColor = Color.Transparent
End Sub End Sub

View File

@ -195,6 +195,7 @@ Public Class GeckoFX
Main.WebbrowserURL = WebBrowser1.Url.ToString Main.WebbrowserURL = WebBrowser1.Url.ToString
Main.WebbrowserText = WebBrowser1.Document.Body.OuterHtml Main.WebbrowserText = WebBrowser1.Document.Body.OuterHtml
Main.WebbrowserTitle = WebBrowser1.DocumentTitle Main.WebbrowserTitle = WebBrowser1.DocumentTitle
Anime_Add.AoDHTML = WebBrowser1.Document.Body.OuterHtml
Exit Sub Exit Sub

View File

@ -57,7 +57,6 @@ Public Class Main
Public ResoSave As String = "6666x6666" Public ResoSave As String = "6666x6666"
Public ResoFunBackup As String = "6666x6666" Public ResoFunBackup As String = "6666x6666"
Public SubSprache As String Public SubSprache As String
Public SubFolder As Integer
Public SoftSubs As New List(Of String) Public SoftSubs As New List(Of String)
Public TempSoftSubs As New List(Of String) Public TempSoftSubs As New List(Of String)
Public AbourtList As New List(Of String) Public AbourtList As New List(Of String)
@ -93,8 +92,6 @@ Public Class Main
Public SubFunimation As New List(Of String) Public SubFunimation As New List(Of String)
#Region "Sprachen Vairablen" #Region "Sprachen Vairablen"
Public URL_Invaild As String = "something is wrong here..." Public URL_Invaild As String = "something is wrong here..."
Public SubFolder_automatic As String = "[automatic : Series/Season]"
Public SubFolder_Nothing As String = "[ ignore subfolder ]"
Dim DL_Path_String As String = "Please choose download directory." Dim DL_Path_String As String = "Please choose download directory."
Public No_Stream As String = "Please make sure that the URL is correct or check if the Anime is available in your country." Public No_Stream As String = "Please make sure that the URL is correct or check if the Anime is available in your country."
@ -387,9 +384,9 @@ Public Class Main
Try Try
Dim rkg As RegistryKey = Registry.CurrentUser.OpenSubKey("Software\CRDownloader") Dim rkg As RegistryKey = Registry.CurrentUser.OpenSubKey("Software\CRDownloader")
SubFolder = Integer.Parse(rkg.GetValue("SubFolder").ToString) SubFolder_Value = rkg.GetValue("SubFolder_Value").ToString
Catch ex As Exception Catch ex As Exception
SubFolder = 1 SubFolder_Value = SubFolder_Nothing
End Try End Try
Try Try
@ -816,21 +813,14 @@ Public Class Main
Dim CR_Anime_Staffel As String = Nothing Dim CR_Anime_Staffel As String = Nothing
Dim CR_Anime_Folge As String = Nothing Dim CR_Anime_Folge As String = Nothing
#Region "Name + Pfad" #Region "Name + Pfad"
Dim Pfad2 As String Dim Pfad2 As String = Nothing
Dim CR_FilenName As String = Nothing Dim CR_FilenName As String = Nothing
Dim SubfolderValue As String = Nothing 'Dim SubfolderValue As String = Nothing
Dim CR_FilenName_Backup As String = Nothing Dim CR_FilenName_Backup As String = Nothing
#Region "Name von Crunchyroll" #Region "Name von Crunchyroll"
'Dim Bug_Deutsch As String = "-"
'If CBool(InStr(WebbrowserTitle, "Anschauen auf Crunchyroll")) Then
' Bug_Deutsch = ":"
'End If
'Dim CR_Name_by_Titel_2 As String() = WebbrowserTitle.Split(New String() {Bug_Deutsch}, System.StringSplitOptions.RemoveEmptyEntries)
'CR_FilenName = CR_Name_by_Titel_2(0).Trim()
Dim Bug_Deutsch As String = "-" Dim Bug_Deutsch As String = "-"
If CBool(InStr(WebbrowserTitle, "Anschauen auf Crunchyroll")) Then If CBool(InStr(WebbrowserTitle, "Anschauen auf Crunchyroll")) Then
Bug_Deutsch = ":" Bug_Deutsch = ":"
@ -884,11 +874,9 @@ Public Class Main
CR_FilenName = System.Text.RegularExpressions.Regex.Replace(CR_FilenName, "[^\w\\-]", " ") CR_FilenName = System.Text.RegularExpressions.Regex.Replace(CR_FilenName, "[^\w\\-]", " ")
CR_FilenName = RemoveExtraSpaces(CR_FilenName) CR_FilenName = RemoveExtraSpaces(CR_FilenName)
If SubfolderValue = Nothing Then Pfad2 = UseSubfolder(CR_Anime_Titel, CR_Anime_Staffel, Pfad)
Pfad2 = Pfad + "\" + CR_FilenName + ".mp4"
Else
Pfad2 = Pfad + "\" + SubfolderValue + CR_FilenName + ".mp4"
End If
If Not Directory.Exists(Path.GetDirectoryName(Pfad2)) Then If Not Directory.Exists(Path.GetDirectoryName(Pfad2)) Then
' Nein! Jetzt erstellen... ' Nein! Jetzt erstellen...
Try Try
@ -898,7 +886,8 @@ Public Class Main
Pfad2 = Pfad + "\" + CR_FilenName_Backup + ".mp4" Pfad2 = Pfad + "\" + CR_FilenName_Backup + ".mp4"
End Try End Try
End If End If
Pfad2 = Chr(34) + Pfad2 + Chr(34)
Pfad2 = Chr(34) + Pfad2 + CR_FilenName + ".mp4" + Chr(34)
#End Region #End Region
#Region "Subs" #Region "Subs"
@ -935,63 +924,7 @@ Public Class Main
Next Next
End If End If
#Region "copy paste trash"
'If SubSprache = "None" Then
' If CBool(InStr(WebbrowserText, Chr(34) + "hardsub_lang" + Chr(34) + ":null")) Then
' SubSprache2 = "null"
' Else
' Me.Invoke(New Action(Function()
' ResoNotFoundString = WebbrowserText
' DialogTaskString = "Language"
' Reso.ShowDialog()
' Return Nothing
' End Function))
' If UserCloseDialog = True Then
' Throw New System.Exception(Chr(34) + "UserAbort" + Chr(34))
' Else
' If ResoBackString = Nothing Then
' Else
' SubSprache2 = ResoBackString
' End If
' End If
' 'Throw New System.Exception("Could not find the sub language")
' End If
'Else
' If CBool(InStr(WebbrowserText, Chr(34) + "hardsub_lang" + Chr(34) + ":" + Chr(34) + SubSprache + Chr(34) + ",")) Then
' SubSprache2 = Chr(34) + SubSprache + Chr(34)
' ElseIf CBool(InStr(WebbrowserText, Chr(34) + "language" + Chr(34) + ":" + Chr(34) + SubSprache + Chr(34) + ",")) Then
' If MessageBox.Show("It look like only Softsubtitle are avalibe." + vbNewLine + "Are you want to use Softsubtitle this time instead?", "No Hardsubtitle", MessageBoxButtons.YesNo) = DialogResult.Yes Then
' SubSprache2 = "null"
' SoftSubs2.Add(SubSprache)
' Else
' Throw New System.Exception("Could not find the sub language")
' End If
' Else
' Me.Invoke(New Action(Function()
' ResoNotFoundString = WebbrowserText
' DialogTaskString = "Language"
' Reso.ShowDialog()
' Return Nothing
' End Function))
' If UserCloseDialog = True Then
' Throw New System.Exception(Chr(34) + "UserAbort" + Chr(34))
' Else
' If ResoBackString = Nothing Then
' Else
' SubSprache2 = ResoBackString
' End If
' End If
' End If
'End If
#End Region
#End Region #End Region
If Grapp_Abord = True Then If Grapp_Abord = True Then
@ -1325,7 +1258,6 @@ Public Class Main
Dim Pfad2 As String Dim Pfad2 As String
Dim TextBox2_Text As String = Nothing Dim TextBox2_Text As String = Nothing
Dim CR_FilenName As String = Nothing Dim CR_FilenName As String = Nothing
Dim SubfolderValue As String = Nothing
Dim CR_FilenName_Backup As String = Nothing Dim CR_FilenName_Backup As String = Nothing
Me.Invoke(New Action(Function() Me.Invoke(New Action(Function()
@ -1333,7 +1265,7 @@ Public Class Main
Return Nothing Return Nothing
End Function)) End Function))
#Region "Name von Crunchyroll" #Region "Name von Crunchyroll"
If TextBox2_Text = Nothing Or TextBox2_Text = "Name of the Anime" Then
Dim Bug_Deutsch As String = "-" Dim Bug_Deutsch As String = "-"
If CBool(InStr(WebbrowserTitle, "Anschauen auf Crunchyroll")) Then If CBool(InStr(WebbrowserTitle, "Anschauen auf Crunchyroll")) Then
Bug_Deutsch = ":" Bug_Deutsch = ":"
@ -1414,48 +1346,18 @@ Public Class Main
#End Region #End Region
If TextBox2_Text = Nothing Or TextBox2_Text = "Name of the Anime" Then
Else Else
Me.Invoke(New Action(Function()
If Anime_Add.ComboBox2.Text = SubFolder_automatic Then
MsgBox(SubFolder_automatic + " is not working with a costum name", MsgBoxStyle.Information)
ElseIf Anime_Add.ComboBox2.Text = SubFolder_Nothing Then
Else
SubfolderValue = Anime_Add.ComboBox2.Text + "\"
End If
Return Nothing
End Function))
'MsgBox(TextBox2_Text)
CR_FilenName = RemoveExtraSpaces(System.Text.RegularExpressions.Regex.Replace(TextBox2_Text, "[^\w\\-]", " ")) CR_FilenName = RemoveExtraSpaces(System.Text.RegularExpressions.Regex.Replace(TextBox2_Text, "[^\w\\-]", " "))
CR_FilenName_Backup = CR_FilenName CR_FilenName_Backup = CR_FilenName
End If End If
Me.Invoke(New Action(Function()
If Anime_Add.ComboBox2.Text = SubFolder_automatic Then
If SubFolder = 2 Then
SubfolderValue = CR_Anime_Titel + "\" + CR_Anime_Staffel + "\"
ElseIf SubFolder = 1 Then
SubfolderValue = CR_Anime_Titel + "\"
End If
ElseIf Anime_Add.ComboBox2.Text = SubFolder_Nothing Then
Else
SubfolderValue = Anime_Add.ComboBox2.Text + "\"
End If
Return Nothing
End Function))
CR_FilenName = System.Text.RegularExpressions.Regex.Replace(CR_FilenName, "[^\w\\-]", " ") CR_FilenName = System.Text.RegularExpressions.Regex.Replace(CR_FilenName, "[^\w\\-]", " ")
CR_FilenName = RemoveExtraSpaces(CR_FilenName) CR_FilenName = RemoveExtraSpaces(CR_FilenName)
'MsgBox(Pfad)
If SubfolderValue = Nothing Then Pfad2 = UseSubfolder(CR_Anime_Titel, CR_Anime_Staffel, Pfad)
Pfad2 = Pfad + "\" + CR_FilenName + ".mp4"
'MsgBox(Pfad + vbNewLine + Pfad2)
ElseIf SubfolderValue = "\" Then
Pfad2 = Pfad + "\" + CR_FilenName + ".mp4"
'MsgBox(Pfad + vbNewLine + Pfad2)
Else
Pfad2 = Pfad + "\" + SubfolderValue + CR_FilenName + ".mp4"
'MsgBox(Pfad + vbNewLine + Pfad2 + vbNewLine + SubfolderValue)
End If
If Not Directory.Exists(Path.GetDirectoryName(Pfad2)) Then If Not Directory.Exists(Path.GetDirectoryName(Pfad2)) Then
' Nein! Jetzt erstellen... ' Nein! Jetzt erstellen...
Try Try
@ -1465,7 +1367,8 @@ Public Class Main
Pfad2 = Pfad + "\" + CR_FilenName_Backup + ".mp4" Pfad2 = Pfad + "\" + CR_FilenName_Backup + ".mp4"
End Try End Try
End If End If
Pfad2 = Chr(34) + Pfad2 + Chr(34)
Pfad2 = Chr(34) + Pfad2 + "\" + CR_FilenName + ".mp4" + Chr(34)
#End Region #End Region
#Region "Subs" #Region "Subs"
@ -2209,7 +2112,6 @@ Public Class Main
#Region "Pfad" #Region "Pfad"
Dim TextBox2_Text As String = Nothing Dim TextBox2_Text As String = Nothing
Dim SubfolderValue As String = Nothing
Me.Invoke(New Action(Function() Me.Invoke(New Action(Function()
TextBox2_Text = Anime_Add.textBox2.Text TextBox2_Text = Anime_Add.textBox2.Text
Return Nothing Return Nothing
@ -2219,35 +2121,15 @@ Public Class Main
Else Else
Me.Invoke(New Action(Function() Me.Invoke(New Action(Function()
If Anime_Add.ComboBox2.Text = SubFolder_automatic Then
MsgBox(SubFolder_automatic + " is not working with a costum name", MsgBoxStyle.Information)
ElseIf Anime_Add.ComboBox2.Text = SubFolder_Nothing Then
Else
SubfolderValue = Anime_Add.ComboBox2.Text + "\"
End If
Return Nothing Return Nothing
End Function)) End Function))
End If End If
Me.Invoke(New Action(Function()
If Anime_Add.ComboBox2.Text = SubFolder_automatic Then
If SubFolder = 2 Then
SubfolderValue = FunimationTitle + "\" + FunimationSeason + "\"
ElseIf SubFolder = 1 Then
SubfolderValue = FunimationTitle + "\"
End If
ElseIf Anime_Add.ComboBox2.Text = SubFolder_Nothing Then
Else
SubfolderValue = Anime_Add.ComboBox2.Text + "\"
End If
Return Nothing
End Function))
If SubfolderValue = Nothing Then
DownloadPfad = Pfad + "\" + DefaultName + ".mp4" DownloadPfad = UseSubfolder(FunimationTitle, FunimationEpisode, Pfad)
Else
DownloadPfad = Pfad + "\" + SubfolderValue + DefaultName + ".mp4"
End If
If Not Directory.Exists(Path.GetDirectoryName(DownloadPfad)) Then If Not Directory.Exists(Path.GetDirectoryName(DownloadPfad)) Then
' Nein! Jetzt erstellen... ' Nein! Jetzt erstellen...
Try Try
@ -2258,6 +2140,9 @@ Public Class Main
End Try End Try
End If End If
DownloadPfad = DownloadPfad + DefaultName + ".mp4"
#Region "lösche doppel download" #Region "lösche doppel download"
Dim Pfad5 As String = DownloadPfad.Replace(Chr(34), "") Dim Pfad5 As String = DownloadPfad.Replace(Chr(34), "")
@ -2861,7 +2746,7 @@ Public Class Main
bytes = clientSocket.Receive(recvBytes, 0, clientSocket.Available, SocketFlags.None) bytes = clientSocket.Receive(recvBytes, 0, clientSocket.Available, SocketFlags.None)
htmlReq = Encoding.UTF8.GetString(recvBytes, 0, bytes) htmlReq = Encoding.UTF8.GetString(recvBytes, 0, bytes)
'MsgBox(htmlReq) 'MsgBox(htmlReq)
'My.Computer.FileSystem.WriteAllText(Application.StartupPath + "\log.txt", htmlReq + vbNewLine, True) My.Computer.FileSystem.WriteAllText(Application.StartupPath + "\log.txt", htmlReq + vbNewLine, True)
Dim rootPath As String = Directory.GetCurrentDirectory() & "\WebInterface\" Dim rootPath As String = Directory.GetCurrentDirectory() & "\WebInterface\"
' Set default page ' Set default page
Dim defaultPage As String = "index.html" Dim defaultPage As String = "index.html"
@ -3088,7 +2973,7 @@ Public Class Main
' Send HTTP Response ' Send HTTP Response
Private Sub sendHTMLResponse(ByVal httpRequest As String, ByVal clientSocket As Socket) Private Sub SendHTMLResponse(ByVal httpRequest As String, ByVal clientSocket As Socket)
Try Try
Dim respByte() As Byte Dim respByte() As Byte
@ -3144,7 +3029,7 @@ Public Class Main
End Sub End Sub
' Get Content Type ' Get Content Type
Private Function getContentType(ByVal httpRequest As String) As String Private Function GetContentType(ByVal httpRequest As String) As String
If (httpRequest.EndsWith("html")) Then If (httpRequest.EndsWith("html")) Then
Return "text/html" Return "text/html"
ElseIf (httpRequest.EndsWith("htm")) Then ElseIf (httpRequest.EndsWith("htm")) Then

View File

@ -129,6 +129,24 @@ Namespace My.Resources
End Get End Get
End Property End Property
'''<summary>
''' Sucht eine lokalisierte Zeichenfolge, die &lt;h1 itemprop=&quot;name&quot;&gt; ähnelt.
'''</summary>
Friend ReadOnly Property AoD_HTML_Anime_Title() As String
Get
Return ResourceManager.GetString("AoD_HTML_Anime_Title", resourceCulture)
End Get
End Property
'''<summary>
''' Sucht eine lokalisierte Zeichenfolge, die &lt;h3 class=&quot;episodebox-title&quot; title=&quot; ähnelt.
'''</summary>
Friend ReadOnly Property AoD_HTML_Episode_Title() As String
Get
Return ResourceManager.GetString("AoD_HTML_Episode_Title", resourceCulture)
End Get
End Property
'''<summary> '''<summary>
''' Sucht eine lokalisierte Zeichenfolge, die &quot;image&quot;:&quot; ähnelt. ''' Sucht eine lokalisierte Zeichenfolge, die &quot;image&quot;:&quot; ähnelt.
'''</summary> '''</summary>

View File

@ -520,4 +520,10 @@ Dialogue: 0,0:00:00.00,0:00:00.00,Default,,0000,0000,0000,,some ideas on how tem
<data name="Funimation_subs_src" xml:space="preserve"> <data name="Funimation_subs_src" xml:space="preserve">
<value>{"src": "</value> <value>{"src": "</value>
</data> </data>
<data name="AoD_HTML_Anime_Title" xml:space="preserve">
<value>&lt;h1 itemprop="name"&gt;</value>
</data>
<data name="AoD_HTML_Episode_Title" xml:space="preserve">
<value>&lt;h3 class="episodebox-title" title="</value>
</data>
</root> </root>

View File

@ -0,0 +1,34 @@
Module Subfolder
Public SubFolder_automatic As String = "[automatic by Series and Season]"
Public SubFolder_automatic2 As String = "[automatic by Series]"
Public SubFolder_Nothing As String = "[ ignore subfolder ]"
Public SubFolder_Value As String = "[ ignore subfolder ]"
Public Function UseSubfolder(ByVal Series As String, ByVal Season As String, ByVal Path As String)
Dim newPath As String = Path
If SubFolder_Value = SubFolder_automatic Then
newPath = Path + "\" + Series + "\" + Season + "\"
ElseIf SubFolder_Value = SubFolder_automatic2 Then
newPath = Path + "\" + Series + "\"
ElseIf SubFolder_Value = SubFolder_Nothing Then
newPath = Path
Else
newPath = Path + "\" + SubFolder_Value + "\"
End If
Return newPath.Replace("\\", "\")
End Function
End Module

View File

@ -57,6 +57,16 @@ Crunchyroll Downloader
Sucht eine lokalisierte Zeichenfolge, die {&quot;sources&quot;:[{&quot;file&quot;:&quot; ähnelt. Sucht eine lokalisierte Zeichenfolge, die {&quot;sources&quot;:[{&quot;file&quot;:&quot; ähnelt.
</summary> </summary>
</member> </member>
<member name="P:Crunchyroll_Downloader.My.Resources.Resources.AoD_HTML_Anime_Title">
<summary>
Sucht eine lokalisierte Zeichenfolge, die &lt;h1 itemprop=&quot;name&quot;&gt; ähnelt.
</summary>
</member>
<member name="P:Crunchyroll_Downloader.My.Resources.Resources.AoD_HTML_Episode_Title">
<summary>
Sucht eine lokalisierte Zeichenfolge, die &lt;h3 class=&quot;episodebox-title&quot; title=&quot; ähnelt.
</summary>
</member>
<member name="P:Crunchyroll_Downloader.My.Resources.Resources.AoD_Image"> <member name="P:Crunchyroll_Downloader.My.Resources.Resources.AoD_Image">
<summary> <summary>
Sucht eine lokalisierte Zeichenfolge, die &quot;image&quot;:&quot; ähnelt. Sucht eine lokalisierte Zeichenfolge, die &quot;image&quot;:&quot; ähnelt.

Binary file not shown.

After

Width:  |  Height:  |  Size: 31 KiB

View File

@ -27,9 +27,37 @@
.liClass{margin-bottom:8px} .liClass{margin-bottom:8px}
</style> </style>
<body id="bodypage" class="main-bg" > <body id="bodypage" class="main-bg" >
<a class="main_titel">Crunchyroll Downloader</a> <a class="main_titel">Status: 1 / 1</a>
<img alt="image error" src="balken.png" class="class-balken"> <img alt="image error" src="balken.png" class="class-balken">
<div class="div-episode">
<img alt="image error" src="https://s3-eu-central-1.amazonaws.com/aod-static/episodes/screenshots/000/004/804/thumb/6a79285bebb22617eff6795cacf59a9e0bfb8407.jpg?1583855488" class="imagestyle">
<div>
<span class="titel" dir="auto"><br>ARIFURETA Sub Episode 3 Die goldene Vampirprinzessin</span>
<div class="progressbar">
<div class="progressbar-value" style="width:100%"></div>
</div>
<span dir="auto" class='percenttext'>Finished - 224,72MB</span>
<div>
<br>
<span dir="auto" class="resotext">[Auto]</span>
<a href="#" class="cc-wert" title="Softsubs:
None"> <img alt="image error" src="cc.png" class="class-cc">null</a>
</div>
</div>
</div>
<img alt="image error" src="balken.png" class="class-balken"><!-- ARIFURETA Sub Episode 3 Die goldene Vampirprinzessin-->
<script> <script>
setInterval(function loadXMLDoc() { setInterval(function loadXMLDoc() {

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,42 @@

GET /balken.png HTTP/1.1
Host: 127.0.0.1
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:83.0) Gecko/20100101 Firefox/83.0
Accept: image/webp,*/*
Accept-Language: de,en-US;q=0.7,en;q=0.3
Accept-Encoding: gzip, deflate
Referer: http://127.0.0.1/
Connection: keep-alive
GET / HTTP/1.1
Host: 127.0.0.1
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:83.0) Gecko/20100101 Firefox/83.0
Accept: */*
Accept-Language: de,en-US;q=0.7,en;q=0.3
Accept-Encoding: gzip, deflate
Referer: http://127.0.0.1/
Connection: keep-alive
GET /balken.png HTTP/1.1
Host: 127.0.0.1
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:83.0) Gecko/20100101 Firefox/83.0
Accept: image/webp,*/*
Accept-Language: de,en-US;q=0.7,en;q=0.3
Accept-Encoding: gzip, deflate
Referer: http://127.0.0.1/post
Connection: keep-alive
GET / HTTP/1.1
Host: 127.0.0.1
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:83.0) Gecko/20100101 Firefox/83.0
Accept: */*
Accept-Language: de,en-US;q=0.7,en;q=0.3
Accept-Encoding: gzip, deflate
Referer: http://127.0.0.1/post
Connection: keep-alive

View File

@ -1,5 +1,5 @@
<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> <Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
Partial Class einstellungen Partial Class Einstellungen
Inherits MetroFramework.Forms.MetroForm Inherits MetroFramework.Forms.MetroForm
'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
@ -24,8 +24,6 @@ Partial Class einstellungen
Private Sub InitializeComponent() Private Sub InitializeComponent()
Me.components = New System.ComponentModel.Container() Me.components = New System.ComponentModel.Container()
Me.ToolTip1 = New System.Windows.Forms.ToolTip(Me.components) Me.ToolTip1 = New System.Windows.Forms.ToolTip(Me.components)
Me.RBStaffel = New System.Windows.Forms.RadioButton()
Me.RBAnime = New System.Windows.Forms.RadioButton()
Me.pictureBox1 = New System.Windows.Forms.PictureBox() Me.pictureBox1 = New System.Windows.Forms.PictureBox()
Me.pictureBox4 = New System.Windows.Forms.PictureBox() Me.pictureBox4 = New System.Windows.Forms.PictureBox()
Me.ToolTip2 = New System.Windows.Forms.ToolTip(Me.components) Me.ToolTip2 = New System.Windows.Forms.ToolTip(Me.components)
@ -57,10 +55,11 @@ Partial Class einstellungen
Me.ComboBox2 = New System.Windows.Forms.ComboBox() Me.ComboBox2 = New System.Windows.Forms.ComboBox()
Me.comboBox3 = New System.Windows.Forms.ComboBox() Me.comboBox3 = New System.Windows.Forms.ComboBox()
Me.TabPage2 = New MetroFramework.Controls.MetroTabPage() Me.TabPage2 = New MetroFramework.Controls.MetroTabPage()
Me.GroupBox12 = New System.Windows.Forms.GroupBox()
Me.CR_Filename = New System.Windows.Forms.ComboBox()
Me.GroupBox4 = New System.Windows.Forms.GroupBox() Me.GroupBox4 = New System.Windows.Forms.GroupBox()
Me.HybridMode_CB = New System.Windows.Forms.CheckBox() Me.HybridMode_CB = New System.Windows.Forms.CheckBox()
Me.MergeMP4 = New System.Windows.Forms.CheckBox() Me.MergeMP4 = New System.Windows.Forms.CheckBox()
Me.GB_Sub_Path = New System.Windows.Forms.GroupBox()
Me.CheckBox1 = New System.Windows.Forms.CheckBox() Me.CheckBox1 = New System.Windows.Forms.CheckBox()
Me.GroupBox2 = New System.Windows.Forms.GroupBox() Me.GroupBox2 = New System.Windows.Forms.GroupBox()
Me.Panel1 = New System.Windows.Forms.Panel() Me.Panel1 = New System.Windows.Forms.Panel()
@ -134,8 +133,6 @@ Partial Class einstellungen
Me.Label5 = New System.Windows.Forms.Label() Me.Label5 = New System.Windows.Forms.Label()
Me.MetroStyleManager1 = New MetroFramework.Components.MetroStyleManager(Me.components) Me.MetroStyleManager1 = New MetroFramework.Components.MetroStyleManager(Me.components)
Me.MetroStyleExtender1 = New MetroFramework.Components.MetroStyleExtender(Me.components) Me.MetroStyleExtender1 = New MetroFramework.Components.MetroStyleExtender(Me.components)
Me.GroupBox12 = New System.Windows.Forms.GroupBox()
Me.CR_Filename = New System.Windows.Forms.ComboBox()
CType(Me.pictureBox1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.pictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.pictureBox4, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.pictureBox4, System.ComponentModel.ISupportInitialize).BeginInit()
Me.TabPage4.SuspendLayout() Me.TabPage4.SuspendLayout()
@ -150,8 +147,8 @@ Partial Class einstellungen
Me.MultiDLSoftSubs.SuspendLayout() Me.MultiDLSoftSubs.SuspendLayout()
CType(Me.PictureBox3, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox3, System.ComponentModel.ISupportInitialize).BeginInit()
Me.TabPage2.SuspendLayout() Me.TabPage2.SuspendLayout()
Me.GroupBox12.SuspendLayout()
Me.GroupBox4.SuspendLayout() Me.GroupBox4.SuspendLayout()
Me.GB_Sub_Path.SuspendLayout()
Me.GroupBox2.SuspendLayout() Me.GroupBox2.SuspendLayout()
Me.Panel1.SuspendLayout() Me.Panel1.SuspendLayout()
Me.MenuStrip1.SuspendLayout() Me.MenuStrip1.SuspendLayout()
@ -175,7 +172,6 @@ Partial Class einstellungen
CType(Me.PictureBox7, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox7, System.ComponentModel.ISupportInitialize).BeginInit()
Me.Panel2.SuspendLayout() Me.Panel2.SuspendLayout()
CType(Me.MetroStyleManager1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.MetroStyleManager1, System.ComponentModel.ISupportInitialize).BeginInit()
Me.GroupBox12.SuspendLayout()
Me.SuspendLayout() Me.SuspendLayout()
' '
'ToolTip1 'ToolTip1
@ -185,34 +181,6 @@ Partial Class einstellungen
Me.ToolTip1.IsBalloon = True Me.ToolTip1.IsBalloon = True
Me.ToolTip1.ReshowDelay = 100 Me.ToolTip1.ReshowDelay = 100
' '
'RBStaffel
'
Me.RBStaffel.AutoSize = True
Me.RBStaffel.Font = New System.Drawing.Font("Arial", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.RBStaffel.ForeColor = System.Drawing.Color.Black
Me.RBStaffel.Location = New System.Drawing.Point(24, 21)
Me.RBStaffel.Name = "RBStaffel"
Me.RBStaffel.Size = New System.Drawing.Size(174, 22)
Me.RBStaffel.TabIndex = 1
Me.RBStaffel.TabStop = True
Me.RBStaffel.Text = "Anime Serie + Staffel"
Me.ToolTip1.SetToolTip(Me.RBStaffel, "Erstelle je einen Ordner für den Anime und darin einen für die Staffel")
Me.RBStaffel.UseVisualStyleBackColor = True
'
'RBAnime
'
Me.RBAnime.AutoSize = True
Me.RBAnime.Font = New System.Drawing.Font("Arial", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.RBAnime.ForeColor = System.Drawing.Color.Black
Me.RBAnime.Location = New System.Drawing.Point(285, 21)
Me.RBAnime.Name = "RBAnime"
Me.RBAnime.Size = New System.Drawing.Size(113, 22)
Me.RBAnime.TabIndex = 1
Me.RBAnime.TabStop = True
Me.RBAnime.Text = "Anime Serie"
Me.ToolTip1.SetToolTip(Me.RBAnime, "Erstelle einen Ordner für den Anime, unabhänig der Staffeln")
Me.RBAnime.UseVisualStyleBackColor = True
'
'pictureBox1 'pictureBox1
' '
Me.pictureBox1.BackColor = System.Drawing.Color.Transparent Me.pictureBox1.BackColor = System.Drawing.Color.Transparent
@ -606,7 +574,6 @@ Partial Class einstellungen
Me.TabPage2.BackColor = System.Drawing.Color.FromArgb(CType(CType(243, Byte), Integer), CType(CType(243, Byte), Integer), CType(CType(243, Byte), Integer)) Me.TabPage2.BackColor = System.Drawing.Color.FromArgb(CType(CType(243, Byte), Integer), CType(CType(243, Byte), Integer), CType(CType(243, Byte), Integer))
Me.TabPage2.Controls.Add(Me.GroupBox12) Me.TabPage2.Controls.Add(Me.GroupBox12)
Me.TabPage2.Controls.Add(Me.GroupBox4) Me.TabPage2.Controls.Add(Me.GroupBox4)
Me.TabPage2.Controls.Add(Me.GB_Sub_Path)
Me.TabPage2.Controls.Add(Me.CheckBox1) Me.TabPage2.Controls.Add(Me.CheckBox1)
Me.TabPage2.Controls.Add(Me.GroupBox2) Me.TabPage2.Controls.Add(Me.GroupBox2)
Me.TabPage2.Controls.Add(Me.GB_Resolution) Me.TabPage2.Controls.Add(Me.GB_Resolution)
@ -624,6 +591,34 @@ Partial Class einstellungen
Me.TabPage2.VerticalScrollbarSize = 10 Me.TabPage2.VerticalScrollbarSize = 10
Me.TabPage2.Visible = False Me.TabPage2.Visible = False
' '
'GroupBox12
'
Me.GroupBox12.BackColor = System.Drawing.Color.Transparent
Me.GroupBox12.Controls.Add(Me.CR_Filename)
Me.GroupBox12.Font = New System.Drawing.Font("Arial", 9.75!)
Me.GroupBox12.ForeColor = System.Drawing.Color.Black
Me.GroupBox12.Location = New System.Drawing.Point(8, 144)
Me.GroupBox12.Name = "GroupBox12"
Me.GroupBox12.Size = New System.Drawing.Size(479, 63)
Me.GroupBox12.TabIndex = 53
Me.GroupBox12.TabStop = False
Me.GroupBox12.Text = "Filename"
'
'CR_Filename
'
Me.CR_Filename.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed
Me.CR_Filename.DropDownHeight = 250
Me.CR_Filename.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
Me.CR_Filename.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.CR_Filename.FormattingEnabled = True
Me.CR_Filename.IntegralHeight = False
Me.CR_Filename.ItemHeight = 16
Me.CR_Filename.Items.AddRange(New Object() {"[episode number]", "[episode name]", "[episode number] [episode name]"})
Me.CR_Filename.Location = New System.Drawing.Point(63, 25)
Me.CR_Filename.Name = "CR_Filename"
Me.CR_Filename.Size = New System.Drawing.Size(326, 22)
Me.CR_Filename.TabIndex = 34
'
'GroupBox4 'GroupBox4
' '
Me.GroupBox4.BackColor = System.Drawing.Color.Transparent Me.GroupBox4.BackColor = System.Drawing.Color.Transparent
@ -631,9 +626,9 @@ Partial Class einstellungen
Me.GroupBox4.Controls.Add(Me.MergeMP4) Me.GroupBox4.Controls.Add(Me.MergeMP4)
Me.GroupBox4.Font = New System.Drawing.Font("Arial", 9.75!) Me.GroupBox4.Font = New System.Drawing.Font("Arial", 9.75!)
Me.GroupBox4.ForeColor = System.Drawing.Color.Black Me.GroupBox4.ForeColor = System.Drawing.Color.Black
Me.GroupBox4.Location = New System.Drawing.Point(7, 9) Me.GroupBox4.Location = New System.Drawing.Point(8, 9)
Me.GroupBox4.Name = "GroupBox4" Me.GroupBox4.Name = "GroupBox4"
Me.GroupBox4.Size = New System.Drawing.Size(480, 58) Me.GroupBox4.Size = New System.Drawing.Size(479, 58)
Me.GroupBox4.TabIndex = 42 Me.GroupBox4.TabIndex = 42
Me.GroupBox4.TabStop = False Me.GroupBox4.TabStop = False
' '
@ -660,27 +655,13 @@ Partial Class einstellungen
Me.MergeMP4.Text = "Merge soft-subs with video file" Me.MergeMP4.Text = "Merge soft-subs with video file"
Me.MergeMP4.UseVisualStyleBackColor = True Me.MergeMP4.UseVisualStyleBackColor = True
' '
'GB_Sub_Path
'
Me.GB_Sub_Path.BackColor = System.Drawing.Color.Transparent
Me.GB_Sub_Path.Controls.Add(Me.RBStaffel)
Me.GB_Sub_Path.Controls.Add(Me.RBAnime)
Me.GB_Sub_Path.Font = New System.Drawing.Font("Arial", 9.75!)
Me.GB_Sub_Path.ForeColor = System.Drawing.Color.Black
Me.GB_Sub_Path.Location = New System.Drawing.Point(7, 132)
Me.GB_Sub_Path.Name = "GB_Sub_Path"
Me.GB_Sub_Path.Size = New System.Drawing.Size(480, 58)
Me.GB_Sub_Path.TabIndex = 41
Me.GB_Sub_Path.TabStop = False
Me.GB_Sub_Path.Text = "Unterordner "
'
'CheckBox1 'CheckBox1
' '
Me.CheckBox1.AutoSize = True Me.CheckBox1.AutoSize = True
Me.CheckBox1.BackColor = System.Drawing.Color.Transparent Me.CheckBox1.BackColor = System.Drawing.Color.Transparent
Me.CheckBox1.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.CheckBox1.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.CheckBox1.ForeColor = System.Drawing.Color.Black Me.CheckBox1.ForeColor = System.Drawing.Color.Black
Me.CheckBox1.Location = New System.Drawing.Point(65, 285) Me.CheckBox1.Location = New System.Drawing.Point(66, 219)
Me.CheckBox1.Name = "CheckBox1" Me.CheckBox1.Name = "CheckBox1"
Me.CheckBox1.Size = New System.Drawing.Size(351, 20) Me.CheckBox1.Size = New System.Drawing.Size(351, 20)
Me.CheckBox1.TabIndex = 6 Me.CheckBox1.TabIndex = 6
@ -694,7 +675,7 @@ Partial Class einstellungen
Me.GroupBox2.Enabled = False Me.GroupBox2.Enabled = False
Me.GroupBox2.Font = New System.Drawing.Font("Arial", 9.75!) Me.GroupBox2.Font = New System.Drawing.Font("Arial", 9.75!)
Me.GroupBox2.ForeColor = System.Drawing.Color.Black Me.GroupBox2.ForeColor = System.Drawing.Color.Black
Me.GroupBox2.Location = New System.Drawing.Point(6, 311) Me.GroupBox2.Location = New System.Drawing.Point(7, 245)
Me.GroupBox2.Name = "GroupBox2" Me.GroupBox2.Name = "GroupBox2"
Me.GroupBox2.Size = New System.Drawing.Size(480, 63) Me.GroupBox2.Size = New System.Drawing.Size(480, 63)
Me.GroupBox2.TabIndex = 40 Me.GroupBox2.TabIndex = 40
@ -846,9 +827,9 @@ Partial Class einstellungen
Me.GB_Resolution.Controls.Add(Me.A1080p) Me.GB_Resolution.Controls.Add(Me.A1080p)
Me.GB_Resolution.Font = New System.Drawing.Font("Arial", 9.75!) Me.GB_Resolution.Font = New System.Drawing.Font("Arial", 9.75!)
Me.GB_Resolution.ForeColor = System.Drawing.Color.Black Me.GB_Resolution.ForeColor = System.Drawing.Color.Black
Me.GB_Resolution.Location = New System.Drawing.Point(6, 73) Me.GB_Resolution.Location = New System.Drawing.Point(8, 73)
Me.GB_Resolution.Name = "GB_Resolution" Me.GB_Resolution.Name = "GB_Resolution"
Me.GB_Resolution.Size = New System.Drawing.Size(481, 53) Me.GB_Resolution.Size = New System.Drawing.Size(479, 53)
Me.GB_Resolution.TabIndex = 38 Me.GB_Resolution.TabIndex = 38
Me.GB_Resolution.TabStop = False Me.GB_Resolution.TabStop = False
Me.GB_Resolution.Text = "Auflösung" Me.GB_Resolution.Text = "Auflösung"
@ -1046,7 +1027,7 @@ Partial Class einstellungen
' '
'Label1 'Label1
' '
Me.Label1.Location = New System.Drawing.Point(6, 25) Me.Label1.Location = New System.Drawing.Point(6, 20)
Me.Label1.Name = "Label1" Me.Label1.Name = "Label1"
Me.Label1.Size = New System.Drawing.Size(469, 22) Me.Label1.Size = New System.Drawing.Size(469, 22)
Me.Label1.TabIndex = 2 Me.Label1.TabIndex = 2
@ -1055,7 +1036,7 @@ Partial Class einstellungen
' '
'TextBox1 'TextBox1
' '
Me.TextBox1.Location = New System.Drawing.Point(6, 54) Me.TextBox1.Location = New System.Drawing.Point(6, 50)
Me.TextBox1.Name = "TextBox1" Me.TextBox1.Name = "TextBox1"
Me.TextBox1.Size = New System.Drawing.Size(469, 22) Me.TextBox1.Size = New System.Drawing.Size(469, 22)
Me.TextBox1.TabIndex = 1 Me.TextBox1.TabIndex = 1
@ -1097,7 +1078,7 @@ Partial Class einstellungen
Me.TabControl1.FontWeight = MetroFramework.MetroTabControlWeight.Regular Me.TabControl1.FontWeight = MetroFramework.MetroTabControlWeight.Regular
Me.TabControl1.Location = New System.Drawing.Point(22, 45) Me.TabControl1.Location = New System.Drawing.Point(22, 45)
Me.TabControl1.Name = "TabControl1" Me.TabControl1.Name = "TabControl1"
Me.TabControl1.SelectedIndex = 1 Me.TabControl1.SelectedIndex = 0
Me.TabControl1.Size = New System.Drawing.Size(501, 500) Me.TabControl1.Size = New System.Drawing.Size(501, 500)
Me.TabControl1.TabIndex = 38 Me.TabControl1.TabIndex = 38
Me.TabControl1.UseSelectable = True Me.TabControl1.UseSelectable = True
@ -1472,35 +1453,7 @@ Partial Class einstellungen
' '
Me.MetroStyleManager1.Owner = Nothing Me.MetroStyleManager1.Owner = Nothing
' '
'GroupBox12 'Einstellungen
'
Me.GroupBox12.BackColor = System.Drawing.Color.Transparent
Me.GroupBox12.Controls.Add(Me.CR_Filename)
Me.GroupBox12.Font = New System.Drawing.Font("Arial", 9.75!)
Me.GroupBox12.ForeColor = System.Drawing.Color.Black
Me.GroupBox12.Location = New System.Drawing.Point(11, 195)
Me.GroupBox12.Name = "GroupBox12"
Me.GroupBox12.Size = New System.Drawing.Size(470, 63)
Me.GroupBox12.TabIndex = 53
Me.GroupBox12.TabStop = False
Me.GroupBox12.Text = "Filename"
'
'CR_Filename
'
Me.CR_Filename.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed
Me.CR_Filename.DropDownHeight = 250
Me.CR_Filename.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
Me.CR_Filename.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.CR_Filename.FormattingEnabled = True
Me.CR_Filename.IntegralHeight = False
Me.CR_Filename.ItemHeight = 16
Me.CR_Filename.Items.AddRange(New Object() {"[episode number]", "[episode name]", "[episode number] [episode name]"})
Me.CR_Filename.Location = New System.Drawing.Point(63, 25)
Me.CR_Filename.Name = "CR_Filename"
Me.CR_Filename.Size = New System.Drawing.Size(326, 22)
Me.CR_Filename.TabIndex = 34
'
'einstellungen
' '
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
@ -1514,7 +1467,7 @@ Partial Class einstellungen
Me.ForeColor = System.Drawing.Color.Black Me.ForeColor = System.Drawing.Color.Black
Me.MaximizeBox = False Me.MaximizeBox = False
Me.MinimizeBox = False Me.MinimizeBox = False
Me.Name = "einstellungen" Me.Name = "Einstellungen"
Me.Text = " " Me.Text = " "
Me.TextAlign = MetroFramework.Forms.MetroFormTextAlign.Center Me.TextAlign = MetroFramework.Forms.MetroFormTextAlign.Center
CType(Me.pictureBox1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.pictureBox1, System.ComponentModel.ISupportInitialize).EndInit()
@ -1535,10 +1488,9 @@ Partial Class einstellungen
CType(Me.PictureBox3, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PictureBox3, System.ComponentModel.ISupportInitialize).EndInit()
Me.TabPage2.ResumeLayout(False) Me.TabPage2.ResumeLayout(False)
Me.TabPage2.PerformLayout() Me.TabPage2.PerformLayout()
Me.GroupBox12.ResumeLayout(False)
Me.GroupBox4.ResumeLayout(False) Me.GroupBox4.ResumeLayout(False)
Me.GroupBox4.PerformLayout() Me.GroupBox4.PerformLayout()
Me.GB_Sub_Path.ResumeLayout(False)
Me.GB_Sub_Path.PerformLayout()
Me.GroupBox2.ResumeLayout(False) Me.GroupBox2.ResumeLayout(False)
Me.Panel1.ResumeLayout(False) Me.Panel1.ResumeLayout(False)
Me.Panel1.PerformLayout() Me.Panel1.PerformLayout()
@ -1571,7 +1523,6 @@ Partial Class einstellungen
CType(Me.PictureBox7, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PictureBox7, System.ComponentModel.ISupportInitialize).EndInit()
Me.Panel2.ResumeLayout(False) Me.Panel2.ResumeLayout(False)
CType(Me.MetroStyleManager1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.MetroStyleManager1, System.ComponentModel.ISupportInitialize).EndInit()
Me.GroupBox12.ResumeLayout(False)
Me.ResumeLayout(False) Me.ResumeLayout(False)
Me.PerformLayout() Me.PerformLayout()
@ -1630,9 +1581,6 @@ Partial Class einstellungen
Friend WithEvents SoftSubs As GroupBox Friend WithEvents SoftSubs As GroupBox
Friend WithEvents GB_SubLanguage As GroupBox Friend WithEvents GB_SubLanguage As GroupBox
Friend WithEvents ComboBox1 As ComboBox Friend WithEvents ComboBox1 As ComboBox
Friend WithEvents GB_Sub_Path As GroupBox
Friend WithEvents RBStaffel As RadioButton
Friend WithEvents RBAnime As RadioButton
Friend WithEvents MergeMP4 As CheckBox Friend WithEvents MergeMP4 As CheckBox
Friend WithEvents GroupBox4 As GroupBox Friend WithEvents GroupBox4 As GroupBox
Friend WithEvents HybridMode_CB As CheckBox Friend WithEvents HybridMode_CB As CheckBox

View File

@ -8,9 +8,9 @@ Imports MetroFramework.Forms
Imports MetroFramework Imports MetroFramework
Imports MetroFramework.Components Imports MetroFramework.Components
Public Class einstellungen Public Class Einstellungen
Inherits MetroForm Inherits MetroForm
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 = "Version " + Application.ProductVersion.ToString Label6.Text = "Version " + Application.ProductVersion.ToString
MetroStyleManager1.Style = MetroColorStyle.Orange MetroStyleManager1.Style = MetroColorStyle.Orange
TabControl1.SelectedIndex = 0 TabControl1.SelectedIndex = 0
@ -129,9 +129,6 @@ Public Class einstellungen
Try Try
GB_Resolution.Text = Main.GB_Resolution_Text GB_Resolution.Text = Main.GB_Resolution_Text
GB_SubLanguage.Text = Main.GB_SubLanguage_Text GB_SubLanguage.Text = Main.GB_SubLanguage_Text
GB_Sub_Path.Text = Main.GB_Sub_Path_Text
RBAnime.Text = Main.RBAnime_Text
RBStaffel.Text = Main.RBStaffel_Text
DL_Count_simultaneous.Text = Main.DL_Count_simultaneousText DL_Count_simultaneous.Text = Main.DL_Count_simultaneousText
Catch ex As Exception Catch ex As Exception
@ -181,11 +178,7 @@ Public Class einstellungen
ComboBox1.SelectedItem = Main.CB_SuB_Nothing ComboBox1.SelectedItem = Main.CB_SuB_Nothing
End If End If
If Main.SubFolder = 1 Then
RBAnime.Checked = True
ElseIf Main.SubFolder = 2 Then
RBStaffel.Checked = True
End If
NumericUpDown2.Value = Main.ErrorTolerance NumericUpDown2.Value = Main.ErrorTolerance
NumericUpDown1.Value = Main.MaxDL NumericUpDown1.Value = Main.MaxDL
TextBox1.Text = Main.Startseite TextBox1.Text = Main.Startseite
@ -402,13 +395,7 @@ Public Class einstellungen
Main.SaveLog = False Main.SaveLog = False
rk.SetValue("SaveLog", "0", RegistryValueKind.String) rk.SetValue("SaveLog", "0", RegistryValueKind.String)
End If End If
If RBAnime.Checked = True Then
Main.SubFolder = 1
rk.SetValue("SubFolder", 1, RegistryValueKind.String)
ElseIf RBStaffel.Checked = True Then
Main.SubFolder = 2
rk.SetValue("SubFolder", 2, RegistryValueKind.String)
End If
If CheckBox1.Enabled = False Then If CheckBox1.Enabled = False Then
Else Else
@ -530,23 +517,23 @@ Public Class einstellungen
Return "CRD-Temp-File-" + HWID Return "CRD-Temp-File-" + HWID
End Function End Function
Private Sub pictureBox1_Click(sender As Object, e As EventArgs) Handles pictureBox1.Click Private Sub PictureBox1_Click(sender As Object, e As EventArgs) Handles pictureBox1.Click
Me.Close() Me.Close()
End Sub End Sub
#Region "UI" #Region "UI"
Private Sub pictureBox1_MouseEnter(sender As Object, e As EventArgs) Handles pictureBox1.MouseEnter Private Sub PictureBox1_MouseEnter(sender As Object, e As EventArgs) Handles pictureBox1.MouseEnter
pictureBox1.BackColor = SystemColors.Control pictureBox1.BackColor = SystemColors.Control
End Sub End Sub
Private Sub pictureBox1_MouseLeave(sender As Object, e As EventArgs) Handles pictureBox1.MouseLeave Private Sub PictureBox1_MouseLeave(sender As Object, e As EventArgs) Handles pictureBox1.MouseLeave
pictureBox1.BackColor = Color.Transparent pictureBox1.BackColor = Color.Transparent
End Sub End Sub
Private Sub pictureBox4_MouseEnter(sender As Object, e As EventArgs) Handles pictureBox4.MouseEnter Private Sub PictureBox4_MouseEnter(sender As Object, e As EventArgs) Handles pictureBox4.MouseEnter
pictureBox4.Image = My.Resources.crdSettings_Button_SafeExit_hover pictureBox4.Image = My.Resources.crdSettings_Button_SafeExit_hover
End Sub End Sub
Private Sub pictureBox4_MouseLeave(sender As Object, e As EventArgs) Handles pictureBox4.MouseLeave Private Sub PictureBox4_MouseLeave(sender As Object, e As EventArgs) Handles pictureBox4.MouseLeave
pictureBox4.Image = My.Resources.crdSettings_Button_SafeExit pictureBox4.Image = My.Resources.crdSettings_Button_SafeExit
End Sub End Sub

View File

@ -1 +1 @@
66cfe61cc6be72d599de69456aa1be7888d056c0 9a55c6ae258daebcde0ebd975ccb9d9cb40e83cc

View File

@ -57,6 +57,16 @@ Crunchyroll Downloader
Sucht eine lokalisierte Zeichenfolge, die {&quot;sources&quot;:[{&quot;file&quot;:&quot; ähnelt. Sucht eine lokalisierte Zeichenfolge, die {&quot;sources&quot;:[{&quot;file&quot;:&quot; ähnelt.
</summary> </summary>
</member> </member>
<member name="P:Crunchyroll_Downloader.My.Resources.Resources.AoD_HTML_Anime_Title">
<summary>
Sucht eine lokalisierte Zeichenfolge, die &lt;h1 itemprop=&quot;name&quot;&gt; ähnelt.
</summary>
</member>
<member name="P:Crunchyroll_Downloader.My.Resources.Resources.AoD_HTML_Episode_Title">
<summary>
Sucht eine lokalisierte Zeichenfolge, die &lt;h3 class=&quot;episodebox-title&quot; title=&quot; ähnelt.
</summary>
</member>
<member name="P:Crunchyroll_Downloader.My.Resources.Resources.AoD_Image"> <member name="P:Crunchyroll_Downloader.My.Resources.Resources.AoD_Image">
<summary> <summary>
Sucht eine lokalisierte Zeichenfolge, die &quot;image&quot;:&quot; ähnelt. Sucht eine lokalisierte Zeichenfolge, die &quot;image&quot;:&quot; ähnelt.