diff --git a/.vs/Crunchyroll Downloader/v15/.suo b/.vs/Crunchyroll Downloader/v15/.suo index 1e1c35f..52127e9 100644 Binary files a/.vs/Crunchyroll Downloader/v15/.suo and b/.vs/Crunchyroll Downloader/v15/.suo differ diff --git a/.vs/Crunchyroll Downloader/v15/Server/sqlite3/storage.ide b/.vs/Crunchyroll Downloader/v15/Server/sqlite3/storage.ide index 8479d3d..401882e 100644 Binary files a/.vs/Crunchyroll Downloader/v15/Server/sqlite3/storage.ide and b/.vs/Crunchyroll Downloader/v15/Server/sqlite3/storage.ide differ diff --git a/.vs/Crunchyroll Downloader/v15/Server/sqlite3/storage.ide-shm b/.vs/Crunchyroll Downloader/v15/Server/sqlite3/storage.ide-shm index 5298de5..27d0d56 100644 Binary files a/.vs/Crunchyroll Downloader/v15/Server/sqlite3/storage.ide-shm and b/.vs/Crunchyroll Downloader/v15/Server/sqlite3/storage.ide-shm differ diff --git a/.vs/Crunchyroll Downloader/v15/Server/sqlite3/storage.ide-wal b/.vs/Crunchyroll Downloader/v15/Server/sqlite3/storage.ide-wal index 62edd5c..aba5255 100644 Binary files a/.vs/Crunchyroll Downloader/v15/Server/sqlite3/storage.ide-wal and b/.vs/Crunchyroll Downloader/v15/Server/sqlite3/storage.ide-wal differ diff --git a/Crunchyroll Downloader/Anime_Add.Designer.vb b/Crunchyroll Downloader/Anime_Add.Designer.vb index c652b68..a3e8e46 100644 --- a/Crunchyroll Downloader/Anime_Add.Designer.vb +++ b/Crunchyroll Downloader/Anime_Add.Designer.vb @@ -362,9 +362,9 @@ Partial Class Anime_Add Me.Controls.Add(Me.Btn_min) Me.Controls.Add(Me.Btn_Close) Me.Controls.Add(Me.pictureBox4) + Me.Controls.Add(Me.groupBox1) Me.Controls.Add(Me.GroupBox3) Me.Controls.Add(Me.groupBox2) - Me.Controls.Add(Me.groupBox1) Me.Name = "Anime_Add" Me.Padding = New System.Windows.Forms.Padding(10, 60, 20, 20) Me.Text = "Add Video" diff --git a/Crunchyroll Downloader/Anime_Add.vb b/Crunchyroll Downloader/Anime_Add.vb index 2e3d52c..8e67305 100644 --- a/Crunchyroll Downloader/Anime_Add.vb +++ b/Crunchyroll Downloader/Anime_Add.vb @@ -394,7 +394,8 @@ Public Class Anime_Add ElseIf CBool(InStr(textBox1.Text, "Test=true")) Then GeckoFX.WebBrowser1.Navigate(textBox1.Text) - Else 'If CBool(InStr(textBox1.Text, "vrv.co")) Then + 'Else 'If CBool(InStr(textBox1.Text, "vrv.co")) Then + ElseIf CBool(InStr(textBox1.Text, "https://")) Then If MessageBox.Show("This in NOT a Crunchyroll URL, try anyway?", "confirm?", MessageBoxButtons.YesNo, MessageBoxIcon.Question) = DialogResult.Yes Then Dim FileLocation As DirectoryInfo = New DirectoryInfo(Application.StartupPath) diff --git a/Crunchyroll Downloader/ApplicationEvents.vb b/Crunchyroll Downloader/ApplicationEvents.vb index 09a3e86..450225e 100644 --- a/Crunchyroll Downloader/ApplicationEvents.vb +++ b/Crunchyroll Downloader/ApplicationEvents.vb @@ -52,13 +52,14 @@ Namespace My GeckoPreferences.Default("plugin.state.flash") = 0 GeckoPreferences.Default("zoom.maxPercent") = 100 GeckoPreferences.Default("zoom.minPercent") = 100 - GeckoPreferences.Default("layers.geometry.d3d11.enabled") = False + 'GeckoPreferences.Default("layers.geometry.d3d11.enabled") = False + 'GeckoPreferences.Default("security.enterprise_roots.enabled") = True Return True Catch ex As Exception - MsgBox(ex.ToString + vbNewLine + "this is usual fixed by installing the x86 version from the Visual C++ redistributable" + vbNewLine + "https://support.microsoft.com/en-us/help/2977003/the-latest-supported-visual-c-downloads") + MsgBox("if you see this you should install the x86 version from the Visual C++ redistributable" + vbNewLine + "https://support.microsoft.com/en-us/help/2977003/the-latest-supported-visual-c-downloads" + vbNewLine + vbNewLine + ex.ToString) Return False End Try diff --git a/Crunchyroll Downloader/CRD_List_Item.vb b/Crunchyroll Downloader/CRD_List_Item.vb index 792caca..a3d1048 100644 --- a/Crunchyroll Downloader/CRD_List_Item.vb +++ b/Crunchyroll Downloader/CRD_List_Item.vb @@ -7,6 +7,7 @@ Imports System.ComponentModel Imports MetroFramework Imports MetroFramework.Components Imports MetroFramework.Forms +Imports System.IO.Compression Public Class CRD_List_Item Inherits Controls.MetroUserControl @@ -292,11 +293,11 @@ Public Class CRD_List_Item Else StatusRunning = True - bt_pause.BackgroundImage = My.Resources.main_pause - End If + bt_pause.BackgroundImage = My.Resources.main_pause + End If - Else - If proc.HasExited = True Then + Else + If proc.HasExited = True Then If ProgressBar1.Value < 100 Then If Retry = True Then If Main.RunningDownloads < Main.MaxDL Then @@ -338,35 +339,35 @@ Public Class CRD_List_Item 'Else Dim Result As DialogResult = MessageBox.Show("The download has " + FailedCount.ToString + " failded segments" + vbNewLine + "Press 'Ignore' to continue", "Download Error", MessageBoxButtons.AbortRetryIgnore) '= DialogResult.Ignore Then - If Result = DialogResult.Ignore Then - Failed = False - StatusRunning = True - bt_pause.BackgroundImage = My.Resources.main_pause - ResumeProcess(proc) - ElseIf Result = DialogResult.Retry Then - Try - proc.Kill() - proc.WaitForExit(500) - Label_percent.Text = "retrying -%" - Label_website.Text = Label_website_Text - Catch ex As Exception - End Try + If Result = DialogResult.Ignore Then + Failed = False + StatusRunning = True + bt_pause.BackgroundImage = My.Resources.main_pause + ResumeProcess(proc) + ElseIf Result = DialogResult.Retry Then + Try + proc.Kill() + proc.WaitForExit(500) + Label_percent.Text = "retrying -%" + Label_website.Text = Label_website_Text + Catch ex As Exception + End Try - If proc.HasExited Then - StartDownload(HistoryDL_URL, HistoryDL_Pfad, HistoryFilename, HybridMode) - StatusRunning = True - Label_website.Text = Label_website_Text - bt_pause.BackgroundImage = My.Resources.main_pause - End If - ElseIf Result = DialogResult.Abort Then - Try - proc.Kill() - proc.WaitForExit(500) - Label_percent.Text = "canceled -%" - Label_website.Text = Label_website_Text - Catch ex As Exception - End Try + If proc.HasExited Then + StartDownload(HistoryDL_URL, HistoryDL_Pfad, HistoryFilename, HybridMode) + StatusRunning = True + Label_website.Text = Label_website_Text + bt_pause.BackgroundImage = My.Resources.main_pause End If + ElseIf Result = DialogResult.Abort Then + Try + proc.Kill() + proc.WaitForExit(500) + Label_percent.Text = "canceled -%" + Label_website.Text = Label_website_Text + Catch ex As Exception + End Try + End If ' End If Else If StatusRunning = True Then @@ -615,20 +616,39 @@ Public Class CRD_List_Item If Debug2 = True Then MsgBox(m3u8_url(1) + vbNewLine + DL_Pfad + vbNewLine + Filename) End If - Dim client0 As New WebClient - client0.Encoding = Encoding.UTF8 + 'Dim client0 As New WebClient + 'client0.Encoding = Encoding.UTF8 Dim text As String = Nothing + 'Try + ' text = client0.DownloadString(m3u8_url(1)) + 'Catch ex As Exception + ' Me.Invoke(New Action(Function() + ' Label_website.Text = "Hybrid mode error" + ' Label_percent.Text = ex.ToString + ' Return Nothing + ' End Function)) + ' Return Nothing + ' Exit Function + 'End Try + + Try - text = client0.DownloadString(m3u8_url(1)) + Using client As New WebClient() + client.Headers.Add(My.Resources.ffmpeg_user_agend.Replace(Chr(34), "")) + client.Headers.Add("ACCEPT: text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8") + client.Headers.Add("ACCEPT-ENCODING: *") + 'client.DownloadFile(TextBox1.Text, "test.m3u8") + + 'Dim archive As Zipfi = New ZipArchive(ms) + 'Dim m3u8String As String = client.DownloadString(TextBox1.Text) + Dim m3u8 As String = DecompressString(client.DownloadData(m3u8_url(1))) + Text = m3u8 + 'MsgBox(m3u8) + End Using Catch ex As Exception - Me.Invoke(New Action(Function() - Label_website.Text = "Hybrid mode error" - Label_percent.Text = ex.ToString - Return Nothing - End Function)) - Return Nothing - Exit Function + MsgBox(ex.ToString) End Try + If InStr(text, "RESOLUTION=") Then 'master m3u8 no fragments 'My.Computer.FileSystem.WriteAllText(Application.StartupPath + "\log.txt", text, False) Dim new_m3u8_2() As String = text.Split(New String() {vbLf}, System.StringSplitOptions.RemoveEmptyEntries) @@ -644,7 +664,22 @@ Public Class CRD_List_Item End If Next If InStr(m3u8_url_1, "https://") Then - text = client0.DownloadString(m3u8_url_1) + Try + Using client As New WebClient() + client.Headers.Add(My.Resources.ffmpeg_user_agend.Replace(Chr(34), "")) + client.Headers.Add("ACCEPT: text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8") + client.Headers.Add("ACCEPT-ENCODING: *") + 'client.DownloadFile(TextBox1.Text, "test.m3u8") + + 'Dim archive As Zipfi = New ZipArchive(ms) + 'Dim m3u8String As String = client.DownloadString(TextBox1.Text) + Dim m3u8 As String = DecompressString(client.DownloadData(m3u8_url(1))) + Text = m3u8 + 'MsgBox(m3u8) + End Using + Catch ex As Exception + MsgBox(ex.ToString) + End Try Else Dim c() As String = New Uri(m3u8_url_3).Segments Dim path As String = "https://" + New Uri(m3u8_url_3).Host @@ -653,7 +688,22 @@ Public Class CRD_List_Item Next m3u8_url_3 = path + m3u8_url_1 'MsgBox(m3u8_url_3) - text = client0.DownloadString(m3u8_url_3) + Try + Using client As New WebClient() + client.Headers.Add(My.Resources.ffmpeg_user_agend.Replace(Chr(34), "")) + client.Headers.Add("ACCEPT: text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8") + client.Headers.Add("ACCEPT-ENCODING: *") + 'client.DownloadFile(TextBox1.Text, "test.m3u8") + + 'Dim archive As Zipfi = New ZipArchive(ms) + 'Dim m3u8String As String = client.DownloadString(TextBox1.Text) + Dim m3u8 As String = DecompressString(client.DownloadData(m3u8_url(1))) + Text = m3u8 + 'MsgBox(m3u8) + End Using + Catch ex As Exception + MsgBox(ex.ToString) + End Try End If @@ -946,7 +996,7 @@ Public Class CRD_List_Item Dim exepath As String = Application.StartupPath + "\ffmpeg.exe" Dim startinfo As New System.Diagnostics.ProcessStartInfo - Dim cmd As String = "-headers " + My.Resources.ffmpeg_user_agend + " " + DLCommand + " " + DL_Pfad 'start ffmpeg with command strFFCMD string + Dim cmd As String = "-user-agent " + My.Resources.ffmpeg_user_agend.Replace("User-Agent: ", "") + " -headers " + Chr(34) + "ACCEPT-ENCODING: *" + Chr(34) + " " + DLCommand + " " + DL_Pfad 'start ffmpeg with command strFFCMD string LogText.Add(Date.Now + " " + cmd) If Debug2 = True Then MsgBox(cmd) @@ -955,7 +1005,7 @@ Public Class CRD_List_Item startinfo.FileName = exepath startinfo.Arguments = cmd startinfo.UseShellExecute = False - startinfo.WindowStyle = ProcessWindowStyle.Normal + startinfo.WindowStyle = ProcessWindowStyle.Hidden startinfo.RedirectStandardError = True startinfo.RedirectStandardInput = True startinfo.RedirectStandardOutput = True @@ -1293,6 +1343,21 @@ Public Class CRD_List_Item Catch ex As Exception End Try End Sub + + Public Function DecompressString(ByVal bytes As Byte()) As String + + Using ms = New MemoryStream(bytes) + Using ds = New GZipStream(ms, CompressionMode.Decompress) + Using sr = New StreamReader(ds) + + Return sr.ReadToEnd() + + End Using + End Using + End Using + + End Function + End Class Public Class FailedSegemtsWithURL diff --git a/Crunchyroll Downloader/GeckoFX.vb b/Crunchyroll Downloader/GeckoFX.vb index b9989cb..1827054 100644 --- a/Crunchyroll Downloader/GeckoFX.vb +++ b/Crunchyroll Downloader/GeckoFX.vb @@ -94,6 +94,7 @@ Public Class GeckoFX Main.WebbrowserURL = WebBrowser1.Url.ToString Main.WebbrowserText = WebBrowser1.Document.Body.OuterHtml Main.WebbrowserTitle = WebBrowser1.DocumentTitle + Main.WebbrowserHeadText = WebBrowser1.Document.Head.InnerHtml Main.b = True If Main.d = False Then Main.d = True @@ -116,6 +117,7 @@ Public Class GeckoFX Main.WebbrowserURL = WebBrowser1.Url.ToString Main.WebbrowserText = WebBrowser1.Document.Body.OuterHtml Main.WebbrowserTitle = WebBrowser1.DocumentTitle + Main.WebbrowserHeadText = WebBrowser1.Document.Head.InnerHtml If Main.d = False Then Main.d = True Main.SeasonDropdownGrappSubs() @@ -129,6 +131,7 @@ Public Class GeckoFX Main.WebbrowserURL = WebBrowser1.Url.ToString Main.WebbrowserText = WebBrowser1.Document.Body.OuterHtml Main.WebbrowserTitle = WebBrowser1.DocumentTitle + Main.WebbrowserHeadText = WebBrowser1.Document.Head.InnerHtml If Main.d = False Then Main.d = True Main.MassGrappSubs() @@ -152,6 +155,7 @@ Public Class GeckoFX Main.WebbrowserURL = WebBrowser1.Url.ToString Main.WebbrowserText = WebBrowser1.Document.Body.OuterHtml Main.WebbrowserTitle = WebBrowser1.DocumentTitle + Main.WebbrowserHeadText = WebBrowser1.Document.Head.InnerHtml 'SoftSub.DownloadSubs() Me.Close() End If @@ -163,6 +167,7 @@ Public Class GeckoFX Main.WebbrowserURL = WebBrowser1.Url.ToString Main.WebbrowserText = WebBrowser1.Document.Body.OuterHtml Main.WebbrowserTitle = WebBrowser1.DocumentTitle + Main.WebbrowserHeadText = WebBrowser1.Document.Head.InnerHtml Catch ex As Exception End Try diff --git a/Crunchyroll Downloader/Main.vb b/Crunchyroll Downloader/Main.vb index 26a7337..0801c9e 100644 --- a/Crunchyroll Downloader/Main.vb +++ b/Crunchyroll Downloader/Main.vb @@ -9,6 +9,7 @@ Imports System.Net.Sockets Imports MetroFramework.Forms Imports MetroFramework Imports MetroFramework.Components +Imports System.Globalization Public Class Main Inherits MetroForm @@ -60,6 +61,9 @@ Public Class Main Public Reso As Integer Public AoD_Reso As Integer = 0 + Public Season_Prefix As String = "[default season prefix]" + Public Episode_Prefix As String = "[default episode prefix]" + Dim Reso2 As String Public ResoSave As String = "6666x6666" Public ResoFunBackup As String = "6666x6666" @@ -369,6 +373,18 @@ Public Class Main End Try + Try + Dim rkg As RegistryKey = Registry.CurrentUser.OpenSubKey("Software\CRDownloader") + Episode_Prefix = rkg.GetValue("Prefix_E").ToString + Catch ex As Exception + End Try + + Try + Dim rkg As RegistryKey = Registry.CurrentUser.OpenSubKey("Software\CRDownloader") + Season_Prefix = rkg.GetValue("Prefix_S").ToString + Catch ex As Exception + End Try + Try Dim rkg As RegistryKey = Registry.CurrentUser.OpenSubKey("Software\CRDownloader") Startseite = rkg.GetValue("Startseite").ToString @@ -842,12 +858,12 @@ Public Class Main #Region "SubsOnly" Public Sub MassGrappSubs() - einstellungen.MultiDLSoftSubs.Enabled = True - einstellungen.PictureBox3.Image = My.Resources.softsubs_download - einstellungen.ComboBox1.Items.Clear() - einstellungen.comboBox3.Items.Clear() - einstellungen.comboBox4.Items.Clear() - einstellungen.ComboBox2.Enabled = False + Einstellungen.MultiDLSoftSubs.Enabled = True + Einstellungen.PictureBox3.Image = My.Resources.softsubs_download + Einstellungen.ComboBox1.Items.Clear() + Einstellungen.comboBox3.Items.Clear() + Einstellungen.comboBox4.Items.Clear() + Einstellungen.ComboBox2.Enabled = False Dim Anzahl As String() = WebbrowserText.Split(New String() {"wrapper container-shadow hover-classes"}, System.StringSplitOptions.RemoveEmptyEntries) Dim Titel As String() = Anzahl(0).Split(New String() {""}, System.StringSplitOptions.RemoveEmptyEntries) Dim Titel2 As String() = Titel(0).Split(New String() {">"}, System.StringSplitOptions.RemoveEmptyEntries) 'MsgBox(Titel2(0)) - einstellungen.ComboBox2.Items.Add(Titel2(1)) + Einstellungen.ComboBox2.Items.Add(Titel2(1)) Next End Sub @@ -918,6 +934,8 @@ Public Class Main CR_FilenName = CR_Title CR_FilenName_Backup = CR_Title 'MsgBox(CR_FilenName) + WebbrowserText = HtmlDecode(WebbrowserText) + If CBool(InStr(WebbrowserText, "

")) Then ' false on movie true on series Dim CR_Name_1 As String() = WebbrowserText.Split(New String() {"

"}, System.StringSplitOptions.RemoveEmptyEntries) Dim CR_Name_2 As String() = CR_Name_1(1).Split(New String() {"

"}, System.StringSplitOptions.RemoveEmptyEntries) '(New [Char]() {"-"}) @@ -942,7 +960,7 @@ Public Class Main Dim CR_Name_4 As String() = CR_Name_1(0).Split(New String() {"class=" + Chr(34) + "text-link" + Chr(34) + ">"}, System.StringSplitOptions.RemoveEmptyEntries) '(New [Char]() {"-"}) Dim CR_Name_Anime0 As String() = CR_Name_4(CR_Name_4.Length - 1).Split(New String() {""}, System.StringSplitOptions.RemoveEmptyEntries) 'CR_Name_Anime0(0) = System.Text.RegularExpressions.Regex.Replace(CR_Name_Anime0(0), "[^\w\\-]", " ") - CR_Name_Anime0(0) = HtmlDecode(CR_Name_Anime0(0)) + 'CR_Name_Anime0(0) = HtmlDecode(CR_Name_Anime0(0)) CR_Name_Anime0(0) = String.Join(" ", CR_Name_Anime0(0).Split(invalids, StringSplitOptions.RemoveEmptyEntries)).TrimEnd("."c) CR_Anime_Titel = CR_Name_Anime0(0).Trim @@ -953,6 +971,8 @@ Public Class Main End If CR_FilenName_Backup = RemoveExtraSpaces(CR_FilenName) + Else + End If @@ -986,7 +1006,7 @@ Public Class Main SoftSubs2.Add(SoftSubs(i)) Else Me.Invoke(New Action(Function() - einstellungen.StatusLabel.Text = "Status: language " + HardSubValuesToDisplay(Chr(34) + SoftSubs(ii) + Chr(34)) + " not found." + Einstellungen.StatusLabel.Text = "Status: language " + HardSubValuesToDisplay(Chr(34) + SoftSubs(ii) + Chr(34)) + " not found." Pause(10) Return Nothing End Function)) @@ -1000,7 +1020,7 @@ Public Class Main SoftSubs2.Add(TempSoftSubs(i)) Else Me.Invoke(New Action(Function() - einstellungen.StatusLabel.Text = "Status: language " + HardSubValuesToDisplay(Chr(34) + TempSoftSubs(ii) + Chr(34)) + " not found." + Einstellungen.StatusLabel.Text = "Status: language " + HardSubValuesToDisplay(Chr(34) + TempSoftSubs(ii) + Chr(34)) + " not found." Pause(10) Return Nothing End Function)) @@ -1029,7 +1049,7 @@ Public Class Main Dim ii As Integer = i Try Me.Invoke(New Action(Function() - einstellungen.StatusLabel.Text = "Status: downloading - " + HardSubValuesToDisplay(Chr(34) + SoftSubs2(ii) + Chr(34)) + Einstellungen.StatusLabel.Text = "Status: downloading - " + HardSubValuesToDisplay(Chr(34) + SoftSubs2(ii) + Chr(34)) Pause(1) Return Nothing End Function)) @@ -1054,7 +1074,7 @@ Public Class Main Pause(1) Catch ex As Exception Me.Invoke(New Action(Function() - einstellungen.StatusLabel.Text = "Status: failed - " + HardSubValuesToDisplay(Chr(34) + SoftSubs2(ii) + Chr(34)) + Einstellungen.StatusLabel.Text = "Status: failed - " + HardSubValuesToDisplay(Chr(34) + SoftSubs2(ii) + Chr(34)) Pause(3) Return Nothing End Function)) @@ -1063,7 +1083,7 @@ Public Class Main Else Me.Invoke(New Action(Function() - einstellungen.StatusLabel.Text = "Status: No language selected" + Einstellungen.StatusLabel.Text = "Status: No language selected" Pause(10) Return Nothing End Function)) @@ -1072,7 +1092,7 @@ Public Class Main DlSoftSubsRDY = True Me.Invoke(New Action(Function() - einstellungen.StatusLabel.Text = "Status: idle" + Einstellungen.StatusLabel.Text = "Status: idle" Return Nothing End Function)) @@ -1082,20 +1102,20 @@ Public Class Main End Sub Public Async Sub MassSubsDL() - If einstellungen.comboBox3.Text = Nothing Then + If Einstellungen.comboBox3.Text = Nothing Then Exit Sub - ElseIf einstellungen.comboBox4.Text = Nothing Then + ElseIf Einstellungen.comboBox4.Text = Nothing Then Exit Sub End If - einstellungen.SoftSubsMass.Text = "preparing ..." + Einstellungen.SoftSubsMass.Text = "preparing ..." Dim Website As String = WebbrowserText - If einstellungen.ComboBox2.Enabled = True Then + If Einstellungen.ComboBox2.Enabled = True Then Dim SeasonDropdownAnzahl As String() = Website.Split(New String() {"season-dropdown content-menu block"}, System.StringSplitOptions.RemoveEmptyEntries) Array.Reverse(SeasonDropdownAnzahl) Dim SDV As Integer = 0 For i As Integer = 0 To SeasonDropdownAnzahl.Count - 1 - If InStr(SeasonDropdownAnzahl(i), Chr(34) + ">" + einstellungen.ComboBox2.SelectedItem.ToString + "") Then + If InStr(SeasonDropdownAnzahl(i), Chr(34) + ">" + Einstellungen.ComboBox2.SelectedItem.ToString + "") Then SDV = i End If Next @@ -1104,13 +1124,13 @@ 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 = einstellungen.comboBox4.SelectedIndex - einstellungen.comboBox3.SelectedIndex + 1 + Dim c As Integer = Einstellungen.comboBox4.SelectedIndex - Einstellungen.comboBox3.SelectedIndex + 1 'AnzahlGesamt.Text = c.ToString Gesamt = c.ToString Aktuell = "0" - If einstellungen.comboBox4.SelectedIndex > einstellungen.comboBox3.SelectedIndex Then + If Einstellungen.comboBox4.SelectedIndex > Einstellungen.comboBox3.SelectedIndex Then - For i As Integer = einstellungen.comboBox3.SelectedIndex To einstellungen.comboBox4.SelectedIndex + For i As Integer = Einstellungen.comboBox3.SelectedIndex To Einstellungen.comboBox4.SelectedIndex For e As Integer = 0 To Integer.MaxValue @@ -1121,7 +1141,7 @@ Public Class Main End If Next - Dim dd As Integer = i - einstellungen.comboBox3.SelectedIndex + 1 + Dim dd As Integer = i - Einstellungen.comboBox3.SelectedIndex + 1 Dim URLGrapp As String() = Anzahl(i).Split(New String() {"")) Then ' false on movie true on series Dim CR_Name_1 As String() = WebbrowserText.Split(New String() {"

"}, System.StringSplitOptions.RemoveEmptyEntries) Dim CR_Name_2 As String() = CR_Name_1(1).Split(New String() {"

"}, System.StringSplitOptions.RemoveEmptyEntries) '(New [Char]() {"-"}) @@ -1380,6 +1404,45 @@ Public Class Main End If + If CBool(InStr(WebbrowserText, My.Resources.CR_Episode_Nr)) Then + If CBool(InStr(WebbrowserText, My.Resources.CR_Episode_Nr + Chr(34))) Then + Debug.WriteLine("No Episode Number in a movie") + Else + Dim CR_Episode_1 As String() = WebbrowserText.Split(New String() {My.Resources.CR_Episode_Nr}, System.StringSplitOptions.RemoveEmptyEntries) + Dim CR_Episode_2 As String() = CR_Episode_1(1).Split(New String() {Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries) '(New [Char]() {"-"}) + CR_Anime_Folge_int = String.Join(" ", CR_Episode_2(0).Split(invalids, StringSplitOptions.RemoveEmptyEntries)).TrimEnd("."c) 'System.Text.RegularExpressions.Regex.Replace(CR_Name_2(0), "[^\w\\-]", " ") + CR_Anime_Folge_int = RemoveExtraSpaces(CR_Anime_Folge_int) + If InStr(CR_Anime_Folge_int, ".") Then + Dim Folge_Double As Double = Double.Parse(CR_Anime_Folge_int, CultureInfo.InvariantCulture) + Debug.WriteLine(String.Format("{0:00.0}", Folge_Double)) + If Folge_Double < 10 Then + CR_Anime_Folge_int = String.Format("{0:00.0}", Folge_Double) + If InStr(CR_Anime_Folge_int, ",") Then + CR_Anime_Folge_int = CR_Anime_Folge_int.Replace(",", ".") + End If + End If + End If + End If + + End If + + If CBool(InStr(WebbrowserHeadText, My.Resources.CR_Season_Nr)) Then + If CBool(InStr(WebbrowserHeadText, My.Resources.CR_Season_Nr + Chr(34))) Then + Debug.WriteLine("No Season Number in a movie") + Else + Dim CR_Season_1 As String() = WebbrowserHeadText.Split(New String() {My.Resources.CR_Season_Nr}, System.StringSplitOptions.RemoveEmptyEntries) + Dim CR_Season_2 As String() = CR_Season_1(1).Split(New String() {Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries) '(New [Char]() {"-"}) + + CR_Anime_Staffel_int = String.Join(" ", CR_Season_2(0).Split(invalids, StringSplitOptions.RemoveEmptyEntries)).TrimEnd("."c) 'System.Text.RegularExpressions.Regex.Replace(CR_Name_2(0), "[^\w\\-]", " ") + CR_Anime_Staffel_int = RemoveExtraSpaces(CR_Anime_Staffel_int) + End If + Else + 'Me.Invoke(New Action(Function() + ' My.Computer.Clipboard.SetText(WebbrowserHeadText) + ' Return Nothing + ' End Function)) + Debug.WriteLine("Not found?") + End If If CBool(InStr(WebbrowserText, My.Resources.CR_MediaName)) = True Then ' And CBool(InStr(WebbrowserText, "”")) Dim CR_Name_1 As String() = WebbrowserText.Split(New String() {My.Resources.CR_MediaName}, System.StringSplitOptions.RemoveEmptyEntries) @@ -1388,26 +1451,52 @@ Public Class Main CR_Anime_Name = RemoveExtraSpaces(CR_Anime_Name) End If - If CR_NameMethode = 0 Then - If CR_Anime_Staffel = Nothing Then - CR_FilenName = CR_Anime_Titel + " " + CR_Anime_Folge - Else - CR_FilenName = CR_Anime_Titel + " " + CR_Anime_Staffel + " " + CR_Anime_Folge - End If - ElseIf CR_NameMethode = 1 Then - If CR_Anime_Staffel = Nothing Then - CR_FilenName = CR_Anime_Titel + " " + CR_Anime_Name - Else - CR_FilenName = CR_Anime_Titel + " " + CR_Anime_Staffel + " " + CR_Anime_Name - End If - ElseIf CR_NameMethode = 2 Then - If CR_Anime_Staffel = Nothing Then - CR_FilenName = CR_Anime_Titel + " " + CR_Anime_Folge + " " + CR_Anime_Name - Else - CR_FilenName = CR_Anime_Titel + " " + CR_Anime_Staffel + " " + CR_Anime_Folge + " " + CR_Anime_Name - End If + If Season_Prefix = "[default season prefix]" Then + Else + If CR_Anime_Staffel_int = "0" Then + Else + CR_Anime_Staffel = Season_Prefix + CR_Anime_Staffel_int End If + End If + + If Episode_Prefix = "[default episode prefix]" Then + + Else + CR_Anime_Folge = Episode_Prefix + CR_Anime_Folge_int + End If + + If CR_Anime_Titel = Nothing Then + + CR_FilenName = CR_Anime_Name + + ElseIf CR_NameMethode = 0 Then + If CR_Anime_Staffel = Nothing Then + CR_FilenName = CR_Anime_Titel + " " + CR_Anime_Folge + Else + CR_FilenName = CR_Anime_Titel + " " + CR_Anime_Staffel + " " + CR_Anime_Folge + End If + ElseIf CR_NameMethode = 1 Then + If CR_Anime_Staffel = Nothing Then + CR_FilenName = CR_Anime_Titel + " " + CR_Anime_Name + Else + CR_FilenName = CR_Anime_Titel + " " + CR_Anime_Staffel + " " + CR_Anime_Name + End If + ElseIf CR_NameMethode = 2 Then + If CR_Anime_Staffel = Nothing Then + CR_FilenName = CR_Anime_Titel + " " + CR_Anime_Folge + " " + CR_Anime_Name + Else + CR_FilenName = CR_Anime_Titel + " " + CR_Anime_Staffel + " " + CR_Anime_Folge + " " + CR_Anime_Name + End If + ElseIf CR_NameMethode = 3 Then + If CR_Anime_Staffel = Nothing Then + CR_FilenName = CR_Anime_Titel + " " + CR_Anime_Name + " " + CR_Anime_Folge + Else + CR_FilenName = CR_Anime_Titel + " " + CR_Anime_Name + " " + CR_Anime_Staffel + " " + CR_Anime_Folge + End If + End If + + @@ -1686,26 +1775,25 @@ Public Class Main 'End If #End Region -#Region "gzip fix - no cloudfront cdn" +#Region "gzip fixed with http header in hybrid + ffmpeg" '"gzip fix - no cloudfront cdn" Dim ffmpeg_url_1 As String() = str.Split(New String() {Reso2 + ","}, System.StringSplitOptions.RemoveEmptyEntries) Dim ffmpeg_url_3 As String() = Nothing 'MsgBox(ffmpeg_url_1.Count.ToString) - If ffmpeg_url_1.Count > 2 Then - If InStr(ffmpeg_url_1(1), "&cdn=cloudfront-prod") Then - Dim ffmpeg_url_2 As String() = ffmpeg_url_1(2).Split(New [Char]() {Chr(34)}) - ffmpeg_url_3 = ffmpeg_url_2(2).Split(New [Char]() {System.Convert.ToChar("#")}) - Else - Dim ffmpeg_url_2 As String() = ffmpeg_url_1(1).Split(New [Char]() {Chr(34)}) - ffmpeg_url_3 = ffmpeg_url_2(2).Split(New [Char]() {System.Convert.ToChar("#")}) - End If + 'If ffmpeg_url_1.Count > 2 Then + ' If InStr(ffmpeg_url_1(1), "&cdn=cloudfront-prod") Then + ' Dim ffmpeg_url_2 As String() = ffmpeg_url_1(2).Split(New [Char]() {Chr(34)}) + ' ffmpeg_url_3 = ffmpeg_url_2(2).Split(New [Char]() {System.Convert.ToChar("#")}) + ' Else + ' Dim ffmpeg_url_2 As String() = ffmpeg_url_1(1).Split(New [Char]() {Chr(34)}) + ' ffmpeg_url_3 = ffmpeg_url_2(2).Split(New [Char]() {System.Convert.ToChar("#")}) + ' End If - - Else - Dim ffmpeg_url_2 As String() = ffmpeg_url_1(1).Split(New [Char]() {Chr(34)}) - ffmpeg_url_3 = ffmpeg_url_2(2).Split(New [Char]() {System.Convert.ToChar("#")}) - End If + 'Else + Dim ffmpeg_url_2 As String() = ffmpeg_url_1(1).Split(New [Char]() {Chr(34)}) + ffmpeg_url_3 = ffmpeg_url_2(2).Split(New [Char]() {System.Convert.ToChar("#")}) + 'End If If MergeSubstoMP4 = True Then URL_DL = "-i " + Chr(34) + ffmpeg_url_3(0).Trim() + Chr(34) + SoftSubMergeURLs + SoftSubMergeMaps + " " + ffmpeg_command + " -c:s mov_text" + SoftSubMergeMetatata + " -metadata:s:a:0 language=" + CCtoMP4CC(CR_Anime_Dub) @@ -1884,7 +1972,7 @@ Public Class Main End Sub Private Sub PictureBox2_Click(sender As Object, e As EventArgs) Handles Btn_Settings.Click - einstellungen.Show() + Einstellungen.Show() End Sub Private Sub PictureBox1_Click(sender As Object, e As EventArgs) Handles Btn_Browser.Click @@ -2120,7 +2208,7 @@ Public Class Main Private Sub PictureBox2_DoubleClick(sender As Object, e As EventArgs) Handles Btn_Settings.DoubleClick If Debug1 = True Then If Debug2 = True Then - einstellungen.Close() + Einstellungen.Close() Try My.Computer.Clipboard.SetText(WebbrowserText) @@ -2129,12 +2217,12 @@ Public Class Main End Try Else Debug2 = True - einstellungen.Close() + Einstellungen.Close() MsgBox("Debug activated") End If Else Debug1 = True - einstellungen.Close() + Einstellungen.Close() 'MsgBox("Debug activated") End If End Sub @@ -2176,11 +2264,19 @@ Public Class Main Dim FunimationSeason1() As String = WebbrowserText.Split(New String() {"seasonNum: "}, System.StringSplitOptions.RemoveEmptyEntries) Dim FunimationSeason2() As String = FunimationSeason1(1).Split(New String() {","}, System.StringSplitOptions.RemoveEmptyEntries) - FunimationSeason = "Season " + FunimationSeason2(0) + If Season_Prefix = "[default season prefix]" Then + FunimationSeason = "Season " + FunimationSeason2(0) + Else + FunimationSeason = Season_Prefix + FunimationSeason2(0) + End If Dim FunimationEpisode1() As String = WebbrowserText.Split(New String() {"episodeNum: "}, System.StringSplitOptions.RemoveEmptyEntries) Dim FunimationEpisode2() As String = FunimationEpisode1(1).Split(New String() {","}, System.StringSplitOptions.RemoveEmptyEntries) - FunimationEpisode = "Episode " + FunimationEpisode2(0) + If Episode_Prefix = "[default episode prefix]" Then + FunimationEpisode = "Episode " + FunimationEpisode2(0) + Else + FunimationEpisode = Episode_Prefix + FunimationEpisode2(0) + End If Dim FunimationTitle1() As String = WebbrowserText.Split(New String() {".showName = '"}, System.StringSplitOptions.RemoveEmptyEntries) Dim FunimationTitle2() As String = FunimationTitle1(1).Split(New String() {"';"}, System.StringSplitOptions.RemoveEmptyEntries) @@ -2203,6 +2299,8 @@ Public Class Main DefaultName = RemoveExtraSpaces(FunimationTitle + " " + FunimationSeason + " " + FunimationEpisodeTitle) ElseIf CR_NameMethode = 2 Then DefaultName = RemoveExtraSpaces(FunimationTitle + " " + FunimationSeason + " " + FunimationEpisode + " " + FunimationEpisodeTitle) + ElseIf CR_NameMethode = 3 Then + DefaultName = RemoveExtraSpaces(FunimationTitle + " " + FunimationEpisodeTitle + " " + FunimationSeason + " " + FunimationEpisode) End If @@ -2582,7 +2680,7 @@ Public Class Main 'ElseIf InStr(UsedSub, ".dfxp") Then ' SubtitelFormat = ".dfxp" End If - UsedSub = einstellungen.GeräteID() + SubtitelFormat + UsedSub = Einstellungen.GeräteID() + SubtitelFormat File.WriteAllText(Application.StartupPath + "\" + UsedSub, SubText, Encoding.UTF8) ElseIf SoftSubs2.Count > 0 Then For i As Integer = 0 To SoftSubs2.Count - 1 @@ -2904,6 +3002,7 @@ Public Class Main WebbrowserURL = URLSplit2(0) Dim BodySplit() As String = DecodedHTML.Split(New String() {""}, System.StringSplitOptions.RemoveEmptyEntries) Dim TitleSplit2() As String = TitleSplit(1).Split(New String() {""}, System.StringSplitOptions.RemoveEmptyEntries) WebbrowserTitle = TitleSplit2(0) @@ -3115,7 +3214,7 @@ Public Class Main Else strRequest = rootPath & "error_Page_default.html" 'PostPage - sendHTMLResponse(strRequest, clientSocket) + SendHTMLResponse(strRequest, clientSocket) End If @@ -3130,11 +3229,11 @@ Public Class Main End If strRequest = rootPath & strRequest - sendHTMLResponse(strRequest, clientSocket) + SendHTMLResponse(strRequest, clientSocket) Else ' Not HTTP GET method strRequest = rootPath & defaultPage - sendHTMLResponse(strRequest, clientSocket) + SendHTMLResponse(strRequest, clientSocket) End If Catch abort As ThreadAbortException @@ -3144,7 +3243,7 @@ Public Class Main Dim ErrorPage As String = My.Resources.Post_error_Top + ex.ToString + My.Resources.Post_error_Bottom My.Computer.FileSystem.WriteAllText(Application.StartupPath + "\WebInterface\error_Page.html", ErrorPage, False) 'strRequest = rootPath & "error_Page.html" 'PostPage - sendHTMLResponse(Application.StartupPath + "\WebInterface\error_Page.html", clientSocket) + SendHTMLResponse(Application.StartupPath + "\WebInterface\error_Page.html", clientSocket) 'If clientSocket.Connected Then ' clientSocket.Close() 'End If diff --git a/Crunchyroll Downloader/My Project/AssemblyInfo.vb b/Crunchyroll Downloader/My Project/AssemblyInfo.vb index 3e52c82..6a067ee 100644 --- a/Crunchyroll Downloader/My Project/AssemblyInfo.vb +++ b/Crunchyroll Downloader/My Project/AssemblyInfo.vb @@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/Crunchyroll Downloader/My Project/Resources.Designer.vb b/Crunchyroll Downloader/My Project/Resources.Designer.vb index 07aa392..3bb0ee8 100644 --- a/Crunchyroll Downloader/My Project/Resources.Designer.vb +++ b/Crunchyroll Downloader/My Project/Resources.Designer.vb @@ -207,6 +207,15 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Zeichenfolge, die display_episode_number":" ähnelt. + ''' + Friend ReadOnly Property CR_Episode_Nr() As String + Get + Return ResourceManager.GetString("CR_Episode_Nr", resourceCulture) + End Get + End Property + ''' ''' Sucht eine lokalisierte Zeichenfolge, die <meta property="og:url" content=" ähnelt. ''' @@ -234,6 +243,15 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Zeichenfolge, die seasonNumber":" ähnelt. + ''' + Friend ReadOnly Property CR_Season_Nr() As String + Get + Return ResourceManager.GetString("CR_Season_Nr", resourceCulture) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' diff --git a/Crunchyroll Downloader/My Project/Resources.resx b/Crunchyroll Downloader/My Project/Resources.resx index 6ca27fc..96c7daf 100644 --- a/Crunchyroll Downloader/My Project/Resources.resx +++ b/Crunchyroll Downloader/My Project/Resources.resx @@ -532,4 +532,10 @@ Dialogue: 0,0:00:00.00,0:00:00.00,Default,,0000,0000,0000,,some ideas on how tem ..\Resources\main-mini_red.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + display_episode_number":" + + + seasonNumber":" + \ No newline at end of file diff --git a/Crunchyroll Downloader/bin/x86/Debug/Crunchyroll Downloader.exe b/Crunchyroll Downloader/bin/x86/Debug/Crunchyroll Downloader.exe index ae65104..c336645 100644 Binary files a/Crunchyroll Downloader/bin/x86/Debug/Crunchyroll Downloader.exe and b/Crunchyroll Downloader/bin/x86/Debug/Crunchyroll Downloader.exe differ diff --git a/Crunchyroll Downloader/bin/x86/Debug/Crunchyroll Downloader.exe.config b/Crunchyroll Downloader/bin/x86/Debug/Crunchyroll Downloader.exe.config index a7eadbe..d50871d 100644 --- a/Crunchyroll Downloader/bin/x86/Debug/Crunchyroll Downloader.exe.config +++ b/Crunchyroll Downloader/bin/x86/Debug/Crunchyroll Downloader.exe.config @@ -3,9 +3,4 @@ - - - - - diff --git a/Crunchyroll Downloader/bin/x86/Debug/Crunchyroll Downloader.pdb b/Crunchyroll Downloader/bin/x86/Debug/Crunchyroll Downloader.pdb index 5934ee8..d35bb68 100644 Binary files a/Crunchyroll Downloader/bin/x86/Debug/Crunchyroll Downloader.pdb and b/Crunchyroll Downloader/bin/x86/Debug/Crunchyroll Downloader.pdb differ diff --git a/Crunchyroll Downloader/bin/x86/Debug/Crunchyroll Downloader.xml b/Crunchyroll Downloader/bin/x86/Debug/Crunchyroll Downloader.xml index 757bde7..c8badee 100644 --- a/Crunchyroll Downloader/bin/x86/Debug/Crunchyroll Downloader.xml +++ b/Crunchyroll Downloader/bin/x86/Debug/Crunchyroll Downloader.xml @@ -107,6 +107,11 @@ Video Position: 0 Sucht eine lokalisierte Zeichenfolge, die <img id="footer_country_flag" src="https://www.crunchyroll.com/i/country_flags/ ähnelt. + + + Sucht eine lokalisierte Zeichenfolge, die display_episode_number":" ähnelt. + + Sucht eine lokalisierte Zeichenfolge, die <meta property="og:url" content=" ähnelt. @@ -122,6 +127,11 @@ Video Position: 0 Sucht eine lokalisierte Zeichenfolge, die ”</h4> ähnelt. + + + Sucht eine lokalisierte Zeichenfolge, die seasonNumber":" ähnelt. + + Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. diff --git a/Crunchyroll Downloader/bin/x86/Debug/MetroFramework.dll b/Crunchyroll Downloader/bin/x86/Debug/MetroFramework.dll index 4fc7ae9..77dbef7 100644 Binary files a/Crunchyroll Downloader/bin/x86/Debug/MetroFramework.dll and b/Crunchyroll Downloader/bin/x86/Debug/MetroFramework.dll differ diff --git a/Crunchyroll Downloader/bin/x86/Debug/MetroFramework.pdb b/Crunchyroll Downloader/bin/x86/Debug/MetroFramework.pdb index 10b8c73..c0d23f3 100644 Binary files a/Crunchyroll Downloader/bin/x86/Debug/MetroFramework.pdb and b/Crunchyroll Downloader/bin/x86/Debug/MetroFramework.pdb differ diff --git a/Crunchyroll Downloader/bin/x86/Debug/WebInterface/error_Page.html b/Crunchyroll Downloader/bin/x86/Debug/WebInterface/error_Page.html index 58dab9f..048e6d9 100644 --- a/Crunchyroll Downloader/bin/x86/Debug/WebInterface/error_Page.html +++ b/Crunchyroll Downloader/bin/x86/Debug/WebInterface/error_Page.html @@ -42,16 +42,8 @@ ✘

Failed!

-

System.IO.IOException: Der Prozess kann nicht auf die Datei "D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.0\Crunchyroll Downloader\bin\x86\Debug\test2.log" zugreifen, da sie von einem anderen Prozess verwendet wird. - bei System.IO.__Error.WinIOError(Int32 errorCode, String maybeFullPath) - bei System.IO.FileStream.Init(String path, FileMode mode, FileAccess access, Int32 rights, Boolean useRights, FileShare share, Int32 bufferSize, FileOptions options, SECURITY_ATTRIBUTES secAttrs, String msgPath, Boolean bFromProxy, Boolean useLongPath, Boolean checkHost) - bei System.IO.FileStream..ctor(String path, FileMode mode, FileAccess access, FileShare share, Int32 bufferSize, FileOptions options, String msgPath, Boolean bFromProxy, Boolean useLongPath, Boolean checkHost) - bei System.IO.StreamWriter.CreateFile(String path, Boolean append, Boolean checkHost) - bei System.IO.StreamWriter..ctor(String path, Boolean append, Encoding encoding, Int32 bufferSize, Boolean checkHost) - bei System.IO.StreamWriter..ctor(String path, Boolean append, Encoding encoding) - bei Microsoft.VisualBasic.FileIO.FileSystem.WriteAllText(String file, String text, Boolean append, Encoding encoding) - bei Microsoft.VisualBasic.MyServices.FileSystemProxy.WriteAllText(String file, String text, Boolean append) - bei Crunchyroll_Downloader.Main.ProcessRequest(Socket clientSocket) in D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.0\Crunchyroll Downloader\Main.vb:Zeile 2851.

+

System.IndexOutOfRangeException: Der Index war außerhalb des Arraybereichs. + bei Crunchyroll_Downloader.Main.ProcessRequest(Socket clientSocket) in D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.0\Crunchyroll Downloader\Main.vb:Zeile 2906.

\ No newline at end of file diff --git a/Crunchyroll Downloader/bin/x86/Debug/ffmpeg.exe b/Crunchyroll Downloader/bin/x86/Debug/ffmpeg.exe index ff4c907..e24dcc3 100644 Binary files a/Crunchyroll Downloader/bin/x86/Debug/ffmpeg.exe and b/Crunchyroll Downloader/bin/x86/Debug/ffmpeg.exe differ diff --git a/Crunchyroll Downloader/einstellungen.Designer.vb b/Crunchyroll Downloader/einstellungen.Designer.vb index b9307d4..fb8a2c7 100644 --- a/Crunchyroll Downloader/einstellungen.Designer.vb +++ b/Crunchyroll Downloader/einstellungen.Designer.vb @@ -56,6 +56,8 @@ Partial Class Einstellungen Me.comboBox3 = New MetroFramework.Controls.MetroComboBox() Me.TabPage2 = New MetroFramework.Controls.MetroTabPage() Me.GroupBox12 = New System.Windows.Forms.GroupBox() + Me.DD_Episode_Prefix = New MetroFramework.Controls.MetroComboBox() + Me.DD_Season_Prefix = New MetroFramework.Controls.MetroComboBox() Me.CR_Filename = New MetroFramework.Controls.MetroComboBox() Me.GroupBox4 = New System.Windows.Forms.GroupBox() Me.HybridMode_CB = New MetroFramework.Controls.MetroCheckBox() @@ -605,10 +607,10 @@ Partial Class Einstellungen Me.TabPage2.HorizontalScrollbarBarColor = True Me.TabPage2.HorizontalScrollbarHighlightOnWheel = False Me.TabPage2.HorizontalScrollbarSize = 10 - Me.TabPage2.Location = New System.Drawing.Point(4, 35) + Me.TabPage2.Location = New System.Drawing.Point(4, 44) Me.TabPage2.Name = "TabPage2" Me.TabPage2.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage2.Size = New System.Drawing.Size(493, 461) + Me.TabPage2.Size = New System.Drawing.Size(493, 452) Me.TabPage2.TabIndex = 1 Me.TabPage2.Text = "Output" Me.TabPage2.VerticalScrollbarBarColor = True @@ -619,16 +621,48 @@ Partial Class Einstellungen 'GroupBox12 ' Me.GroupBox12.BackColor = System.Drawing.Color.Transparent + Me.GroupBox12.Controls.Add(Me.DD_Episode_Prefix) + Me.GroupBox12.Controls.Add(Me.DD_Season_Prefix) 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.Size = New System.Drawing.Size(479, 126) Me.GroupBox12.TabIndex = 53 Me.GroupBox12.TabStop = False Me.GroupBox12.Text = "Filename" ' + 'DD_Episode_Prefix + ' + Me.DD_Episode_Prefix.DropDownHeight = 250 + Me.DD_Episode_Prefix.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDown + Me.DD_Episode_Prefix.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.DD_Episode_Prefix.FormattingEnabled = True + Me.DD_Episode_Prefix.IntegralHeight = False + Me.DD_Episode_Prefix.ItemHeight = 23 + Me.DD_Episode_Prefix.Items.AddRange(New Object() {"[default episode prefix]"}) + Me.DD_Episode_Prefix.Location = New System.Drawing.Point(248, 79) + Me.DD_Episode_Prefix.Name = "DD_Episode_Prefix" + Me.DD_Episode_Prefix.Size = New System.Drawing.Size(225, 29) + Me.DD_Episode_Prefix.TabIndex = 36 + Me.DD_Episode_Prefix.UseSelectable = True + ' + 'DD_Season_Prefix + ' + Me.DD_Season_Prefix.DropDownHeight = 250 + Me.DD_Season_Prefix.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDown + Me.DD_Season_Prefix.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.DD_Season_Prefix.FormattingEnabled = True + Me.DD_Season_Prefix.IntegralHeight = False + Me.DD_Season_Prefix.ItemHeight = 23 + Me.DD_Season_Prefix.Items.AddRange(New Object() {"[default season prefix]"}) + Me.DD_Season_Prefix.Location = New System.Drawing.Point(6, 79) + Me.DD_Season_Prefix.Name = "DD_Season_Prefix" + Me.DD_Season_Prefix.Size = New System.Drawing.Size(225, 29) + Me.DD_Season_Prefix.TabIndex = 35 + Me.DD_Season_Prefix.UseSelectable = True + ' 'CR_Filename ' Me.CR_Filename.DropDownHeight = 250 @@ -636,10 +670,10 @@ Partial Class Einstellungen Me.CR_Filename.FormattingEnabled = True Me.CR_Filename.IntegralHeight = False Me.CR_Filename.ItemHeight = 23 - 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.Items.AddRange(New Object() {"[episode number]", "[episode name]", "[episode number] [episode name]", "[episode name] [episode number]"}) + Me.CR_Filename.Location = New System.Drawing.Point(6, 25) Me.CR_Filename.Name = "CR_Filename" - Me.CR_Filename.Size = New System.Drawing.Size(326, 29) + Me.CR_Filename.Size = New System.Drawing.Size(467, 29) Me.CR_Filename.TabIndex = 34 Me.CR_Filename.UseSelectable = True ' @@ -685,7 +719,7 @@ Partial Class Einstellungen Me.CheckBox1.BackColor = System.Drawing.Color.Transparent Me.CheckBox1.FontSize = MetroFramework.MetroCheckBoxSize.Medium Me.CheckBox1.ForeColor = System.Drawing.Color.Black - Me.CheckBox1.Location = New System.Drawing.Point(66, 219) + Me.CheckBox1.Location = New System.Drawing.Point(67, 281) Me.CheckBox1.Name = "CheckBox1" Me.CheckBox1.Size = New System.Drawing.Size(369, 19) Me.CheckBox1.TabIndex = 6 @@ -699,7 +733,7 @@ Partial Class Einstellungen Me.GroupBox2.Enabled = False Me.GroupBox2.Font = New System.Drawing.Font("Arial", 9.75!) Me.GroupBox2.ForeColor = System.Drawing.Color.Black - Me.GroupBox2.Location = New System.Drawing.Point(7, 245) + Me.GroupBox2.Location = New System.Drawing.Point(8, 301) Me.GroupBox2.Name = "GroupBox2" Me.GroupBox2.Size = New System.Drawing.Size(480, 63) Me.GroupBox2.TabIndex = 40 @@ -1152,7 +1186,7 @@ Partial Class Einstellungen Me.TabControl1.FontWeight = MetroFramework.MetroTabControlWeight.Regular Me.TabControl1.Location = New System.Drawing.Point(22, 60) Me.TabControl1.Name = "TabControl1" - Me.TabControl1.SelectedIndex = 3 + Me.TabControl1.SelectedIndex = 1 Me.TabControl1.Size = New System.Drawing.Size(501, 500) Me.TabControl1.TabIndex = 38 Me.TabControl1.UseSelectable = True @@ -1167,10 +1201,10 @@ Partial Class Einstellungen Me.TabPage6.HorizontalScrollbarBarColor = True Me.TabPage6.HorizontalScrollbarHighlightOnWheel = False Me.TabPage6.HorizontalScrollbarSize = 10 - Me.TabPage6.Location = New System.Drawing.Point(4, 44) + Me.TabPage6.Location = New System.Drawing.Point(4, 35) Me.TabPage6.Name = "TabPage6" Me.TabPage6.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage6.Size = New System.Drawing.Size(493, 452) + Me.TabPage6.Size = New System.Drawing.Size(493, 461) Me.TabPage6.TabIndex = 4 Me.TabPage6.Text = "Funimation" Me.TabPage6.VerticalScrollbarBarColor = True @@ -1711,4 +1745,6 @@ Partial Class Einstellungen Friend WithEvents CR_Filename As MetroFramework.Controls.MetroComboBox Public WithEvents LastVersion As MetroFramework.Controls.MetroLabel Friend WithEvents BackgroundWorker1 As System.ComponentModel.BackgroundWorker + Friend WithEvents DD_Episode_Prefix As MetroFramework.Controls.MetroComboBox + Friend WithEvents DD_Season_Prefix As MetroFramework.Controls.MetroComboBox End Class diff --git a/Crunchyroll Downloader/einstellungen.vb b/Crunchyroll Downloader/einstellungen.vb index 6273d50..ab5971e 100644 --- a/Crunchyroll Downloader/einstellungen.vb +++ b/Crunchyroll Downloader/einstellungen.vb @@ -80,6 +80,8 @@ Public Class Einstellungen CR_Filename.SelectedIndex = 1 ElseIf Main.CR_NameMethode = 2 Then CR_Filename.SelectedIndex = 2 + ElseIf Main.CR_NameMethode = 3 Then + CR_Filename.SelectedIndex = 3 Else CR_Filename.SelectedIndex = 0 End If @@ -201,6 +203,21 @@ Public Class Einstellungen End If + If DD_Season_Prefix.Items.Contains(Main.Season_Prefix) Then + DD_Season_Prefix.SelectedItem = Main.Season_Prefix + Else + DD_Season_Prefix.Items.Add(Main.Season_Prefix) + DD_Season_Prefix.SelectedItem = Main.Season_Prefix + End If + + If DD_Episode_Prefix.Items.Contains(Main.Episode_Prefix) Then + DD_Episode_Prefix.SelectedItem = Main.Episode_Prefix + Else + DD_Episode_Prefix.Items.Add(Main.Episode_Prefix) + DD_Episode_Prefix.SelectedItem = Main.Episode_Prefix + End If + + NumericUpDown2.Value = Main.ErrorTolerance NumericUpDown1.Value = Main.MaxDL TextBox1.Text = Main.Startseite @@ -229,6 +246,7 @@ Public Class Einstellungen End Sub Private Sub PictureBox4_Click(sender As Object, e As EventArgs) Handles pictureBox4.Click + ' MsgBox(Name_season.Text) Dim rk As RegistryKey = Registry.CurrentUser.CreateSubKey("Software\CRDownloader") If InStr(TextBox1.Text, "https://") Then Main.Startseite = TextBox1.Text @@ -239,6 +257,22 @@ Public Class Einstellungen Else End If + If DD_Season_Prefix.Text = "[default season prefix]" Then + Main.Season_Prefix = "[default season prefix]" + rk.SetValue("Prefix_S", "[default season prefix]", RegistryValueKind.String) + Else + Main.Season_Prefix = DD_Season_Prefix.Text + rk.SetValue("Prefix_S", DD_Season_Prefix.Text, RegistryValueKind.String) + End If + + If DD_Episode_Prefix.Text = "[default episode prefix]" Then + Main.Episode_Prefix = "[default episode prefix]" + rk.SetValue("Prefix_E", "[default episode prefix]", RegistryValueKind.String) + Else + Main.Episode_Prefix = DD_Episode_Prefix.Text + rk.SetValue("Prefix_E", DD_Episode_Prefix.Text, RegistryValueKind.String) + End If + If A1080p.Checked Then Main.Reso = 1080 rk.SetValue("Resu", 1080, RegistryValueKind.String) @@ -317,7 +351,9 @@ Public Class Einstellungen ElseIf CR_Filename.Text = "[episode number] [episode name]" Then Main.CR_NameMethode = 2 rk.SetValue("CR_NameMethode", 2, RegistryValueKind.String) - + ElseIf CR_Filename.Text = "[episode name] [episode number]" Then + Main.CR_NameMethode = 3 + rk.SetValue("CR_NameMethode", 3, RegistryValueKind.String) End If If MergeMP4.Checked = True Then @@ -900,6 +936,10 @@ Public Class Einstellungen End If End If + + 'MetroMessageBox.Show(Me, "Test", "Test Box", MessageBoxButtons.YesNo, MessageBoxIcon.None, 150) + 'MetroMessageBox.Show(Me, "Test", "Test Box", MessageBoxButtons.YesNo, MessageBoxIcon.None, MessageBoxDefaultButton.Button2, 150, MetroThemeStyle.Dark) + End Sub @@ -918,5 +958,7 @@ Public Class Einstellungen + + #End Region End Class \ No newline at end of file diff --git a/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.exe b/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.exe index ae65104..c336645 100644 Binary files a/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.exe and b/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.exe differ diff --git a/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.pdb b/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.pdb index 5934ee8..d35bb68 100644 Binary files a/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.pdb and b/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.pdb differ diff --git a/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.vbproj.GenerateResource.cache b/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.vbproj.GenerateResource.cache index 5b97db9..3cc7bc6 100644 Binary files a/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.vbproj.GenerateResource.cache and b/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.vbproj.GenerateResource.cache differ diff --git a/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.vbprojAssemblyReference.cache b/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.vbprojAssemblyReference.cache index 68c237a..faffb09 100644 Binary files a/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.vbprojAssemblyReference.cache and b/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.vbprojAssemblyReference.cache differ diff --git a/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.xml b/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.xml index 757bde7..c8badee 100644 --- a/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.xml +++ b/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.xml @@ -107,6 +107,11 @@ Video Position: 0 Sucht eine lokalisierte Zeichenfolge, die <img id="footer_country_flag" src="https://www.crunchyroll.com/i/country_flags/ ähnelt. + + + Sucht eine lokalisierte Zeichenfolge, die display_episode_number":" ähnelt. + + Sucht eine lokalisierte Zeichenfolge, die <meta property="og:url" content=" ähnelt. @@ -122,6 +127,11 @@ Video Position: 0 Sucht eine lokalisierte Zeichenfolge, die ”</h4> ähnelt. + + + Sucht eine lokalisierte Zeichenfolge, die seasonNumber":" ähnelt. + + Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. diff --git a/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll_Downloader.Resources.resources b/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll_Downloader.Resources.resources index f79c13b..355734e 100644 Binary files a/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll_Downloader.Resources.resources and b/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll_Downloader.Resources.resources differ diff --git a/Crunchyroll Downloader/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache b/Crunchyroll Downloader/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache index 3d8fda9..4b31951 100644 Binary files a/Crunchyroll Downloader/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache and b/Crunchyroll Downloader/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/Crunchyroll Downloader/obj/x86/Debug/TempPE/My Project.Resources.Designer.vb.dll b/Crunchyroll Downloader/obj/x86/Debug/TempPE/My Project.Resources.Designer.vb.dll index beff2e2..7b8c0f9 100644 Binary files a/Crunchyroll Downloader/obj/x86/Debug/TempPE/My Project.Resources.Designer.vb.dll and b/Crunchyroll Downloader/obj/x86/Debug/TempPE/My Project.Resources.Designer.vb.dll differ