From ce0d3801eff86c9d0a5f43a7f2d5c64a4edeaf6b Mon Sep 17 00:00:00 2001 From: hama3254 Date: Mon, 19 Jun 2023 20:17:59 +0200 Subject: [PATCH] fix queue issue fix queue issue --- .vs/Crunchyroll Downloader/v17/.suo | Bin 205824 -> 212480 bytes Crunchyroll Downloader/Anime_Add.vb | 28 +++++++++++++++++++----- Crunchyroll Downloader/Main.vb | 1 + Crunchyroll Downloader/einstellungen.vb | 2 ++ Crunchyroll Downloader/queue.vb | 12 ++++++++++ 5 files changed, 37 insertions(+), 6 deletions(-) diff --git a/.vs/Crunchyroll Downloader/v17/.suo b/.vs/Crunchyroll Downloader/v17/.suo index 5e5f5cbdf8738fffe2f5071d5d666d95e0baaa8b..193bd126582d3ba7f524a0b9697c9f7f0ba59702 100644 GIT binary patch delta 9402 zcmdU!3tW^{-pA*h8O8x79WEl`hywv40uC1y6>+#|il(HbuA(yByhI2%c!e0XT5nr0 zCpos6;>1q5l_`@vuKF5kYj%0Pt(lscn&#HFYGu8vuPg8G%ta=$vUdA?-hKFd=l?(d z=RD{7KmT){2lGL-`IfpawP%q`CR2jjZEbB3G6H-+9}vU*a))gzpG7RRwDY-|p(9UQ zPmwveVc5(T(`?mHs0zT3oFNfRPZgwzeM6U%Y_>?A&GrW*+&2=%oz6iPTz-rw0%}o> z=U1fuwPkR~wSm0skM!H|nV zwJTi%`4|xOn8A2-b1t6LVGPS4nTF=O6ZI2A!2 z;Z%+iTtC98#sjxgiIw(KP8Ei7LO{DyVK9YP{RRlH(&1(%q&KAS;6Xq*)lJ}bDp9}N zv)v7HJDONx!l|l24shQOLU}@ug>5o;3j9^vuZ7Vl6pu@Il}HM&5^^l$x4_e>g#A<3 z{W8dZ0O3@^?w&fKi)(?)9s$|Ur3<_8Xm)X^Mzxe8&;X|L$yKZqO1@7p%kxn&&9@4r z6^0k6J#EK)a_>1U8ZFZXy}}L##M-ZG6Nx=ab6akY2t7kAHm%7vOGNJaas`zU`|WO& zHaG7laCO0-irVEZ$TtSYgVY-Hagj`b!Yii%a&etQF}N*bpMg-y7R!_Kc= zBN}TIwFDh>%|kS?Yhx}F>toci&P04z)w(vaiB&zj+7g?k(&IVb?>uWa$7T|5M--j$ zog0>Ton5#79I+-Vtv1TfpCrM&{0*vS81R}N`FH7P&|{Q;NV$0dCs)!;tR8FT>};0OFc00;!#0Lxt%O~P5l z!X&nJVRGOQm_!vrT{080-WbT#i_~i2DT1+1Ti`gz955b;XQnvpTFq3*X)fCgNVag% z3b+ANJRYl9>&T-EYk=fn9e5V}9y|xugXh8RZN}9EOT(_6e34+xS=Oag400Ax1*6kC z;4yKpQ*PZr;_dO%j}hy7YAsM&^Qm=?+S)>ySrf&gB6@numgAWx+|P+~0y9O76Xyf_ z^$0a#^(Vr7^s)Nt5ysMa#oJl>mI`+NYXL0xYK(7EY(k>b{zusJm|9U1F8eGo^ z|GM90&x4EvQJ^=727N#b=nE169A#t@q$oQXvOgH?N(-C&N_E-NTyhws0i=TrFbdQg zgJ)$!js|1EgWw_HEQs!(bwq1SW&u0O73e%dHo{?zRb8igdj(BJWYiGB6jE zg9=ay<^dC^0`tKFumpIPQH^vBcns76Ggt;ho|Ta3i+&a4?_4%ve+v53pbpdn3t-?G zuo2W7qazz3Hvubn0W^U>02_D_yacdNW)O?IGwU3^o$aRyFISjz_lOKL?S$3L~ zDr77k#uo3qO*Klkc-NDbkSvw(j1Eq-=P+TJmxkKSgUu*2Q;vY_4%WmOiLH&)620GD zk@9aSqsfom^owRqFsoe$y{qbl`(kC^ zd5S#GzIkS>BbRAy4%OXhi2eFrHRa74NGJ=Pc#bxHXqjXPZFniDGT`NxckDj)a?p+s zzdRSBPC8opMSuU3qnqCAeuzz<6hU5L%O}+|A21P8&Z^$3^%C7z*l)byO&Q%;sf@r7 zP4yU}Y}IsRP1RYj0c5WT`~e zo!sS#LG%)*;(_)>XMRhpyQ$@fiFmWBBg;vn{l<|_#Cnlhzd|Go!5;eNX<|9_4-&v` z92%_>Z7T3AhnWuNsKj|S-_z=~7Ad9u##^1JIZiQ!*Pph2CAO{UppGv~2~uJ&yYvAYpUFD2&ouAOvw5)%tBBG*_GTifZA1$&U5?m#XmNG;luKWCQO-1ET+DB5 z%_;8fFZ4fWf0Q+|SUTVhePiYNxev+H(su?MGT!f;aQVFx4}8LnhK$3F-a}Sg8oyWM zncutQvhw9O{nx|ZnmTIdnth{Iu7NHe6VpFo^SD{6G((2ASHu&_zBM>1oTNQO#$@zqbByeU3+t>$V2-H{vVU{Sm-y=)S55Vu{b-lik9t11NSEWxoHxNWF7fUG zYWJh|A%0an#q$cN8rxX3dO&h)VuEuYvpMcOJ%e^)&s~Xbf8sUR1MP;>t(ZnLjc4&! z{MphErtxwE)rd0Mb8ZtQz%j%5wL;pNnXj6yw<+RipDE~(h;Qy|3DWKtK`-d(fPsC^ z!=bA7B_!OLH$#8fm3{^CRj>uT2DXB2zz#(I*CDrq79fEg;7?#D_%Glta}V@ZSNhK` z`LRnPPfXj}?Fq*-?|G#E8~R~a`nWjW)}C;sPI=@y4gHKOebyz#$~Xu8Jov zf_TMwqTQ|~7rm_eC_8pLMv76Alf+IBR1)$BghB+_fCR@mL4ila)qHIvQN%;>2xDKa z;Z`LLmV#B}uW}KDMA<(SglsV+#Cn~w3)}s<$v{FR9Ndn3wFe$?M!tu@!>%7T-z}0& z_EC%XEuj8hG?HS~8#`& zq5-zs?V;p?+}1>>Etqt+*&y{qV|xi1HQR`in>Q1Ge)AQg=c$`XtYmtHtRb9M!W}AWd@KWG8vH?zWVZ#qfB zx%qus!Zx%7OO0npK6(`i*9@6MK9zI&7G1@se@XqN^=DCsEeGAgPG*n{*U2dbIU|K! zCUKO0L3o#s$UtuXjF@@iAX3S%^e2f@(?pU-_=RUg{?AD(v6Y}vS4bpbXH6PD{3;p3 z%i4&NWe@j}%x&ZVk&DGO&W9#=W#VH*4Xfo#d3YL0<*kE>k2JzWcFOhU2Ntx{+-Rwb z+A~0G$#_UWwL8HGYvub>F+O-NqS042sil97~U$U23s}yP}zxQ@C*gr zo%{K)>&v3|j`r23wA@$lbz$-P-&$L~-Z*s1Cx5c#nVP#tdRB2}41$ijy-Kmx+uGdQ zQgTx40OyMmAMZuC@a80vFJY1!h>vhM9m3J<4lYOdv2}EVv_VM=2)C>zSyEOV*)9JG zNBpiAc4|@47P)S~t%YMwF8WwkRJCP5gdqbrJr^A=)(z8Ooj5soQe z4YIvMe0b|N_>|%Rxg~EoPB0#aPr~@>rzF@hGu_@N@!WWleEjpA=Neh0>gW=Za0zNt zQ^gNVJU3q@<`xZ&QcOw4STDg&n23=Yjt|Sp_)Wlf-3*7G1T6u7SvXC`A(yz94o#20 zbdZT}ZF)Q@{v6(e4}V2ieMp_&qIUWqk3vWBMM4Pfci-h5UK4Q{BWDzcF6Ju$F3YsB4L zSYJHM`8_?NBym7VN^(I_TtRV(J}x;ixiBszS)UwNTxd)lP?S`dSUfOMEnCS+Iz8%b zESvpk@eE^85f7VB`|=|_s2ADKx9REXyWL87{9j!dcdd1rj;`rY9hSIgpI1dyaaFOS zZDgmTS)P_QVJYNwWwea&cB2%<+k zTKQwMtn_#KR`GP2Y|~)Vs>q?)0q%C|rVcMNEvTw2nbybAp}_Co_=&DvY6zrJ{~yCm z1V0)?^&Qq5zsnlzqE2^2hxDQ%G0%%J&x?6h0S#vTK2TFfI!;r7|02x9e}5Lr1|XIW zk^QV#)^F<13tD1 zTxd)D=DA;q(2e!b_58I8dcqlT`N=8RJ71iKGQ%FBF)ky*@Db*BHGy9nLc8$ZCK~Q| zd*+`_p}xGxC$-?^3B#%J$?+UlQe>B`?4c6mt$)Jn@eD73R zz|Gw-$kI%j&C4rjpwzXDMi5T&=>dI+Gb!82(MsR>DTo zmE6N5-9tcY4{-mW^Dey3vj8>`>1{vhda^odztFXT%fq1S9?N_pxKyeaw8dLwx1I3JfT5I=C)wF~;e4x#1W9`?&a@#qo;k2Gk;pJCpkW~H;TIbsmDnG4QyNn!UXSW;pg|70@{{x$yUAq7P delta 7449 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 Main.MaxDL Then + If Main.RunningQueue = True Then + If CBool(InStr(textBox1.Text, "series/")) Then + Debug.WriteLine("Queue_Block_series") + 'textBox1.Text = "URL" + StatusLabel.Text = "Status: Series add blocked, queue is running!" + Pause(5) + StatusLabel.Text = "Status: Idle" + Else + Debug.WriteLine("Queue_Block") + Main.ListBoxList.Add(textBox1.Text) + textBox1.Text = "URL" + StatusLabel.Text = "Status: Added to Queue" + Pause(5) + StatusLabel.Text = "Status: Idle" + End If + ElseIf Main.RunningDownloads >= Main.MaxDL Then Debug.WriteLine("Max_Dl") - 'ListBox1.Items.Add(textBox1.Text) Main.ListBoxList.Add(textBox1.Text) - textBox1.ForeColor = Color.FromArgb(9248044) - Pause(2) - textBox1.ForeColor = Color.Black textBox1.Text = "URL" + StatusLabel.Text = "Status: Added to Queue" + Pause(5) + StatusLabel.Text = "Status: Idle" + + Else If CBool(InStr(textBox1.Text, "funimation.com")) Then @@ -494,7 +510,7 @@ Public Class Anime_Add ElseIf Main.WebbrowserURL = "https://funimation.com/js" Then - comboBox3.Items.Clear() + comboBox3.Items.Clear() comboBox4.Items.Clear() comboBox3.Text = Nothing comboBox4.Text = Nothing diff --git a/Crunchyroll Downloader/Main.vb b/Crunchyroll Downloader/Main.vb index 7b2fee6..346cecd 100644 --- a/Crunchyroll Downloader/Main.vb +++ b/Crunchyroll Downloader/Main.vb @@ -103,6 +103,7 @@ Public Class Main 'Public ErrorBrowserString As String 'Public ErrorBrowserUrl As String 'Public ErrorBrowserBackString As String + Public RunningQueue As Boolean = False Public UserCloseDialog As Boolean = False Dim Aktuell As String Dim Gesamt As String diff --git a/Crunchyroll Downloader/einstellungen.vb b/Crunchyroll Downloader/einstellungen.vb index df72ada..235e251 100644 --- a/Crunchyroll Downloader/einstellungen.vb +++ b/Crunchyroll Downloader/einstellungen.vb @@ -36,6 +36,8 @@ Public Class Einstellungen CB_OverrideDub.Checked = My.Settings.OverrideDub CB_Cap.Checked = My.Settings.Captions + CB_Mod1.Checked = My.Settings.SubtitleMod1 + TempTB.Text = Main.TempFolder LeadingZeroDD.SelectedIndex = Main.LeadingZero diff --git a/Crunchyroll Downloader/queue.vb b/Crunchyroll Downloader/queue.vb index 4e7aff3..0057667 100644 --- a/Crunchyroll Downloader/queue.vb +++ b/Crunchyroll Downloader/queue.vb @@ -58,6 +58,7 @@ Public Class Queue Private Sub RunQueue_CheckedChanged(sender As Object, e As EventArgs) Handles RunQueue.CheckedChanged RunQueueTimer.Enabled = RunQueue.Checked + Main.RunningQueue = RunQueue.Checked End Sub Private Sub RunQueueTimer_Tick(sender As Object, e As EventArgs) Handles RunQueueTimer.Tick @@ -140,4 +141,15 @@ Public Class Queue End If End If End Sub + + + + Private Sub ListBox1_MouseDoubleClick(sender As Object, e As MouseEventArgs) Handles ListBox1.MouseDoubleClick + If RunQueue.Checked = True Then + MessageBox.Show("Please stop the queue before removing entries", "Unable to comply.") + Else + Dim UriUsed As String = ListBox1.Text + Main.ListBoxList.Remove(UriUsed) + End If + End Sub End Class \ No newline at end of file