From c9e85c5f308b2c227deb149800d7ad7f1896094f Mon Sep 17 00:00:00 2001 From: hama3254 <52826614+hama3254@users.noreply.github.com> Date: Sat, 11 May 2024 18:47:10 +0200 Subject: [PATCH] added hidden queue added hidden queue #948 --- .vs/Crunchyroll Downloader/v17/.suo | Bin 246272 -> 252416 bytes Crunchyroll Downloader/Anime_Add.vb | 13 ++++++- Crunchyroll Downloader/App.config | 3 ++ Crunchyroll Downloader/Browser.vb | 2 +- Crunchyroll Downloader/Main.vb | 36 ++++++++++++------ .../My Project/AssemblyInfo.vb | 4 +- .../My Project/Settings.Designer.vb | 12 ++++++ .../My Project/Settings.settings | 3 ++ .../einstellungen.Designer.vb | 34 ++++++++++++----- Crunchyroll Downloader/einstellungen.vb | 25 ++++++++---- Crunchyroll Downloader/queue.vb | 11 +++++- 11 files changed, 108 insertions(+), 35 deletions(-) diff --git a/.vs/Crunchyroll Downloader/v17/.suo b/.vs/Crunchyroll Downloader/v17/.suo index c8d752531b9b797810aabcdc87791bd8c27767f9..7702f69f0fd6c7b02f53734b4a0f49e9669c6b12 100644 GIT binary patch delta 10442 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 delta 12774 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 C&cm$$ diff --git a/Crunchyroll Downloader/Anime_Add.vb b/Crunchyroll Downloader/Anime_Add.vb index 9962dba..c8bbe0f 100644 --- a/Crunchyroll Downloader/Anime_Add.vb +++ b/Crunchyroll Downloader/Anime_Add.vb @@ -44,6 +44,10 @@ Public Class Anime_Add Private Sub Anime_Add_Load(sender As Object, e As EventArgs) Handles MyBase.Load + If My.Settings.HiddenQueue = True Then + Queue.Show() + End If + If Main.Mail = Nothing And My.Settings.Mail = "na" Then 'Dim Login As Form = LoginForm 'Login.StartPosition = 0 @@ -224,12 +228,19 @@ Public Class Anime_Add ' ' pictureBox4.Enabled = True 'Else If Main.RunningQueue = True Then - If CBool(InStr(textBox1.Text, "series/")) Then + If CBool(InStr(textBox1.Text, "series/")) And My.Settings.HiddenQueue = False Then Debug.WriteLine("Queue_Block_series") 'textBox1.Text = "URL" StatusLabel.Text = "Status: Series add blocked, queue is running!" Pause(5) StatusLabel.Text = "Status: Idle" + ElseIf CBool(InStr(textBox1.Text, "series/")) And My.Settings.HiddenQueue = True Then + Debug.WriteLine("Queue_adding_series") + 'textBox1.Text = "URL" + StatusLabel.Text = "Status: Series added to queue." + 'Pause(5) + 'StatusLabel.Text = "Status: Idle" + Main.LoadBrowser(textBox1.Text) Else Debug.WriteLine("Queue_Block") Main.ListBoxList.Add(textBox1.Text) diff --git a/Crunchyroll Downloader/App.config b/Crunchyroll Downloader/App.config index 9dff37d..fddd973 100644 --- a/Crunchyroll Downloader/App.config +++ b/Crunchyroll Downloader/App.config @@ -159,6 +159,9 @@ na + + False + diff --git a/Crunchyroll Downloader/Browser.vb b/Crunchyroll Downloader/Browser.vb index 668b984..ba04c64 100644 --- a/Crunchyroll Downloader/Browser.vb +++ b/Crunchyroll Downloader/Browser.vb @@ -115,7 +115,7 @@ Public Class Browser If Main.UserBowser = False Then Me.Location = New Point(-10000, 10000) - Timer1.Enabled = True + 'Timer1.Enabled = True End If WebView2.Source = New Uri(Main.Startseite) End Sub diff --git a/Crunchyroll Downloader/Main.vb b/Crunchyroll Downloader/Main.vb index d91f697..dc4ec39 100644 --- a/Crunchyroll Downloader/Main.vb +++ b/Crunchyroll Downloader/Main.vb @@ -70,8 +70,10 @@ Public Class Main Public MergeSubsFormat As String = "mov_text" Public DlSoftSubsRDY As Boolean = True Public DialogTaskString As String - Dim NewAPIString1 As String - Dim NewAPIString2 As String + 'Dim NewAPIString1 As String + 'Dim NewAPIString2 As String + + Dim TTL As Integer = 0 'Public ErrorBrowserBackString As String Public RunningQueue As Boolean = False @@ -128,7 +130,9 @@ Public Class Main Public WebbrowserText As String = Nothing Public WebbrowserTitle As String = Nothing Public WebbrowserCookie As String = Nothing + Public UserQueue As Boolean = False Public UserBowser As Boolean = False + Public BowserWasOpen As Boolean = False Public HybridMode As Boolean = False @@ -735,7 +739,7 @@ Public Class Main Catch ex As Exception RunningDownloads = Panel1.Controls.Count End Try - If RunningDownloads < MaxDL Then + If RunningDownloads < MaxDL Or My.Settings.HiddenQueue = True Then Exit For Else 'MsgBox(e) @@ -2874,20 +2878,28 @@ Public Class Main End Sub Private Sub Btn_Queue_Click(sender As Object, e As EventArgs) Handles Btn_Queue.Click - If File.Exists("cookies.txt") = False Then - If Application.OpenForms().OfType(Of Browser).Any = True Then - Else - UserBowser = False - Browser.Show() - End If - End If - If Queue.WindowState = System.Windows.Forms.FormWindowState.Minimized Then - Queue.WindowState = System.Windows.Forms.FormWindowState.Normal + UserQueue = True + If Application.OpenForms().OfType(Of Queue).Any = True Then + Queue.Location = New Point(CInt(Me.Location.X + Me.Width / 2 - Queue.Width / 2), CInt(Me.Location.Y + Me.Height / 2 - Queue.Height / 2)) + If Queue.WindowState = System.Windows.Forms.FormWindowState.Minimized Then + Queue.WindowState = System.Windows.Forms.FormWindowState.Normal + Queue.ShowInTaskbar = True + End If Else + Queue.Location = New Point(CInt(Me.Location.X + Me.Width / 2 - Queue.Width / 2), CInt(Me.Location.Y + Me.Height / 2 - Queue.Height / 2)) Queue.Show() End If + Try + Dim hwnd As IntPtr = FindWindow(Nothing, Queue.Text) + SetForegroundWindow(hwnd) + Catch ex As Exception + Debug.WriteLine("Queue foreground failure") + End Try + + + End Sub diff --git a/Crunchyroll Downloader/My Project/AssemblyInfo.vb b/Crunchyroll Downloader/My Project/AssemblyInfo.vb index 78ef7ce..240e473 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/Settings.Designer.vb b/Crunchyroll Downloader/My Project/Settings.Designer.vb index ac30492..c4cf850 100644 --- a/Crunchyroll Downloader/My Project/Settings.Designer.vb +++ b/Crunchyroll Downloader/My Project/Settings.Designer.vb @@ -606,6 +606,18 @@ Namespace My Me("PW") = value End Set End Property + + _ + Public Property HiddenQueue() As Boolean + Get + Return CType(Me("HiddenQueue"),Boolean) + End Get + Set + Me("HiddenQueue") = value + End Set + End Property End Class End Namespace diff --git a/Crunchyroll Downloader/My Project/Settings.settings b/Crunchyroll Downloader/My Project/Settings.settings index e83094e..9776e0c 100644 --- a/Crunchyroll Downloader/My Project/Settings.settings +++ b/Crunchyroll Downloader/My Project/Settings.settings @@ -140,5 +140,8 @@ na + + False + \ No newline at end of file diff --git a/Crunchyroll Downloader/einstellungen.Designer.vb b/Crunchyroll Downloader/einstellungen.Designer.vb index 0a09a52..a21a577 100644 --- a/Crunchyroll Downloader/einstellungen.Designer.vb +++ b/Crunchyroll Downloader/einstellungen.Designer.vb @@ -144,6 +144,7 @@ Partial Class Einstellungen Me.Label5 = New MetroFramework.Controls.MetroLabel() Me.BackgroundWorker1 = New System.ComponentModel.BackgroundWorker() Me.Btn_Save = New System.Windows.Forms.Button() + Me.CB_HideQueue = New MetroFramework.Controls.MetroCheckBox() CType(Me.pictureBox1, System.ComponentModel.ISupportInitialize).BeginInit() Me.GroupBox14.SuspendLayout() Me.SoftSubs.SuspendLayout() @@ -334,10 +335,10 @@ Partial Class Einstellungen Me.TabPage2.HorizontalScrollbarBarColor = True Me.TabPage2.HorizontalScrollbarHighlightOnWheel = False Me.TabPage2.HorizontalScrollbarSize = 10 - Me.TabPage2.Location = New System.Drawing.Point(4, 44) + Me.TabPage2.Location = New System.Drawing.Point(4, 54) Me.TabPage2.Name = "TabPage2" Me.TabPage2.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage2.Size = New System.Drawing.Size(501, 519) + Me.TabPage2.Size = New System.Drawing.Size(501, 509) Me.TabPage2.TabIndex = 1 Me.TabPage2.Text = " Output " Me.TabPage2.VerticalScrollbarBarColor = True @@ -362,6 +363,7 @@ Partial Class Einstellungen 'GroupBox18 ' Me.GroupBox18.BackColor = System.Drawing.Color.Transparent + Me.GroupBox18.Controls.Add(Me.CB_HideQueue) Me.GroupBox18.Controls.Add(Me.ListViewAdd_True) Me.GroupBox18.Font = New System.Drawing.Font("Arial", 9.75!) Me.GroupBox18.ForeColor = System.Drawing.Color.Black @@ -376,7 +378,7 @@ Partial Class Einstellungen ' Me.ListViewAdd_True.AutoSize = True Me.ListViewAdd_True.FontSize = MetroFramework.MetroCheckBoxSize.Medium - Me.ListViewAdd_True.Location = New System.Drawing.Point(119, 25) + Me.ListViewAdd_True.Location = New System.Drawing.Point(40, 21) Me.ListViewAdd_True.Name = "ListViewAdd_True" Me.ListViewAdd_True.Size = New System.Drawing.Size(255, 19) Me.ListViewAdd_True.TabIndex = 5 @@ -844,10 +846,10 @@ Partial Class Einstellungen Me.TabPage1.HorizontalScrollbarBarColor = True Me.TabPage1.HorizontalScrollbarHighlightOnWheel = False Me.TabPage1.HorizontalScrollbarSize = 10 - Me.TabPage1.Location = New System.Drawing.Point(4, 44) + Me.TabPage1.Location = New System.Drawing.Point(4, 54) Me.TabPage1.Name = "TabPage1" Me.TabPage1.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage1.Size = New System.Drawing.Size(501, 519) + Me.TabPage1.Size = New System.Drawing.Size(501, 509) Me.TabPage1.TabIndex = 0 Me.TabPage1.Text = " Main " Me.TabPage1.VerticalScrollbar = True @@ -1081,7 +1083,7 @@ Partial Class Einstellungen Me.TabControl1.ItemSize = New System.Drawing.Size(86, 50) Me.TabControl1.Location = New System.Drawing.Point(22, 60) Me.TabControl1.Name = "TabControl1" - Me.TabControl1.SelectedIndex = 4 + Me.TabControl1.SelectedIndex = 1 Me.TabControl1.Size = New System.Drawing.Size(509, 567) Me.TabControl1.TabIndex = 0 Me.TabControl1.UseSelectable = True @@ -1095,9 +1097,9 @@ Partial Class Einstellungen Me.MetroTabPage2.HorizontalScrollbarBarColor = True Me.MetroTabPage2.HorizontalScrollbarHighlightOnWheel = False Me.MetroTabPage2.HorizontalScrollbarSize = 10 - Me.MetroTabPage2.Location = New System.Drawing.Point(4, 44) + Me.MetroTabPage2.Location = New System.Drawing.Point(4, 54) Me.MetroTabPage2.Name = "MetroTabPage2" - Me.MetroTabPage2.Size = New System.Drawing.Size(501, 519) + Me.MetroTabPage2.Size = New System.Drawing.Size(501, 509) Me.MetroTabPage2.TabIndex = 8 Me.MetroTabPage2.Text = " Naming " Me.MetroTabPage2.VerticalScrollbarBarColor = True @@ -1401,9 +1403,9 @@ Partial Class Einstellungen Me.MetroTabPage1.HorizontalScrollbarBarColor = True Me.MetroTabPage1.HorizontalScrollbarHighlightOnWheel = False Me.MetroTabPage1.HorizontalScrollbarSize = 10 - Me.MetroTabPage1.Location = New System.Drawing.Point(4, 44) + Me.MetroTabPage1.Location = New System.Drawing.Point(4, 54) Me.MetroTabPage1.Name = "MetroTabPage1" - Me.MetroTabPage1.Size = New System.Drawing.Size(501, 519) + Me.MetroTabPage1.Size = New System.Drawing.Size(501, 509) Me.MetroTabPage1.TabIndex = 7 Me.MetroTabPage1.Text = " Crunchyroll " Me.MetroTabPage1.VerticalScrollbarBarColor = True @@ -1644,6 +1646,17 @@ Partial Class Einstellungen Me.Btn_Save.TabIndex = 9 Me.Btn_Save.UseVisualStyleBackColor = False ' + 'CB_HideQueue + ' + Me.CB_HideQueue.AutoSize = True + Me.CB_HideQueue.FontSize = MetroFramework.MetroCheckBoxSize.Medium + Me.CB_HideQueue.Location = New System.Drawing.Point(328, 21) + Me.CB_HideQueue.Name = "CB_HideQueue" + Me.CB_HideQueue.Size = New System.Drawing.Size(112, 19) + Me.CB_HideQueue.TabIndex = 6 + Me.CB_HideQueue.Text = "hidden Queue" + Me.CB_HideQueue.UseSelectable = True + ' 'Einstellungen ' Me.ApplyImageInvert = True @@ -1831,4 +1844,5 @@ Partial Class Einstellungen Friend WithEvents CB_Mod1 As MetroFramework.Controls.MetroCheckBox Friend WithEvents CB_vttStyle As MetroFramework.Controls.MetroCheckBox Friend WithEvents AMD_AV1 As ToolStripMenuItem + Friend WithEvents CB_HideQueue As MetroFramework.Controls.MetroCheckBox End Class diff --git a/Crunchyroll Downloader/einstellungen.vb b/Crunchyroll Downloader/einstellungen.vb index 30204ba..a59e020 100644 --- a/Crunchyroll Downloader/einstellungen.vb +++ b/Crunchyroll Downloader/einstellungen.vb @@ -19,6 +19,7 @@ Public Class Einstellungen Public CR_SoftSubsTemp As New List(Of String) Dim TempCheckSubMod1 As Boolean = False Dim TempVTTStyle As Boolean = False + Dim TempMultiDL As Boolean = False Private Sub Einstellungen_Load(sender As Object, e As EventArgs) Handles MyBase.Load @@ -34,6 +35,8 @@ Public Class Einstellungen Manager.Owner = Me Me.StyleManager = Manager + CB_HideQueue.Checked = My.Settings.HiddenQueue + CB_OverrideDub.Checked = My.Settings.OverrideDub CB_Cap.Checked = My.Settings.Captions @@ -545,14 +548,10 @@ Public Class Einstellungen Main.ErrorTolerance = CInt(NumericUpDown2.Value) My.Settings.ErrorTolerance = Main.ErrorTolerance - If ListViewAdd_True.Checked = True Then - Main.UseQueue = True - My.Settings.QueueMode = Main.UseQueue - ElseIf ListViewAdd_True.Checked = False Then - Main.UseQueue = False - My.Settings.QueueMode = Main.UseQueue - End If + Main.UseQueue = ListViewAdd_True.Checked + My.Settings.QueueMode = Main.UseQueue + My.Settings.HiddenQueue = CB_HideQueue.Checked Main.SoftSubs.Clear() Main.SoftSubs.AddRange(CR_SoftSubsTemp) @@ -967,6 +966,18 @@ Public Class Einstellungen End If End Sub + Private Sub CB_HideQueue_CheckedChanged(sender As Object, e As EventArgs) Handles CB_HideQueue.CheckedChanged + If CB_HideQueue.Checked = True Then + TempMultiDL = ListViewAdd_True.Checked + ListViewAdd_True.Checked = True + ListViewAdd_True.Enabled = False + + Else + ListViewAdd_True.Checked = TempMultiDL + ListViewAdd_True.Enabled = True + End If + End Sub + diff --git a/Crunchyroll Downloader/queue.vb b/Crunchyroll Downloader/queue.vb index a66d3cf..d0cfc31 100644 --- a/Crunchyroll Downloader/queue.vb +++ b/Crunchyroll Downloader/queue.vb @@ -16,14 +16,22 @@ Public Class Queue ListBox1.ForeColor = Main.ForeColorValue bs.DataSource = Main.ListBoxList ListBox1.DataSource = bs - + Me.Icon = My.Resources.icon Btn_min.Image = Main.MinImg Btn_Close.Image = Main.CloseImg + Me.StartPosition = 0 + If Main.UserQueue = False Then + Me.Location = New Point(-10000, -10000) + 'Me.ShowInTaskbar = False + 'Me.WindowState = System.Windows.Forms.FormWindowState.Minimized + RunQueue.Checked = True + End If End Sub Private Sub Btn_Close_Click(sender As Object, e As EventArgs) Handles Btn_Close.Click + Main.UserQueue = False Me.Close() End Sub @@ -44,7 +52,6 @@ Public Class Queue If Main.ListBoxList.Count <> ListBox1.Items.Count Then bs.ResetBindings(False) End If - End Sub Private Sub Queue_Resize(sender As Object, e As EventArgs) Handles Me.Resize