From 95ad6b3bdb9fdd54a43d1724aa32b2520db11354 Mon Sep 17 00:00:00 2001 From: hama3254 <52826614+hama3254@users.noreply.github.com> Date: Fri, 8 Jul 2022 20:54:20 +0200 Subject: [PATCH] UI and add-on improvements UI and add-on improvements --- .vs/Crunchyroll Downloader/v17/.suo | Bin 129536 -> 118272 bytes Crunchyroll Downloader/Anime_Add.Designer.vb | 34 +- Crunchyroll Downloader/Anime_Add.resx | 2 +- Crunchyroll Downloader/Anime_Add.vb | 184 ++++++----- Crunchyroll Downloader/App.config | 4 +- Crunchyroll Downloader/CRD_List_Item.vb | 31 +- .../Crunchyroll Downloader.vbproj | 31 +- Crunchyroll Downloader/Main.designer.vb | 16 +- Crunchyroll Downloader/Main.resx | 284 ++++++++++------ Crunchyroll Downloader/Main.vb | 307 ++++++++++-------- .../My Project/AssemblyInfo.vb | 4 +- .../My Project/Resources.Designer.vb | 32 +- .../My Project/Resources.resx | 17 +- .../Resources/add_mass_cancel.png | Bin 4237 -> 4973 bytes .../Resources/add_mass_cancel_hover.png | Bin 4197 -> 4975 bytes .../main_button_download-deactivate.png | Bin 3896 -> 5146 bytes Crunchyroll Downloader/network_scan.vb | 4 +- Crunchyroll Downloader/packages.config | 8 +- 18 files changed, 547 insertions(+), 411 deletions(-) diff --git a/.vs/Crunchyroll Downloader/v17/.suo b/.vs/Crunchyroll Downloader/v17/.suo index c03bc3f2d3277023491c5031dc460e437ed27d69..cf12c1d663cf7820cc73a84fe36d5fd5ee8ff565 100644 GIT binary patch delta 8583 zcmeI14P2B}zQ>>cGcz#AjJyqRLcA$2BH#=lidxP9nHDO(mH7e=Fer+k!>EA>sAPKA zx-mz6tTj?AyKTjaW73)?YPZ(i)|b}pZPjeI+O_nv+M&Y(W z(@+*GM)y9q?`7$V{bNc+c4Gmn6>CKkv5VpabpTTEem4sU>n9qCEmDlp$_ZW`8QMZb zv`YNLqhq8DZ5RNFzsH|mkb46^(CkW2K^O?aUGZdu(I63Ifvb4W7a^~FA6LlJ;vplD zAC-s96Z#?kJouR)G{{P!h^zrVfY-M_K*tDaU?I>014suWfU{WV{~@mU@E+-r9&saN z6UYHY;QIUQDOH);>`G!yp(*+E5UB)JU_Mv?te_g$0B`7GguIMeSIFfhkn6xwP!Adb z`<@D1mOG-n^kXbH+0%0TbNt~p=Y7qq3?Vi?i zTbH|w=NCMzC%@-5o*H`I;0}$KCKqzs)Q#x{!#$KKoA6UAQ*&zP!I;fK_3tSBEdZ%3Pgh#5DVf!U(gT4g9MNW zl0biu3rm|LpI zWd{@nW~-Q_&O|XVjy!v_&Wa{dvzmDiY51JShm$+Y>s3Swh+U37q}F((v(C5z_Krf& zY<<^k=_AJXG_q%$4^tlR#o|Nys=1^?ilZQ8CMo$)VmngDGBMJm74Acf&zSD7Gh5^l zO&${5GX~b0B=*=n`5La_ULg1abom z`k&$z1!ypVhibP# z+5|QO#+IrQ!(W5+I%oyk057Wz;V$U+)$Vqs>_PY*QW6_}4e22G4frj1AN&p+0*Ap7 za1?w1eh-d;4*@UtBZMD=Pr#?(kKi~s0ZxL?z$x%K;C}dL@CEo1a4X|!o@KGe2<^adz4MZ>zK^C?nxyBc7fr{7_8LrZ4h6f-NpOz%JIn`59^LdqzqZL zW1?D}jwH95>MA07xvX?&Sy4l1f*g0gV2o61a$PUDU-IgOa`On)d(iPt)No==s>j;q zucAP6sl__|2EStC%>xvJ1{s*K^vvY=&~abpU#J*T_*zW!Q{Pwg-~p}FgFFqU~vo+gq0HnVI=bVS79rK0X($E+5eqvS)T^YPwCzF zxN7wedw0MM-i^{?xDWp`dU)?u8a^hr0`B*0Z7;ogyF2oJuMK1P$Z(IIQ?3j?dbl

_4&l^I@NNL`r#!C?>W|yY7J*USigm zZw|-3d2sBbs&7}HKCto+D^{mB4On~0azuca1~Glae8wvhDPk)&C7ra8zEGjuBHR#EG&(xh? zP&(&eUw2d+#HL%-R`T8->Y_=$M_N#>qmZdBOxP8$o}f^wrP+%hL7ImmU%jBd_*^* z@q=qS*R1jT$OMHsi%h zE}VU`ygxri2svX$PQreJEo+Woe_h^(pCn}6`;iWj9bInVM-jo%IK7eB$?5lrGt}G5 zvdE`?J(|TUbdYTZwg<9{e%eAV+8J5z_G1 zc^b*rX(Xhg`kMQ{44x{KHKf zw$4be23yNZ(jKr>S`gm9V4=C9+*XrY#f;O9>*3%&qbsXz=86hSskD!1gts*=C2rh& z8#B&b#I5jurcaDp%I>%^_SUK1<(0GImM&c?eM*$T8e4T<)s!P0~ZO5tmzw4jP&Sz$z=++xgt!}sR(ehy2GKQb}oNl0NwJ5m%1XUI

?i?;)Dl*C0?1$x|oyR6OVq~f{-4sqWd zvqa%5DE$3RQQ)0BdbcPPp!*HSMBy)3j6U&J2rq==IyP1zFnlO0Q6U_{ZX#%)La@f6 z;3kFeA@aRj6vB9ypTu^<=|O*EP4*GdVw1*Z9a? zgMK*2Or?8Y?ua1LrWmrE>y^b)ZE4p=QwFJWFrrGOB{4LNIwey89Uhp!*=Y;MTTWXP z2RLmpHC`#ahl{7a2BokIw*2fq**5YrCAGv-v1EOPqNKt{DW5%`5JJbe%~V-JrZ7x0 z>!`of8cBij_M0{KF|LmxBgtl!{L`q}$6Q%H&r)PAEtNXrX#n4T@vBeyDL1Z`%%kaO z4;`<%kyX}t2P8v0#jXz|VN)t;cH{=Y4i1X>w5yEFFJbAZj+|PQ{p`Tpq5YLLl zOuN6*ws@hnYz8$^-q7g<)~)FzzT6Q`ihp6Fvu5)`-|J0J{lNs9>xuuPG45sc4|}Oy zHo#<3l*G@n?5MfFWK1NTegn4CI+&+l){r5^gN9@nQZ0i9XQpOmX6jSTgVM`V2WOXL zW@K10E!ldrDBRSD8mEWCBKo11F$_;gmA{}q>`1*b_Mq{d+`3m*o_uoZrAhmKQGaS* z+l7R=ulu|h6ZBpG=l(rgl8=IM)~bq%)V!+2l@(R|q9+yW^`9_dV@Y!#(wM$1O&Xs< zD|+64-Uo&VYkiP5Q7v){N{zg79_3El49qw0@Ov%R(F zvxfhedvW)#oTt*GQAWuygobOT9Ogf6;a5EOSapsf?vM6_B*`?K!W_l~1&PJi#{~EO zuz#Hq7=4Qo=$;ksmUEs@keyR1NTVdmlne>~@1HmI&$c{Vb6^S%zdrs`bFB+2OJ=*B zmYp{T_naL)FNtDQxG5Emw|CE@ zE9(E2ES+CX@3EE$UHgZNDOr?Gy+*58j78JFww`8-(zmPWU3YE*vE_4%+Y6Ub3rYJM zsFIy59V@+AL!)}WReX@Lr1TYZNa{F63DVQAkh(o>2Tf9wKc8pZgFB2Swl{2~S>En) zw}`j*f*-TawMy4oDTJL{mejufMf{2`#eI(Jv)@!vVEeQ0Q<-+_De~HShLk%yvE#;4 nZklyM8i{Kz)p*_;aAZce33+wHGlPA%*`D~ delta 9799 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 B;S2x( diff --git a/Crunchyroll Downloader/Anime_Add.Designer.vb b/Crunchyroll Downloader/Anime_Add.Designer.vb index 115167c..4d2f482 100644 --- a/Crunchyroll Downloader/Anime_Add.Designer.vb +++ b/Crunchyroll Downloader/Anime_Add.Designer.vb @@ -33,10 +33,10 @@ Partial Class Anime_Add Me.textBox1 = New MetroFramework.Controls.MetroTextBox() Me.TextBox2 = New MetroFramework.Controls.MetroTextBox() Me.groupBox2 = New System.Windows.Forms.GroupBox() + Me.bt_Cancel_mass = New System.Windows.Forms.Button() Me.comboBox4 = New MetroFramework.Controls.MetroComboBox() Me.ComboBox1 = New MetroFramework.Controls.MetroComboBox() Me.comboBox3 = New MetroFramework.Controls.MetroComboBox() - Me.PictureBox1 = New System.Windows.Forms.PictureBox() Me.Add_Display = New MetroFramework.Controls.MetroLabel() Me.GroupBox3 = New System.Windows.Forms.GroupBox() Me.ListBox1 = New System.Windows.Forms.ListBox() @@ -49,7 +49,6 @@ Partial Class Anime_Add Me.BackgroundWorker1 = New System.ComponentModel.BackgroundWorker() Me.groupBox1.SuspendLayout() Me.groupBox2.SuspendLayout() - CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit() Me.GroupBox3.SuspendLayout() CType(Me.Btn_min, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.Btn_Close, System.ComponentModel.ISupportInitialize).BeginInit() @@ -230,10 +229,10 @@ Partial Class Anime_Add 'groupBox2 ' Me.groupBox2.BackColor = System.Drawing.Color.Transparent + Me.groupBox2.Controls.Add(Me.bt_Cancel_mass) Me.groupBox2.Controls.Add(Me.comboBox4) Me.groupBox2.Controls.Add(Me.ComboBox1) Me.groupBox2.Controls.Add(Me.comboBox3) - Me.groupBox2.Controls.Add(Me.PictureBox1) Me.groupBox2.Controls.Add(Me.Add_Display) Me.groupBox2.Location = New System.Drawing.Point(15, 70) Me.groupBox2.Name = "groupBox2" @@ -242,6 +241,20 @@ Partial Class Anime_Add Me.groupBox2.TabStop = False Me.groupBox2.Visible = False ' + 'bt_Cancel_mass + ' + Me.bt_Cancel_mass.BackgroundImage = Global.Crunchyroll_Downloader.My.Resources.Resources.add_mass_cancel + Me.bt_Cancel_mass.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch + Me.bt_Cancel_mass.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.bt_Cancel_mass.Font = New System.Drawing.Font("Microsoft Sans Serif", 15.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.bt_Cancel_mass.ForeColor = System.Drawing.SystemColors.Control + Me.bt_Cancel_mass.Location = New System.Drawing.Point(159, 231) + Me.bt_Cancel_mass.Name = "bt_Cancel_mass" + Me.bt_Cancel_mass.Size = New System.Drawing.Size(403, 36) + Me.bt_Cancel_mass.TabIndex = 37 + Me.bt_Cancel_mass.Text = "Cancel" + Me.bt_Cancel_mass.UseVisualStyleBackColor = True + ' 'comboBox4 ' Me.comboBox4.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) @@ -275,18 +288,6 @@ Partial Class Anime_Add Me.comboBox3.TabIndex = 1 Me.comboBox3.UseSelectable = True ' - 'PictureBox1 - ' - Me.PictureBox1.BackColor = System.Drawing.Color.Transparent - Me.PictureBox1.Cursor = System.Windows.Forms.Cursors.Hand - Me.PictureBox1.Image = Global.Crunchyroll_Downloader.My.Resources.Resources.add_mass_cancel - Me.PictureBox1.Location = New System.Drawing.Point(159, 231) - Me.PictureBox1.Name = "PictureBox1" - Me.PictureBox1.Size = New System.Drawing.Size(403, 36) - Me.PictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage - Me.PictureBox1.TabIndex = 45 - Me.PictureBox1.TabStop = False - ' 'Add_Display ' Me.Add_Display.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ @@ -401,7 +402,6 @@ Partial Class Anime_Add Me.TextAlign = MetroFramework.Forms.MetroFormTextAlign.Center Me.groupBox1.ResumeLayout(False) Me.groupBox2.ResumeLayout(False) - CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit() Me.GroupBox3.ResumeLayout(False) CType(Me.Btn_min, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.Btn_Close, System.ComponentModel.ISupportInitialize).EndInit() @@ -409,7 +409,6 @@ Partial Class Anime_Add End Sub Public WithEvents groupBox2 As GroupBox - Public WithEvents PictureBox1 As PictureBox Public WithEvents groupBox1 As GroupBox Public WithEvents GroupBox3 As GroupBox Friend WithEvents Timer1 As Timer @@ -431,4 +430,5 @@ Partial Class Anime_Add Friend WithEvents btn_dl As Button Friend WithEvents Timer3 As Timer Friend WithEvents BackgroundWorker1 As System.ComponentModel.BackgroundWorker + Friend WithEvents bt_Cancel_mass As Button End Class diff --git a/Crunchyroll Downloader/Anime_Add.resx b/Crunchyroll Downloader/Anime_Add.resx index 16966ea..312853b 100644 --- a/Crunchyroll Downloader/Anime_Add.resx +++ b/Crunchyroll Downloader/Anime_Add.resx @@ -127,7 +127,7 @@ iVBORw0KGgoAAAANSUhEUgAAABoAAAAhCAYAAADH97ugAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAAAd0SU1FB+QMDQ03N1b5UIAAAAApSURBVEhL7cyxCQAwDASx339pZ4EUcTC4keDa + wQAADsEBuJFr7QAAAAd0SU1FB+QMDQ03N1b5UIAAAAApSURBVEhL7cyxCQAwDASx339pZ4EUcTC4keDa CwDMqs/abpOXAGBZcgDKSBvlblfsRgAAAABJRU5ErkJggg== diff --git a/Crunchyroll Downloader/Anime_Add.vb b/Crunchyroll Downloader/Anime_Add.vb index e9d4b4d..92cef7d 100644 --- a/Crunchyroll Downloader/Anime_Add.vb +++ b/Crunchyroll Downloader/Anime_Add.vb @@ -22,6 +22,8 @@ Public Class Anime_Add Private Sub LoadBrowser(ByVal Url As String) + + Dim locale As String = "en-US" If CBool(InStr(Url, "beta.crunchyroll.com")) = True And CBool(InStr(Url, "watch")) = True And CBool(Main.CrBetaBasic = Nothing) = False Then #Region "Get Cookies" @@ -440,8 +442,8 @@ Public Class Anime_Add 'btn_dl.BackgroundImage = My.Resources.add_mass_running_cancel btn_dl.Text = "Cancel" Mass_DL_Cancel = True - PictureBox1.Enabled = False - PictureBox1.Visible = False + bt_Cancel_mass.Enabled = False + bt_Cancel_mass.Visible = False Main.DownloadFunimationJS_Seasons() comboBox4.Enabled = False comboBox3.Enabled = False @@ -453,8 +455,8 @@ Public Class Anime_Add 'btn_dl.BackgroundImage = My.Resources.add_mass_running_cancel btn_dl.Text = "Cancel" Mass_DL_Cancel = True - PictureBox1.Enabled = False - PictureBox1.Visible = False + bt_Cancel_mass.Enabled = False + bt_Cancel_mass.Visible = False Main.DownloadBetaSeasons() comboBox4.Enabled = False @@ -466,8 +468,8 @@ Public Class Anime_Add 'btn_dl.BackgroundImage = My.Resources.add_mass_running_cancel btn_dl.Text = "Cancel" Mass_DL_Cancel = True - PictureBox1.Enabled = False - PictureBox1.Visible = False + bt_Cancel_mass.Enabled = False + bt_Cancel_mass.Visible = False Main.Download_VRV_Seasons() comboBox4.Enabled = False @@ -480,8 +482,8 @@ Public Class Anime_Add 'btn_dl.BackgroundImage = My.Resources.add_mass_running_cancel btn_dl.Text = "Cancel" Mass_DL_Cancel = True - PictureBox1.Enabled = False - PictureBox1.Visible = False + bt_Cancel_mass.Enabled = False + bt_Cancel_mass.Visible = False Main.MassDL() comboBox4.Enabled = False comboBox3.Enabled = False @@ -577,11 +579,23 @@ Public Class Anime_Add End If End Sub - Private Sub PictureBox1_Click(sender As Object, e As EventArgs) Handles PictureBox1.Click + + Private Sub bt_Cancel_mass_Click(sender As Object, e As EventArgs) Handles bt_Cancel_mass.Click groupBox1.Visible = True groupBox2.Visible = False End Sub + Private Sub bt_Cancel_mass_MouseEnter(sender As Object, e As EventArgs) Handles bt_Cancel_mass.MouseEnter + + bt_Cancel_mass.BackgroundImage = My.Resources.add_mass_cancel_hover + + + End Sub + Private Sub bt_Cancel_mass_MouseLeave(sender As Object, e As EventArgs) Handles bt_Cancel_mass.MouseLeave + bt_Cancel_mass.BackgroundImage = My.Resources.add_mass_cancel + + End Sub + Private Sub ComboBox1_SelectedIndexChanged(sender As Object, e As EventArgs) Handles ComboBox1.SelectedIndexChanged If CBool(InStr(Main.WebbrowserURL, "beta.crunchyroll.com")) = True Then comboBox3.Items.Clear() @@ -629,40 +643,48 @@ Public Class Anime_Add End If Next + + If comboBox3.Items.Count > 0 Then + comboBox3.SelectedIndex = 0 + comboBox4.SelectedIndex = comboBox4.Items.Count - 1 + End If + + + ElseIf CBool(InStr(Main.WebbrowserURL, "vrv.co")) = True Then - comboBox3.Items.Clear() - comboBox4.Items.Clear() - comboBox3.Enabled = True - comboBox4.Enabled = True - comboBox3.Text = Nothing - comboBox4.Text = Nothing - Dim SeasonSplit() As String = Main.VRVMass.Split(New String() {Chr(34) + "id" + Chr(34) + ":" + Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries) + comboBox3.Items.Clear() + comboBox4.Items.Clear() + comboBox3.Enabled = True + comboBox4.Enabled = True + comboBox3.Text = Nothing + comboBox4.Text = Nothing + Dim SeasonSplit() As String = Main.VRVMass.Split(New String() {Chr(34) + "id" + Chr(34) + ":" + Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries) - Dim SeasonSplit2() As String = SeasonSplit(ComboBox1.SelectedIndex + 1).Split(New String() {Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries) + Dim SeasonSplit2() As String = SeasonSplit(ComboBox1.SelectedIndex + 1).Split(New String() {Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries) - Dim EpisodeJsonURL As String = Main.VRVMassBaseURL + "episodes?season_id=" + SeasonSplit2(0) + "&Policy=" + Main.VRVMassParameters - Dim EpisodeJson As String = Nothing - Debug.WriteLine(EpisodeJsonURL) + Dim EpisodeJsonURL As String = Main.VRVMassBaseURL + "episodes?season_id=" + SeasonSplit2(0) + "&Policy=" + Main.VRVMassParameters + Dim EpisodeJson As String = Nothing + Debug.WriteLine(EpisodeJsonURL) - Try - Using client As New WebClient() - client.Encoding = System.Text.Encoding.UTF8 - client.Headers.Add(My.Resources.ffmpeg_user_agend.Replace(Chr(34), "")) - EpisodeJson = client.DownloadString(EpisodeJsonURL) - End Using - Catch ex As Exception - Debug.WriteLine("error- getting EpisodeJson data") - Debug.WriteLine(ex.ToString) - Exit Sub - End Try - Main.VRVMassEpisodes = EpisodeJson + Try + Using client As New WebClient() + client.Encoding = System.Text.Encoding.UTF8 + client.Headers.Add(My.Resources.ffmpeg_user_agend.Replace(Chr(34), "")) + EpisodeJson = client.DownloadString(EpisodeJsonURL) + End Using + Catch ex As Exception + Debug.WriteLine("error- getting EpisodeJson data") + Debug.WriteLine(ex.ToString) + Exit Sub + End Try + Main.VRVMassEpisodes = EpisodeJson - Dim EpisodeNameSplit() As String = EpisodeJson.Split(New String() {Chr(34) + "title" + Chr(34) + ":" + Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries) + Dim EpisodeNameSplit() As String = EpisodeJson.Split(New String() {Chr(34) + "title" + Chr(34) + ":" + Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries) - Dim EpisodeSplit() As String = EpisodeJson.Split(New String() {Chr(34) + "episode" + Chr(34) + ":" + Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries) + Dim EpisodeSplit() As String = EpisodeJson.Split(New String() {Chr(34) + "episode" + Chr(34) + ":" + Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries) For i As Integer = 1 To EpisodeSplit.Count - 1 Dim EpisodeSplit2() As String = EpisodeSplit(i).Split(New String() {Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries) Dim EpisodeNameSplit2() As String = EpisodeNameSplit(i).Split(New String() {Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries) @@ -675,55 +697,66 @@ Public Class Anime_Add End If Next - ElseIf Main.WebbrowserURL = "https://funimation.com/js" Then - comboBox3.Items.Clear() - comboBox4.Items.Clear() - comboBox3.Text = Nothing - comboBox4.Text = Nothing - Dim ContentID As String = Nothing - For i As Integer = 0 To Main.FunimtaionSeasonList.Count - 1 - If ComboBox1.Text = Main.FunimtaionSeasonList.Item(i).Title Then - ContentID = Main.FunimtaionSeasonList.Item(i).ID - Exit For - End If - Next - - If ContentID = Nothing Then - MsgBox("error during season selection") - Exit Sub + If comboBox3.Items.Count > 0 Then + comboBox3.SelectedIndex = 0 + comboBox4.SelectedIndex = comboBox4.Items.Count - 1 End If - Dim BaseUrl() As String = Main.FunimationSeasonAPIUrl.Split(New String() {"/shows/"}, System.StringSplitOptions.RemoveEmptyEntries) + ElseIf Main.WebbrowserURL = "https://funimation.com/js" Then + comboBox3.Items.Clear() + comboBox4.Items.Clear() + comboBox3.Text = Nothing + comboBox4.Text = Nothing + Dim ContentID As String = Nothing + + For i As Integer = 0 To Main.FunimtaionSeasonList.Count - 1 + If ComboBox1.Text = Main.FunimtaionSeasonList.Item(i).Title Then + ContentID = Main.FunimtaionSeasonList.Item(i).ID + Exit For + End If + Next + + If ContentID = Nothing Then + MsgBox("error during season selection") + Exit Sub + End If + + Dim BaseUrl() As String = Main.FunimationSeasonAPIUrl.Split(New String() {"/shows/"}, System.StringSplitOptions.RemoveEmptyEntries) - Dim EpisodeJsonURL As String = BaseUrl(0) + "/seasons/" + ContentID + ".json" - Dim EpisodeJson As String = Nothing - Debug.WriteLine(EpisodeJsonURL) + Dim EpisodeJsonURL As String = BaseUrl(0) + "/seasons/" + ContentID + ".json" + Dim EpisodeJson As String = Nothing + Debug.WriteLine(EpisodeJsonURL) - Try - Using client As New WebClient() - client.Encoding = System.Text.Encoding.UTF8 - client.Headers.Add(My.Resources.ffmpeg_user_agend.Replace(Chr(34), "")) - EpisodeJson = client.DownloadString(EpisodeJsonURL) - End Using - Catch ex As Exception - Debug.WriteLine("error- getting EpisodeJson data") - Debug.WriteLine(ex.ToString) - Main.FunimationJsonBrowser = "EpisodeJson" - LoadBrowser(EpisodeJsonURL) - Exit Sub - End Try + Try + Using client As New WebClient() + client.Encoding = System.Text.Encoding.UTF8 + client.Headers.Add(My.Resources.ffmpeg_user_agend.Replace(Chr(34), "")) + EpisodeJson = client.DownloadString(EpisodeJsonURL) + End Using + Catch ex As Exception + Debug.WriteLine("error- getting EpisodeJson data") + Debug.WriteLine(ex.ToString) + Main.FunimationJsonBrowser = "EpisodeJson" + LoadBrowser(EpisodeJsonURL) + Exit Sub + End Try - FillFunimationEpisodes(EpisodeJson) + FillFunimationEpisodes(EpisodeJson) + If comboBox3.Items.Count > 0 Then + comboBox3.SelectedIndex = 0 + comboBox4.SelectedIndex = comboBox4.Items.Count - 1 + End If + Else - 'MsgBox(Main.WebbrowserURL) - comboBox3.Items.Clear() + 'MsgBox(Main.WebbrowserURL) + comboBox3.Items.Clear() comboBox4.Items.Clear() comboBox3.Enabled = True comboBox4.Enabled = True @@ -751,6 +784,11 @@ Public Class Anime_Add comboBox4.Items.Add(URLGrapp2(0)) Next + If comboBox3.Items.Count > 0 Then + comboBox3.SelectedIndex = 0 + comboBox4.SelectedIndex = comboBox4.Items.Count - 1 + End If + End If End Sub @@ -772,13 +810,7 @@ Public Class Anime_Add Next Main.WebbrowserURL = "https://funimation.com/js" End Sub - Private Sub PictureBox1_MouseEnter(sender As Object, e As EventArgs) Handles PictureBox1.MouseEnter - PictureBox1.Image = My.Resources.add_mass_cancel_hover - End Sub - Private Sub PictureBox1_MouseLeave(sender As Object, e As EventArgs) Handles PictureBox1.MouseLeave - PictureBox1.Image = My.Resources.add_mass_cancel - End Sub Private Sub Timer1_Tick(sender As Object, e As EventArgs) Handles Timer1.Tick If ListBox1.Items.Count > 0 Then diff --git a/Crunchyroll Downloader/App.config b/Crunchyroll Downloader/App.config index ccbc179..7057269 100644 --- a/Crunchyroll Downloader/App.config +++ b/Crunchyroll Downloader/App.config @@ -8,11 +8,11 @@ - + - + diff --git a/Crunchyroll Downloader/CRD_List_Item.vb b/Crunchyroll Downloader/CRD_List_Item.vb index 62c6719..e3ad064 100644 --- a/Crunchyroll Downloader/CRD_List_Item.vb +++ b/Crunchyroll Downloader/CRD_List_Item.vb @@ -30,6 +30,7 @@ Public Class CRD_List_Item Dim TempFolder As String = Nothing Dim DownloadPfad As String = Nothing + Dim ThumbnailSource As String = Nothing Dim ToDispose As Boolean = False Dim Failed As Boolean = False Dim FailedCount As Integer = 0 @@ -136,7 +137,18 @@ Public Class CRD_List_Item Public Sub SetLabelPercent(ByVal Text As String) Label_percent.Text = Text End Sub - Public Sub SetThumbnailImage(ByVal Thumbnail As Image) + Public Sub SetThumbnailImage(ByVal ThumbnialURL As String) + ThumbnailSource = ThumbnialURL + Dim Thumbnail As Image = My.Resources.main_del + Debug.WriteLine("ThumbnialURL: " + ThumbnialURL) + Try + Dim wc As New WebClient() + Dim bytes As Byte() = wc.DownloadData(ThumbnialURL) + Dim ms As New MemoryStream(bytes) + Thumbnail = System.Drawing.Image.FromStream(ms) + Catch ex As Exception + 'MsgBox(ex.ToString) + End Try PB_Thumbnail.BackgroundImage = Thumbnail End Sub #End Region @@ -157,6 +169,14 @@ Public Class CRD_List_Item End If End If + End Function + Public Function GetThumbnailSource() As String + Try + Return ThumbnailSource + Catch ex As Exception + Return "0" + End Try + End Function Public Function GetLabelPercent() As String Try @@ -522,6 +542,15 @@ Public Class CRD_List_Item #Region "ThreadChecker" Private Sub CheckThreadCount() + 'Try + ' Me.Invoke(New Action(Function() As Object + + ' Label_Reso.Text = ThreadList.Count.ToString + ' Return Nothing + ' End Function)) + 'Catch ex As Exception + 'End Try + For w As Integer = 0 To Integer.MaxValue If StatusRunning = False Then diff --git a/Crunchyroll Downloader/Crunchyroll Downloader.vbproj b/Crunchyroll Downloader/Crunchyroll Downloader.vbproj index e26e231..be6e546 100644 --- a/Crunchyroll Downloader/Crunchyroll Downloader.vbproj +++ b/Crunchyroll Downloader/Crunchyroll Downloader.vbproj @@ -1,8 +1,8 @@  - - - + + + Debug @@ -105,14 +105,14 @@ 41999,42016,42017,42018,42019,42020,42021,42022,42032,42036 - - ..\packages\CefSharp.Common.101.0.180\lib\net452\CefSharp.dll + + ..\packages\CefSharp.Common.103.0.90\lib\net452\CefSharp.dll - - ..\packages\CefSharp.Common.101.0.180\lib\net452\CefSharp.Core.dll + + ..\packages\CefSharp.Common.103.0.90\lib\net452\CefSharp.Core.dll - - ..\packages\CefSharp.WinForms.101.0.180\lib\net462\CefSharp.WinForms.dll + + ..\packages\CefSharp.WinForms.103.0.90\lib\net462\CefSharp.WinForms.dll False @@ -379,9 +379,6 @@ - - - @@ -410,10 +407,10 @@ Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}". - - - - + + + + - + \ No newline at end of file diff --git a/Crunchyroll Downloader/Main.designer.vb b/Crunchyroll Downloader/Main.designer.vb index 07d4f76..e2246ad 100644 --- a/Crunchyroll Downloader/Main.designer.vb +++ b/Crunchyroll Downloader/Main.designer.vb @@ -47,6 +47,8 @@ Partial Class Main Me.OpenSettingsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.TestDownloadToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.CheckCRBetaTokenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.AddonHTMLToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.Timer3OffToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox6, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.MetroStyleManager1, System.ComponentModel.ISupportInitialize).BeginInit() @@ -180,7 +182,7 @@ Partial Class Main ' 'ContextMenuStrip1 ' - Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToggleDebugModeToolStripMenuItem, Me.OpenSettingsToolStripMenuItem, Me.TestDownloadToolStripMenuItem, Me.CheckCRBetaTokenToolStripMenuItem}) + Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToggleDebugModeToolStripMenuItem, Me.OpenSettingsToolStripMenuItem, Me.TestDownloadToolStripMenuItem, Me.CheckCRBetaTokenToolStripMenuItem, Me.AddonHTMLToolStripMenuItem, Me.Timer3OffToolStripMenuItem}) Me.ContextMenuStrip1.Name = "ContextMenuStrip1" resources.ApplyResources(Me.ContextMenuStrip1, "ContextMenuStrip1") ' @@ -204,6 +206,16 @@ Partial Class Main Me.CheckCRBetaTokenToolStripMenuItem.Name = "CheckCRBetaTokenToolStripMenuItem" resources.ApplyResources(Me.CheckCRBetaTokenToolStripMenuItem, "CheckCRBetaTokenToolStripMenuItem") ' + 'AddonHTMLToolStripMenuItem + ' + Me.AddonHTMLToolStripMenuItem.Name = "AddonHTMLToolStripMenuItem" + resources.ApplyResources(Me.AddonHTMLToolStripMenuItem, "AddonHTMLToolStripMenuItem") + ' + 'Timer3OffToolStripMenuItem + ' + Me.Timer3OffToolStripMenuItem.Name = "Timer3OffToolStripMenuItem" + resources.ApplyResources(Me.Timer3OffToolStripMenuItem, "Timer3OffToolStripMenuItem") + ' 'Main ' Me.ApplyImageInvert = True @@ -256,4 +268,6 @@ Partial Class Main Friend WithEvents OpenSettingsToolStripMenuItem As ToolStripMenuItem Friend WithEvents TestDownloadToolStripMenuItem As ToolStripMenuItem Friend WithEvents CheckCRBetaTokenToolStripMenuItem As ToolStripMenuItem + Friend WithEvents AddonHTMLToolStripMenuItem As ToolStripMenuItem + Friend WithEvents Timer3OffToolStripMenuItem As ToolStripMenuItem End Class diff --git a/Crunchyroll Downloader/Main.resx b/Crunchyroll Downloader/Main.resx index b6256a8..1a875b0 100644 --- a/Crunchyroll Downloader/Main.resx +++ b/Crunchyroll Downloader/Main.resx @@ -120,13 +120,6 @@ True - - Link - - - - 818 - Microsoft Sans Serif, 93pt @@ -144,6 +137,7 @@ 840, 546 + 57 @@ -159,6 +153,12 @@ 9 + + Link + + + 818 + True @@ -273,24 +273,6 @@ 842, 630 - - None - - - Flat - - - NoControl - - - 800, 1 - - - 40, 40 - - - 5 - Btn_Close @@ -303,24 +285,6 @@ 1 - - None - - - Flat - - - NoControl - - - 757, 1 - - - 40, 40 - - - 4 - Btn_min @@ -333,24 +297,6 @@ 2 - - Zoom - - - Flat - - - NoControl - - - 641, 18 - - - 80, 35 - - - 3 - Btn_Settings @@ -363,21 +309,6 @@ 3 - - Zoom - - - Flat - - - 124, 18 - - - 80, 35 - - - 2 - Btn_Browser @@ -390,24 +321,6 @@ 4 - - Zoom - - - Flat - - - NoControl - - - 11, 18 - - - 80, 35 - - - 1 - Btn_add @@ -510,6 +423,18 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + AddonHTMLToolStripMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Timer3OffToolStripMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + Main @@ -522,9 +447,165 @@ 877, 17 + + Zoom + + + Flat + + + NoControl + + + 11, 18 + + + 80, 35 + + + 1 + + + Btn_add + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 5 + + + Zoom + + + Flat + + + 124, 18 + + + 80, 35 + + + 2 + + + Btn_Browser + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 4 + + + Zoom + + + Flat + + + NoControl + + + 641, 18 + + + 80, 35 + + + 3 + + + Btn_Settings + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 3 + + + None + + + Flat + + + NoControl + + + 757, 1 + + + 40, 40 + + + 4 + + + Btn_min + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 2 + + + None + + + Flat + + + NoControl + + + 800, 1 + + + 40, 40 + + + 5 + + + Btn_Close + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 1 + 966, 17 + + 206, 136 + + + ContextMenuStrip1 + + + System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + 205, 22 @@ -549,13 +630,16 @@ Check CR Beta Token - - 206, 92 + + 205, 22 - - ContextMenuStrip1 + + Add-on HTML - - System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 205, 22 + + + Timer3 off \ No newline at end of file diff --git a/Crunchyroll Downloader/Main.vb b/Crunchyroll Downloader/Main.vb index 74ff50f..cb44b2b 100644 --- a/Crunchyroll Downloader/Main.vb +++ b/Crunchyroll Downloader/Main.vb @@ -47,7 +47,7 @@ Public Class Main Dim ServerThread As Thread Public KodiNaming As Boolean = False Public ErrorTolerance As Integer = 0 - Public liList As New List(Of String) + 'Public liList As New List(Of String) Public HTMLString As String = My.Resources.Startuphtml Public ListBoxList As New List(Of String) Public ItemList As New List(Of CRD_List_Item) @@ -676,22 +676,13 @@ Public Class Main End Sub Public Sub ListItemAdd(ByVal NameKomplett As String, ByVal NameP1 As String, ByVal NameP2 As String, ByVal Reso As String, ByVal HardSub As String, ByVal SoftSubs As String, ByVal ThumbnialURL As String, ByVal URL_DL As String, ByVal Pfad_DL As String, Optional Service As String = "CR") ', ByVal AudioLang As String) - Dim Thumbnail As Image = My.Resources.main_del - Debug.WriteLine("ThumbnialURL: " + ThumbnialURL) - Try - Dim wc As New WebClient() - Dim bytes As Byte() = wc.DownloadData(ThumbnialURL) - Dim ms As New MemoryStream(bytes) - Thumbnail = System.Drawing.Image.FromStream(ms) - Catch ex As Exception - 'MsgBox(ex.ToString) - End Try + With ListView1.Items.Add("0") - ItemConstructor(NameKomplett, NameP1, NameP2, Reso, HardSub, SoftSubs, Thumbnail, URL_DL, Pfad_DL, Service) + ItemConstructor(NameKomplett, NameP1, NameP2, Reso, HardSub, SoftSubs, ThumbnialURL, URL_DL, Pfad_DL, Service) End With End Sub - Public Sub ItemConstructor(ByVal NameKomplett As String, ByVal NameP1 As String, ByVal NameP2 As String, ByVal DisplayReso As String, ByVal HardSub As String, ByVal SoftSubs As String, ByVal Thumbnail As Image, ByVal URL_DL As String, ByVal Pfad_DL As String, ByVal Service As String) + Public Sub ItemConstructor(ByVal NameKomplett As String, ByVal NameP1 As String, ByVal NameP2 As String, ByVal DisplayReso As String, ByVal HardSub As String, ByVal SoftSubs As String, ByVal ThumbnialURL As String, ByVal URL_DL As String, ByVal Pfad_DL As String, ByVal Service As String) Dim Item As New CRD_List_Item Item.Visible = False Item.Parent = ListView1 @@ -716,7 +707,7 @@ Public Class Main Item.SetLabelAnimeTitel(NameP2) Item.SetLabelResolution(DisplayReso) Item.SetLabelHardsub(HardSub) - Item.SetThumbnailImage(Thumbnail) + Item.SetThumbnailImage(ThumbnialURL) Item.SetLabelPercent("0%") Item.SetToolTip("Softsubs: " + SoftSubs) 'MsgBox(Item.GetTextBound.ToString) @@ -742,23 +733,12 @@ Public Class Main #Region "Manga DL" Public Sub MangaListItemAdd(ByVal NameP2 As String, ByVal ThumbnialURL As String, ByVal BaseURL As String, ByVal SiteList As List(Of String)) - Dim Thumbnail As Image = My.Resources.main_del - Try - Dim wc As New WebClient() - wc.Headers.Add(My.Resources.ffmpeg_user_agend.Replace(Chr(34), "")) - Dim bytes As Byte() = wc.DownloadData(ThumbnialURL) - Dim ms As New MemoryStream(bytes) - Thumbnail = System.Drawing.Image.FromStream(ms) - Catch ex As Exception - 'MsgBox(ex.ToString) - 'MsgBox(ThumbnialURL) - End Try With ListView1.Items.Add("0") - MangaItemConstructor("proxer.me", NameP2, Thumbnail, BaseURL, SiteList) + MangaItemConstructor("proxer.me", NameP2, ThumbnialURL, BaseURL, SiteList) End With End Sub - Public Sub MangaItemConstructor(ByVal NameP1 As String, ByVal NameP2 As String, ByVal Thumbnail As Image, ByVal BaseURL As String, ByVal SiteList As List(Of String)) + Public Sub MangaItemConstructor(ByVal NameP1 As String, ByVal NameP2 As String, ByVal ThumbnialURL As String, ByVal BaseURL As String, ByVal SiteList As List(Of String)) Dim Item As New CRD_List_Item Item.Visible = False Item.Parent = ListView1 @@ -776,7 +756,7 @@ Public Class Main Item.SetLabelAnimeTitel(NameP2) Item.SetLabelResolution("Manga") Item.SetLabelHardsub("Manga") - Item.SetThumbnailImage(Thumbnail) + Item.SetThumbnailImage(ThumbnialURL) Item.SetLabelPercent("0%") 'MsgBox(Item.GetTextBound.ToString) ItemList.Add(Item) @@ -791,8 +771,8 @@ Public Class Main #Region "Season DL" Public Sub MassGrapp() Anime_Add.groupBox2.Visible = True - Anime_Add.PictureBox1.Enabled = True - Anime_Add.PictureBox1.Visible = True + Anime_Add.bt_Cancel_mass.Enabled = True + Anime_Add.bt_Cancel_mass.Visible = True Anime_Add.groupBox1.Visible = False Anime_Add.ComboBox1.Items.Clear() Anime_Add.comboBox3.Items.Clear() @@ -821,8 +801,8 @@ Public Class Main Public Sub SeasonDropdownGrapp() Anime_Add.groupBox2.Visible = True - Anime_Add.PictureBox1.Enabled = True - Anime_Add.PictureBox1.Visible = True + Anime_Add.bt_Cancel_mass.Enabled = True + Anime_Add.bt_Cancel_mass.Visible = True Anime_Add.groupBox1.Visible = False Anime_Add.ComboBox1.Items.Clear() Anime_Add.comboBox3.Items.Clear() @@ -1575,7 +1555,7 @@ Public Class Main ListItemAdd(Pfad_DL, L1Name, L2Name, ResoHTMLDisplay, Subsprache3, SubValuesToDisplay(), thumbnail3, URL_DL, Pfad_DL) Return Nothing End Function)) - liList.Add(My.Resources.htmlvorThumbnail + thumbnail3 + My.Resources.htmlnachTumbnail + CR_Anime_Titel + "
" + CR_Anime_Staffel + " " + CR_Anime_Folge + My.Resources.htmlvorAufloesung + ResoHTMLDisplay + My.Resources.htmlvorSoftSubs + vbNewLine + SubValuesToDisplay() + My.Resources.htmlvorHardSubs + Subsprache3 + My.Resources.htmlnachHardSubs + "") + 'liList.Add(My.Resources.htmlvorThumbnail + thumbnail3 + My.Resources.htmlnachTumbnail + CR_Anime_Titel + "
" + CR_Anime_Staffel + " " + CR_Anime_Folge + My.Resources.htmlvorAufloesung + ResoHTMLDisplay + My.Resources.htmlvorSoftSubs + vbNewLine + SubValuesToDisplay() + My.Resources.htmlvorHardSubs + Subsprache3 + My.Resources.htmlnachHardSubs + "") 'Form1.RichTextBox1.Text = My.Resources.htmlvorThumbnail + thumbnail3 + My.Resources.htmlnachTumbnail + CR_Anime_Titel + "
" + CR_Anime_Staffel + " " + CR_Anime_Folge + My.Resources.htmlvorAufloesung + ResoHTMLDisplay + My.Resources.htmlvorSoftSubs + vbNewLine + SubValuesToDisplay() + My.Resources.htmlvorHardSubs + Subsprache3 + My.Resources.htmlnachHardSubs + "" #End Region Grapp_RDY = True @@ -1696,8 +1676,8 @@ Public Class Main Public Sub GetBetaSeasons(ByVal JsonUrl As String) Anime_Add.groupBox2.Visible = True - Anime_Add.PictureBox1.Enabled = True - Anime_Add.PictureBox1.Visible = True + Anime_Add.bt_Cancel_mass.Enabled = True + Anime_Add.bt_Cancel_mass.Visible = True Anime_Add.groupBox1.Visible = False Anime_Add.ComboBox1.Items.Clear() Anime_Add.comboBox3.Items.Clear() @@ -2273,7 +2253,7 @@ Public Class Main ListItemAdd(Path.GetFileName(Pfad_DL.Replace(Chr(34), "")), L1Name, L2Name, ResoHTMLDisplay, Subsprache3, SubValuesToDisplay(), thumbnail3, URL_DL, Pfad_DL) Return Nothing End Function)) - liList.Add(My.Resources.htmlvorThumbnail + thumbnail3 + My.Resources.htmlnachTumbnail + CR_title + "
" + CR_season_number + " " + CR_episode + My.Resources.htmlvorAufloesung + ResoHTMLDisplay + My.Resources.htmlvorSoftSubs + vbNewLine + SubValuesToDisplay() + My.Resources.htmlvorHardSubs + Subsprache3 + My.Resources.htmlnachHardSubs + "") + 'liList.Add(My.Resources.htmlvorThumbnail + thumbnail3 + My.Resources.htmlnachTumbnail + CR_title + "
" + CR_season_number + " " + CR_episode + My.Resources.htmlvorAufloesung + ResoHTMLDisplay + My.Resources.htmlvorSoftSubs + vbNewLine + SubValuesToDisplay() + My.Resources.htmlvorHardSubs + Subsprache3 + My.Resources.htmlnachHardSubs + "") 'Form1.RichTextBox1.Text = My.Resources.htmlvorThumbnail + thumbnail3 + My.Resources.htmlnachTumbnail + CR_Anime_Titel + "
" + CR_Anime_Staffel + " " + CR_Anime_Folge + My.Resources.htmlvorAufloesung + ResoHTMLDisplay + My.Resources.htmlvorSoftSubs + vbNewLine + SubValuesToDisplay() + My.Resources.htmlvorHardSubs + Subsprache3 + My.Resources.htmlnachHardSubs + "" #End Region Grapp_RDY = True @@ -2359,9 +2339,9 @@ Public Class Main Dim ffmpeg_command_Builder() As String = ffmpeg_command.Split(New String() {"-c:a copy"}, System.StringSplitOptions.RemoveEmptyEntries) ffmpeg_command_temp = "-c:a copy" + ffmpeg_command_Builder(1) End If - Dim CR_Streams As New List(Of CR_Beta_Stream) Dim CR_series_title As String = Nothing Dim CR_season_number As String = Nothing + Dim CR_season_number2 As String = Nothing Dim CR_episode As String = Nothing Dim CR_Anime_Staffel_int As String = Nothing Dim CR_episode_int As String = Nothing @@ -2431,11 +2411,8 @@ Public Class Main 'My.Computer.Clipboard.SetText(ObjectJson) ' CR_Anime_Staffel_int = CR_season_number - If IgnoreSeason = 1 And CR_season_number = "1" Or IgnoreSeason = 1 And CR_season_number = "0" Then - CR_season_number = Nothing - ElseIf IgnoreSeason = 2 Then - CR_season_number = Nothing - End If + + CR_episode_int = CR_episode If Season_Prefix = "[default season prefix]" Then If CR_episode = Nothing Then 'no episode number means most likey a movie @@ -2452,6 +2429,17 @@ Public Class Main CR_season_number = Season_Prefix + CR_season_number End If End If + + CR_season_number2 = CR_season_number + + + If IgnoreSeason = 1 And CR_season_number = "1" Or IgnoreSeason = 1 And CR_season_number = "0" Then + CR_season_number = Nothing + ElseIf IgnoreSeason = 2 Then + CR_season_number = Nothing + End If + + If CR_episode = Nothing Then ElseIf Episode_Prefix = "[default episode prefix]" Then CR_episode = "Episode " + AddLeadingZeros(CR_episode) @@ -2513,7 +2501,7 @@ Public Class Main CR_FilenName = String.Join(" ", CR_FilenName.Split(invalids, StringSplitOptions.RemoveEmptyEntries)).TrimEnd("."c).Replace(Chr(34), "").Replace("\", "").Replace("/", "") 'System.Text.RegularExpressions.Regex.Replace(CR_FilenName, "[^\w\\-]", " ") CR_FilenName = RemoveExtraSpaces(CR_FilenName) 'My.Computer.FileSystem.WriteAllText("log.log", WebbrowserText, False) - Pfad2 = UseSubfolder(CR_series_title, CR_season_number, Pfad) + Pfad2 = UseSubfolder(CR_series_title, CR_season_number2, Pfad) If Not Directory.Exists(Path.GetDirectoryName(Pfad2)) Then ' Nein! Jetzt erstellen... Try @@ -2540,7 +2528,19 @@ Public Class Main Debug.WriteLine("error- getting stream data") Exit Sub End Try - + Dim hls_type As String = Nothing + If CBool(InStr(VideoJson, Chr(34) + "adaptive_hls")) = True Then + hls_type = "adaptive_hls" + ElseIf CBool(InStr(VideoJson, Chr(34) + "multitrack_adaptive_hls_v2")) = True Then + hls_type = "multitrack_adaptive_hls_v2" + ElseIf CBool(InStr(VideoJson, Chr(34) + "vo_adaptive_hls")) = True Then + hls_type = "vo_adaptive_hls" + Else + MsgBox("No download stream avalible", MsgBoxStyle.Critical) + Exit Sub + End If + 'My.Computer.Clipboard.SetText(VideoJson) + 'MsgBox(SubSprache) Dim LangNew As String = ConvertCC(SubSprache) #End Region #Region "Download softsub file or build ffmpeg cmd" @@ -2617,62 +2617,50 @@ Public Class Main End If #End Region #Region "m3u8 suche" - - VideoJson = CleanJSON(VideoJson) - Dim VideoJObject As JObject = JObject.Parse(VideoJson) - Dim VideoData As List(Of JToken) = VideoJObject.Children().ToList - For Each item As JProperty In VideoData - item.CreateReader() - Select Case item.Name - Case "audio_locale" - Dim Title As String = item.Value.ToString - CR_audio_locale = String.Join(" ", Title.Split(invalids, StringSplitOptions.RemoveEmptyEntries)).TrimEnd("."c).Replace(Chr(34), "").Replace("\", "").Replace("/", "").Replace(":", "") - - Case "streams" 'each record is inside the entries array - For Each Entry As JProperty In item.Values - - Dim JsonEntryFormat As String = Entry.Name - If CBool(InStr(JsonEntryFormat, "drm")) Or CBool(InStr(JsonEntryFormat, "dash")) Or CBool(InStr(JsonEntryFormat, "download")) Then - Continue For - End If - - - Dim SubData As List(Of JToken) = Entry.Children().ToList - For Each SubItem As JObject In SubData - SubItem.CreateReader() - - Dim StreamFormats As List(Of JToken) = SubItem.Children().ToList - - - For Each HardsubStreams As JProperty In StreamFormats - HardsubStreams.CreateReader() - Dim SubLang As String = HardsubStreams.Name - Dim Url As String = HardsubStreams.Value.ToString - If SubLang = Nothing Or SubLang = "" Then - SubLang = "null" - End If - CR_Streams.Add(New CR_Beta_Stream(CR_audio_locale, SubLang, JsonEntryFormat, Url)) - - Next - Next - Next - End Select - Next - + If CBool(InStr(VideoJson, "audio_locale")) Then + Dim CR_audio As String() = VideoJson.Split(New String() {"audio_locale" + Chr(34) + ":" + Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries) + Dim CR_audio2 As String() = CR_audio(1).Split(New String() {Chr(34) + ","}, System.StringSplitOptions.RemoveEmptyEntries) '(New [Char]() {"-"}) + CR_audio_locale = String.Join(" ", CR_audio2(0).Split(invalids, StringSplitOptions.RemoveEmptyEntries)).TrimEnd("."c) + End If Dim CR_URI_Master As String = Nothing - - - For i As Integer = 0 To CR_Streams.Count - 1 - - If CR_Streams.Item(i).subLang = LangNew Then - Debug.WriteLine(CR_Streams.Item(i).subLang) - CR_URI_Master = CR_Streams.Item(i).Url + 'If SubsOnly = False Then + Dim ii As Integer = 0 + Dim CR_VideoJson As String() = VideoJson.Split(New String() {hls_type}, System.StringSplitOptions.RemoveEmptyEntries) + Dim CR_VideoJsonHardSubs As String() = CR_VideoJson(1).Split(New String() {"hardsub_locale" + Chr(34) + ":" + Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries) + Debug.WriteLine(LangNew) + Debug.WriteLine(CR_VideoJsonHardSubs.Count.ToString) + Dim hls_List As New List(Of String) + For i As Integer = 0 To CR_VideoJsonHardSubs.Count - 1 + If LangNew = "" And CR_VideoJsonHardSubs(i).Substring(0, 1) = Chr(34) And CBool(InStr(CR_VideoJsonHardSubs(i), "https://")) Then + CR_URI_Master = CR_VideoJsonHardSubs(i).Replace(LangNew + Chr(34) + "," + Chr(34) + "url" + Chr(34) + ":" + Chr(34), "").Split(New String() {Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries)(0) + Debug.WriteLine("Nothing+works") + Exit For + ElseIf LangNew IsNot "" And CBool(InStr(CR_VideoJsonHardSubs(i), LangNew + Chr(34) + "," + Chr(34) + "url" + Chr(34) + ":" + Chr(34))) And CBool(InStr(CR_VideoJsonHardSubs(i), "https://")) Then + CR_URI_Master = CR_VideoJsonHardSubs(i).Replace(LangNew + Chr(34) + "," + Chr(34) + "url" + Chr(34) + ":" + Chr(34), "").Split(New String() {Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries)(0) + Debug.WriteLine("Why are we here again?") + Exit For End If - Next - - - + If CR_URI_Master = Nothing Then + Me.Invoke(New Action(Function() As Object + ResoNotFoundString = VideoJson + DialogTaskString = "Language_CR_Beta" + ErrorDialog.ShowDialog() + Return Nothing + End Function)) + If UserCloseDialog = True Then + Throw New System.Exception(Chr(34) + "UserAbort" + Chr(34)) + Else + LangNew = ResoBackString + ResoBackString = Nothing + For i As Integer = 0 To CR_VideoJsonHardSubs.Count - 1 + If CBool(InStr(CR_VideoJsonHardSubs(i), LangNew + Chr(34) + "," + Chr(34) + "url" + Chr(34) + ":" + Chr(34))) Then + CR_URI_Master = CR_VideoJsonHardSubs(i).Replace(LangNew + Chr(34) + "," + Chr(34) + "url" + Chr(34) + ":" + Chr(34), "").Split(New String() {Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries)(0) + Exit For + End If + Next + End If + End If CR_URI_Master = CR_URI_Master.Replace("&", "&").Replace("/u0026", "&").Replace("\u002F", "/").Replace("\u0026", "&") If CBool(InStr(CR_URI_Master, "master.m3u8")) Then Me.Invoke(New Action(Function() As Object @@ -2800,7 +2788,7 @@ Public Class Main ListItemAdd(Path.GetFileName(Pfad_DL.Replace(Chr(34), "")), L1Name, L2Name, ResoHTMLDisplay, Subsprache3, SubValuesToDisplay(), thumbnail3, URL_DL, Pfad_DL) Return Nothing End Function)) - liList.Add(My.Resources.htmlvorThumbnail + thumbnail3 + My.Resources.htmlnachTumbnail + CR_title + "
" + CR_season_number + " " + CR_episode + My.Resources.htmlvorAufloesung + ResoHTMLDisplay + My.Resources.htmlvorSoftSubs + vbNewLine + SubValuesToDisplay() + My.Resources.htmlvorHardSubs + Subsprache3 + My.Resources.htmlnachHardSubs + "") + ' li 'liList.Add(My.Resources.htmlvorThumbnail + thumbnail3 + My.Resources.htmlnachTumbnail + CR_title + "
" + CR_season_number + " " + CR_episode + My.Resources.htmlvorAufloesung + ResoHTMLDisplay + My.Resources.htmlvorSoftSubs + vbNewLine + SubValuesToDisplay() + My.Resources.htmlvorHardSubs + Subsprache3 + My.Resources.htmlnachHardSubs + "") 'Form1.RichTextBox1.Text = My.Resources.htmlvorThumbnail + thumbnail3 + My.Resources.htmlnachTumbnail + CR_Anime_Titel + "
" + CR_Anime_Staffel + " " + CR_Anime_Folge + My.Resources.htmlvorAufloesung + ResoHTMLDisplay + My.Resources.htmlvorSoftSubs + vbNewLine + SubValuesToDisplay() + My.Resources.htmlvorHardSubs + Subsprache3 + My.Resources.htmlnachHardSubs + "" #End Region Grapp_RDY = True @@ -2833,11 +2821,10 @@ Public Class Main End If End Try End Sub - Public Sub Get_VRV_Seasons(ByVal JsonUrl As String) Anime_Add.groupBox2.Visible = True - Anime_Add.PictureBox1.Enabled = True - Anime_Add.PictureBox1.Visible = True + Anime_Add.bt_Cancel_mass.Enabled = True + Anime_Add.bt_Cancel_mass.Visible = True Anime_Add.groupBox1.Visible = False Anime_Add.ComboBox1.Items.Clear() Anime_Add.comboBox3.Items.Clear() @@ -3048,7 +3035,7 @@ Public Class Main ListItemAdd(Filename, L1Name, L2Name, ResoHTMLDisplay, Subsprache3, SubValuesToDisplay(), thumbnail3, URL2, Pfad2) Return Nothing End Function)) - liList.Add(My.Resources.htmlvorThumbnail + thumbnail3 + My.Resources.htmlnachTumbnail + L1Name + "
" + L2Name + My.Resources.htmlvorAufloesung + ResoHTMLDisplay + My.Resources.htmlvorSoftSubs + vbNewLine + SubValuesToDisplay() + My.Resources.htmlvorHardSubs + Subsprache3 + My.Resources.htmlnachHardSubs + "") + ' liList.Add(My.Resources.htmlvorThumbnail + thumbnail3 + My.Resources.htmlnachTumbnail + L1Name + "
" + L2Name + My.Resources.htmlvorAufloesung + ResoHTMLDisplay + My.Resources.htmlvorSoftSubs + vbNewLine + SubValuesToDisplay() + My.Resources.htmlvorHardSubs + Subsprache3 + My.Resources.htmlnachHardSubs + "") Else Grapp_non_cr_RDY = True System.IO.Directory.Delete(fi.FullName, True) @@ -3395,8 +3382,8 @@ Public Class Main Next 'Debug.WriteLine("SeasonJson: ") Anime_Add.groupBox2.Visible = True - Anime_Add.PictureBox1.Enabled = True - Anime_Add.PictureBox1.Visible = True + Anime_Add.bt_Cancel_mass.Enabled = True + Anime_Add.bt_Cancel_mass.Visible = True Anime_Add.groupBox1.Visible = False Anime_Add.ComboBox1.Items.Clear() Anime_Add.comboBox3.Items.Clear() @@ -4317,7 +4304,7 @@ Public Class Main ListItemAdd(Pfad_DL, L1Name, DefaultName, ResoHTMLDisplay, Funimation_m3u8_MainVersion, SubValuesToDisplay(), thumbnail4, Funimation_m3u8_final, DownloadPfad, "FM") Return Nothing End Function)) - liList.Add(My.Resources.htmlvorThumbnail + thumbnail4 + My.Resources.htmlnachTumbnail + FunimationTitle + "
" + FunimationSeason + " " + FunimationEpisode + My.Resources.htmlvorAufloesung + ResoHTMLDisplay + My.Resources.htmlvorSoftSubs + vbNewLine + SubValuesToDisplay() + My.Resources.htmlvorHardSubs + "null" + My.Resources.htmlnachHardSubs + "") + 'liList.Add(My.Resources.htmlvorThumbnail + thumbnail4 + My.Resources.htmlnachTumbnail + FunimationTitle + "
" + FunimationSeason + " " + FunimationEpisode + My.Resources.htmlvorAufloesung + ResoHTMLDisplay + My.Resources.htmlvorSoftSubs + vbNewLine + SubValuesToDisplay() + My.Resources.htmlvorHardSubs + "null" + My.Resources.htmlnachHardSubs + "") #End Region Me.Invoke(New Action(Function() As Object Me.Text = "Crunchyroll Downloader" @@ -4341,47 +4328,69 @@ Public Class Main #End Region Private Sub Timer3_Tick(sender As Object, e As EventArgs) Handles Timer3.Tick - Me.Invalidate() - Try - Dim GeckoHTML As String = My.Resources.htmlTop + vbNewLine + My.Resources.htmlTitlel.Replace("Placeholder", Me.Text.Replace("open the add window to continue", "")) - Dim LiAdd As String = Nothing - For ii As Integer = 0 To ItemList.Count - 1 - For i As Integer = 0 To liList.Count - 1 - If CBool(InStr(liList(i), "")) Then - If CBool(InStr(liList(i), "Finished - ")) Then - If LiAdd = Nothing Then - LiAdd = liList(i) - Else - LiAdd = LiAdd + vbNewLine + liList(i) - End If - Else - Dim ProzentBalken As String() = liList(i).Split(New String() {"width:"}, System.StringSplitOptions.RemoveEmptyEntries) - Dim ProzentBalken2 As String() = ProzentBalken(1).Split(New String() {"%" + Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries) - Dim ProzentZahl As String() = ProzentBalken2(1).Split(New String() {"'percenttext'>"}, System.StringSplitOptions.RemoveEmptyEntries) - Dim ProzentZahl2 As String() = ProzentZahl(1).Split(New String() {"%<"}, System.StringSplitOptions.RemoveEmptyEntries) - liList(i) = ProzentBalken(0) + "width:" + ItemList.Item(ii).GetPercentValue.ToString + "%" + Chr(34) + ProzentZahl(0) + "'percenttext'>" + ItemList.Item(ii).GetLabelPercent.ToString + "<" + ProzentZahl2(1) - If LiAdd = Nothing Then - LiAdd = liList(i) - Else - LiAdd = LiAdd + vbNewLine + liList(i) - End If - Exit For - End If - End If - Next - Next - Dim c As String = GeckoHTML + vbNewLine + LiAdd + vbNewLine + My.Resources.htmlEnd - Dim Balken As String = "balken.png" - c = c.Replace("balken1.png", Balken) - Dim CC As String = "cc.png" - c = c.Replace("cc1.png", CC) - HTML = c - Catch ex As Exception - 'Debug.WriteLine(ex.ToString) - 'MsgBox(ex.ToString) - End Try + ' PrepareHTML() + Dim GeckoHTML As String = My.Resources.htmlTop + vbNewLine + My.Resources.htmlTitlel.Replace("Placeholder", Me.Text.Replace("open the add window to continue", "")) + + For i As Integer = 0 To ItemList.Count - 1 + Dim Item As String = My.Resources.htmlvorThumbnail + ItemList.Item(i).GetThumbnailSource + My.Resources.htmlnachTumbnail + ItemList.Item(i).Label_website.Text + "
" + ItemList.Item(i).Label_Anime.Text + My.Resources.htmlvorAufloesung.Replace("0%", ItemList.Item(i).Label_percent.Text).Replace("width:0%", ItemList.Item(i).GetPercentValue.ToString + "%") + ItemList.Item(i).Label_Reso.Text + My.Resources.htmlvorSoftSubs + vbNewLine + My.Resources.htmlvorHardSubs + ItemList.Item(i).Label_Hardsub.Text + My.Resources.htmlnachHardSubs + GeckoHTML = GeckoHTML + vbNewLine + Item + Next + + + + Dim c As String = GeckoHTML + vbNewLine + My.Resources.htmlEnd + Dim Balken As String = "balken.png" + c = c.Replace("balken1.png", Balken) + Dim CC As String = "cc.png" + c = c.Replace("cc1.png", CC) + HTML = c + End Sub + Private Sub PrepareHTML() + 'Me.Invalidate() + 'Try + Dim GeckoHTML As String = My.Resources.htmlTop + vbNewLine + My.Resources.htmlTitlel.Replace("Placeholder", Me.Text.Replace("open the add window to continue", "")) + Dim LiAdd As String = Nothing + For i As Integer = 0 To ItemList.Count - 1 + 'For i As Integer = 0 To liList.Count - 1 + 'MsgBox(liList.Item(i)) + 'MsgBox(liList(i)) + ' + Dim Item As String = My.Resources.htmlvorThumbnail + ItemList.Item(i).GetThumbnailSource + My.Resources.htmlnachTumbnail + ItemList.Item(i).Label_website.Text + "
" + ItemList.Item(i).Label_Anime.Text + My.Resources.htmlvorAufloesung.Replace("0%", ItemList.Item(i).GetPercentValue.ToString + "%") + ItemList.Item(i).Label_Reso.Text + My.Resources.htmlvorSoftSubs + vbNewLine + My.Resources.htmlvorHardSubs + ItemList.Item(i).Label_Hardsub.Text + My.Resources.htmlnachHardSubs + + 'If CBool(InStr(liList(i), "")) Then + ' If CBool(InStr(liList(i), "Finished - ")) Then + ' If LiAdd = Nothing Then + ' LiAdd = liList(i) + ' Else + ' LiAdd = LiAdd + vbNewLine + liList(i) + ' End If + ' Else + ' Dim ProzentBalken As String() = liList(i).Split(New String() {"width:"}, System.StringSplitOptions.RemoveEmptyEntries) + ' Dim ProzentBalken2 As String() = ProzentBalken(1).Split(New String() {"%" + Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries) + ' Dim ProzentZahl As String() = ProzentBalken2(1).Split(New String() {"'percenttext'>"}, System.StringSplitOptions.RemoveEmptyEntries) + ' Dim ProzentZahl2 As String() = ProzentZahl(1).Split(New String() {"%<"}, System.StringSplitOptions.RemoveEmptyEntries) + ' Dim ReAdd As String = ProzentBalken(0) + "width:" + ItemList.Item(i).GetPercentValue.ToString + "%" + Chr(34) + ProzentZahl(0) + "'percenttext'>" + ItemList.Item(ii).GetLabelPercent.ToString + "<" + ProzentZahl2(1) + ' + ' Exit For + ' End If + 'End If + 'Next + Next + Dim c As String = GeckoHTML + vbNewLine + LiAdd + vbNewLine + My.Resources.htmlEnd + Dim Balken As String = "balken.png" + c = c.Replace("balken1.png", Balken) + Dim CC As String = "cc.png" + c = c.Replace("cc1.png", CC) + HTML = c + 'Catch ex As Exception + ' Debug.WriteLine(ex.ToString) + ' MsgBox(ex.ToString) + 'End Try + End Sub + + #Region "process html" Public Sub ProcessHTML(ByVal document As String, ByVal Address As String, ByVal DocumentTitle As String) Dim localHTML As String = document @@ -5300,6 +5309,16 @@ Public Class Main End If End Sub + Private Sub AddonHTMLToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles AddonHTMLToolStripMenuItem.Click + My.Computer.Clipboard.SetText(HTML) + End Sub + + Private Sub Timer3OffToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles Timer3OffToolStripMenuItem.Click + Timer3.Enabled = False + End Sub + + + #End Region End Class diff --git a/Crunchyroll Downloader/My Project/AssemblyInfo.vb b/Crunchyroll Downloader/My Project/AssemblyInfo.vb index 08a4441..e442349 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 35fd470..42d0202 100644 --- a/Crunchyroll Downloader/My Project/Resources.Designer.vb +++ b/Crunchyroll Downloader/My Project/Resources.Designer.vb @@ -337,7 +337,7 @@ Namespace My.Resources End Property '''

- ''' Sucht eine lokalisierte Zeichenfolge, die "User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:87.0) Gecko/20100101 Firefox/87.0" ähnelt. + ''' Sucht eine lokalisierte Zeichenfolge, die "User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Firefox/102.0" ähnelt. ''' Friend ReadOnly Property ffmpeg_user_agend() As String Get @@ -921,36 +921,6 @@ Namespace My.Resources End Get End Property - ''' - ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. - ''' - Friend ReadOnly Property softsubs_download() As System.Drawing.Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("softsubs_download", resourceCulture) - Return CType(obj,System.Drawing.Bitmap) - End Get - End Property - - ''' - ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. - ''' - Friend ReadOnly Property softsubs_download_gray() As System.Drawing.Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("softsubs_download_gray", resourceCulture) - Return CType(obj,System.Drawing.Bitmap) - End Get - End Property - - ''' - ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. - ''' - Friend ReadOnly Property softsubs_download_hover() As System.Drawing.Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("softsubs_download_hover", resourceCulture) - Return CType(obj,System.Drawing.Bitmap) - End Get - End Property - ''' ''' Sucht eine lokalisierte Zeichenfolge, die <!DOCTYPE html> '''<html> diff --git a/Crunchyroll Downloader/My Project/Resources.resx b/Crunchyroll Downloader/My Project/Resources.resx index ad6d6a3..791df32 100644 --- a/Crunchyroll Downloader/My Project/Resources.resx +++ b/Crunchyroll Downloader/My Project/Resources.resx @@ -222,9 +222,6 @@ "error":false,"code":"ok" - - ..\Resources\main_button_download-deactivate.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - "image":" @@ -316,9 +313,6 @@ Dialogue: 0,0:00:00.00,0:00:00.00,Default,,0000,0000,0000,,some ideas on how tem <br> <span dir="auto" class="resotext"> - - ..\Resources\softsubs_download_hover.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - <!DOCTYPE html> <html> @@ -368,9 +362,6 @@ Dialogue: 0,0:00:00.00,0:00:00.00,Default,,0000,0000,0000,,some ideas on how tem ..\Resources\download_subs_hover.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\softsubs_download_gray.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\main-close.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -401,7 +392,7 @@ Dialogue: 0,0:00:00.00,0:00:00.00,Default,,0000,0000,0000,,some ideas on how tem ..\Resources\crdSettings_Button_SafeExit_hover.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - "User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:87.0) Gecko/20100101 Firefox/87.0" + "User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Firefox/102.0" ..\Resources\crdSettings_Button_SafeExit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -420,9 +411,6 @@ Dialogue: 0,0:00:00.00,0:00:00.00,Default,,0000,0000,0000,,some ideas on how tem ..\Resources\add_mass_cancel_hover.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\softsubs_download.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\icon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -541,4 +529,7 @@ Dialogue: 0,0:00:00.00,0:00:00.00,Default,,0000,0000,0000,,some ideas on how tem <span itemprop="name"> + + ..\Resources\main_button_download-deactivate.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/Crunchyroll Downloader/Resources/add_mass_cancel.png b/Crunchyroll Downloader/Resources/add_mass_cancel.png index 5bcedf5d95ee8973edb2fc1a2ec15dd710b965a9..bb09cda9a1c376e599dedcfdfa1b513bda5f0043 100644 GIT binary patch literal 4973 zcmeHLX;f3!7QT@xNCia1BBF$VqF{0}lcYpI!Vo2b5Um3|xyijrE|7sFkbt6y6$PG3 z1!d5R16BmbIw5Ek6$Py#NJYR>6bt%%zF3!2E7f-rP;tHfajn;XW?J{0z4y2G{`Nk5 zamb096J}@YY70S-oiJPw4MBtg@a$zX0{ljlx4A&jFjKmCfj$~B5H(u03{S#{`ZNtj z#EiHMf{YzMZJK-h-c+0HU*bYwk4ziNC568{m3pPjT{`cV%Ej=BSNKzb-Q2(#vat zwFS;SWpe0yxTePL(3xo+*M<%C_D;6m5n2 z?_uQZ?S-4K*H>$cx{G$TpjM3@_6-?G)49kcijw_dkylF3KOsh7S@c}pZ#PPp*Ti27 zAHH+#rCuiCmMo$%P9$8d zKT`FDpW$Ga&sTN3_Z|~h{UcFn$DY9S+ovkN-qE;c>+h}l%{S%*JZ$H!k8Fxt`rzj2 zwyqHlr=$FHqc)cuy>IN_ENoQ2hRaB!3`IQVVrgNEOl@eM!xe4tzX zl9=5gKBUyq$qiB8PS4Hd&2r9*-*MD=Q400s(_lqQet9*=_P}uKfN@p!lxsD-YTK-C z>$STI3U=ldzC2TYopf`$ub(e0a=x~B>rdKEEK}nW zm&=J)@B=s81a5iZ#F38l%3Fcs$L&0tP+lC~y!^-W0o^YP?rm&5MhIP>Cf+_%+uyz7 zaqZ$GRN8;0td<1!13cm)}^WRh>@()d72>xFa(%Rs>L;WT&*IS zF%gM6Mb9UZfSmX?KBYz^dIzu44YC0EfQ^U-rctP{QV9>W(CI@`0mxuLe`%o;gOLtL zV>)$;R*HqBVk*7oPzY4|&R&zEO|qneN?|MsQvy{T@Jjo@WtdPD_0GaffgD$AELMQ* z4>a|->^)f@#AcRQ(is{EFn@>pf%eHq1+)5ky;#dC6Y8WDl-%cpfCoFMq>h7mW0bDGi59) zS%Ojh$V@s)mr*f{E@2`TC{)S|Rcn<9C?~E&^X8AFwbUzx4OQX~LhS<-?v^vm>W>gxL!WfX43&R8H z0BR9)rvd;AEXalzti=$$S}RtollUZaP(-t(rNN2*17!)vbwDG{-1CE7AA=J8jr;y!Gp=d<}>{^TYva}`0%$V3>gBzZeR}#7ci^fcf)FsFEfRI<7==E zf1?Kg{mIEk@%xFcPjr1010SXQsk=VW^-&Cbl=7$U`oGa-`~JFvslZ=A25^~4Z{8pT z7oic7*?{;&Cz5Q*A2TEYMTZ-jaEMC z%NIYna8mXyx(O{o9igsyW#zM5HkaPmJ!7EWZF5RvC%qY-xp%&ZV)_O; zE50(N%bO6tEktSs^^S3ZE_?>j2!Rn0_>3N04Qvdo-ipDhdYw=`0+QX|;`QxBsCY-> z#-piFeD-m##*@8YHlCXVovMIY?rjquTQ7yEbspol_4=^(c!h0&9%uDj-%!{Y*~BUn z9)C{gcK2wHgO{I{)0Z92xwM*K+!y)%NxR0M8&UnNh29G%FT8j)Ez{r-UQ~Yi^?ufK YE9Vz}eZ7Vddq6ZK44ET1Ff%^uzl3*W$N&HU delta 4198 zcmV-s5Sj1oCXFGGBYy@AdQ@0+Qek%>aB^>EX>4U6ba`-PAZ2)IW&i+q+O1YwlItaWC-L!pcJ+73K3@wBVv}GF)Tk#qH_q&3W)@hXOe_6?+?PU#)|i1=bq6`MWRltUI3d7Imz= z2_uyPUY z+rXecFn4S)?)fn>m40ZeJv=vz(_60l6B^|EH2{dPw!#@|VBj`tN=DEFI}vc~;3wcY zH{l5eNR>BT1#TK5!MXEU8*`kVv8?>*Mrr{OCqx|7j20kEM4=y-4h@Ail}lAkUAqnq zYbK^<=6`l_RCsf7b#wRb!=tw@UAuMfy^kJ)M?(tJVZ*P{#~2YfQ1>$TSKhv0ZO2nlKGp3+ z;lcE7g~T>@c#g6es(m?jrsP8nsmYBkd1GmoVnN!G5wnSs)`%67vZrP4QCFZ4VN+|` z9e>=>5+e*0Jtgbw_knK$`)$#&!nh0gTqIr|Kx?AAmPMPjo7rw@+F`b1)io!WVB72N zv2y}!fwE4313?{eLL}O##$t0zU*}`REDnI;E_(|vjSL&4dBgOg9VmUpP}|6Umt@D> zarL~Rs1y)8%Lg#g-2mH$O{sRK4$%d-Vt>QN1~pzG&JJH1?5>`>$9=`1jRaI0C9s2R zo=hDc_Dc5&J=Pp@^DdO;*#^6Aop7~<&pOK#;9l#>eTsQ{uW*SNrZ~Ac2*c8CZO%#) z@dkj{*M!6%0!WV*a77U%K4oghH5|I9af|uJSqZATtumV)m*K@U!CuKy?z72ru780@ z@3yO{IrcFi*_m=p#0tg=YEB>1PX>j1t2wBgJR}>RC;)CT4YO-@hbmi^7!*7U;j=6C z0>Z8Dtu71B!$ve40z$AMmer{*1Fm{Uc3*lpKt9?wsx)JuHBSt*tLUsM6Ir6;%pwcG z@k%6gSU^_a{iu+10mA!fVtZe_uYc1ZsIC0y=2?&Sh&^}Vbfh#9{=7^MHXDlQZ4n@> zfUjw1e4>nGzr3(-MEmL5$b!!&W=J`B9v0gvLe>CuV($$}0ST+C4oB+ZF_G35>;j`g z)OFAmht!0a_5^Sc3HZF1dgSe3U2Saa1e1fPs}GzjAhYesniLmu2Evqw<$vZ{{lsmL z^!COu3i#i=83Bj0%7hF1mW|`F?2NutDu)yyggYy8Gd5Si9TgcbD7xj@Z4WTWhFaEG z7jvog2Eid{Cw7Re<~z?ZZ>J%8D2IY$#CvfUq`EZ{4(x?-qznZFo@>u$KaTV6*nf8>K!Ybxfnt zG9iTp)Gx;=hQWI$q<4eZ*pK4@&F{@JD6<015(0L_t(|+U?zW zj8)ft2k_5(Z}xp*m|@t4)nFiOCKNYLse@CJ5?eTSWhzIZO`=v+=pR-8sk+#%+Nl3j zRbv0uL@J6brE23viR(m-9a(X_RwQ6U*lfUf*kOiQ7-nH+`p0=N4?N(3dZF^~BR!#a zf8V|59o;#+?>pz7b6;lkVOO&m8?X{>LI@#zQXRrJJcF&{?T{HKOg7`82#^p$2v-S~ zN3IN&>=ipbihqkB2_b}V6>a&Pc=T#v@+iI;=P85`!UTM?Fis=>5JCty5Gb1q z!{nhjCn1CoZooqq!(_9#MiN2@;l{LKe{+#E{WpYgvnyM}f=#Skk72a)+&^>Vr(B5B z6FycOillWUA>2GF*D?LG%=#47Ed?)h(0`O;Z*t(roH_8xIxo2y)X!zwynL7xQ(5!g zIhi4R^i~#$A+B(BdOkYL zP%piGjEs)$mn)*QDvk1l5F$)MxFoxfl@HKV5F`VqX@8FY{tjn;!$>cdFy&5`+(&%{ zLj{SFokrOLis~sU8oQ1#I?RP`f6l+gP#2>k1;@;%Y!(#_X}_Ll8A91A${NWPV~F7n z`t~w#Wc>PP>L{8?*-T0+$F>ijXW%dcyBHpLZ!fEK5hbk@m*wkwfsrl-j?%v~0y9LI zgm7KzH_=u>P5${{JMVm-|9p&*GwFjK?Be)APCQ8_%gDP0J)6(5>Q880e?&vo*f80J z0Z#AZwZCBRuNmkpIOfZ&x}V#YGIXAw-pQU(ZvQ(LFQ=v&-E_Ud>)++o$H%XK*-~b0 zWcfYJo-ww)=Qw+R%=T|{YtxpJe#t6+4bFf7+WK7ZrboIe*SwYtzi8Trs&UnTxNN(Y%oLPcrXccma@`<`c_f?DQ=z1ywCIVzh%#}fAmEY3I7iU7~&L! zkN3OGQYKYWlFM&9N#C0s*gnA`>S$U(RUM_J6cq#sWHRJRD6eJiJxp0MHX$loL^l7v zx#ARR4O3D%mqH;+wlsy#g0Is!Gj%MW@@p)=i$#m6s7k|Ym;LX`rD3n?T54}W6SeEO z?_p*%Q&~Y#uAshIe=;SM)Ka;SJN}rKd!m_y=$V9YZDp8GU6$hfroprH?w|O#@sT0= zdl)^D z52WB}na%9QD5vhT%-T-pYjhru<`N=ILb!VKtEMzF)<+&5Vz6i8MO-*a`wMK}%duBE z`XXJs8ASP77JMarpqE1>Rh5)A(RJ#If=1EBTfg9ce!$`Xp!OSl`m1T-WNDU6HPw|A zm0(tyqFj?-e+M(v!--dTe|JgAMwTy>DWQ} z9n5`zis`h}rk>1P&FkOiou^XI=Jbo4`anFHC@=Bu==!WzcAyPSEt7{Gj60{YIFz@CLxSt2-{MawC2M^ z6-862uiDeLkvwL(W3 z=%Fj+N-APx++r@%b&9@Y(Nsc&NeJ)jomZH>ma2Nx&~yuT{25RE)3uK)UP$Az6ckxF z!R{y6_ISGXFw)5M$t?d6>fCiGEr`4*m!WPMel_tj_I!^WFL7q*>iZ1tqi=t-k#N(C ze|09|<9G0v4D^mQ$pw^%+c-XudKysGz>04%X9cM0U{+S!?M$7) z@GG4DL3*5hj$AjhzsSaaWZ|7ubVnNrf6+4u;eDO|CA-&ARz+hy*^)FpcJ7y`{|px{ z4hLl^DW$R@t&Z=lW?#W-bS2FDJz7?$5wy}u>L!0kt$Yv1_AzrBwM{9+8dkIJar*Q1 z%@tGIl5WS+p5yQ?_PorZds7kRb6E0q+BR_^Ki-weP+UZLJ#~#7tQlJ*8A60fe+bv| zI=h~wxRgc9nAAYFnDQ2;wTyqr*%MsopyzE4pJ8f!x-CgSj`RwKq6Re_#BHVu&yaVZzQn#*Q3=UCfzJZ6j4x zX?E8oeGHwWr<3+KXy48G4qkhKe-#UvJe!KL{7kSx`Z_q*!EghuEtlVBg;dtiwU*kS zV`wBTfE-WvciG*X%AG%p`o_!aJJ?6}F^=q^vlj>H{RJ;n<6b7UQqwY4XVPr6{%(3s zac(ci-%gX>E~U~yw3TqvhRGrEYm4D#(D`j%ewuyjnSTdUr&2SuV24wje?LO|ui5(q zC-z|ay9RpFt?Q4x%+MOvtWHBnr%%$K|3L0Nz|o!552qFD-6t6+ z43~H5Xy?%W^npG+L}xb_3c3m>{(0FdLoNw;yi>9Lij&;CX21oP*(^cgmAqMVe7>i`j5o<2qA=U10G>)xz|=a z7Uv{{5W;nMET12jt$^PWff7Op;W~n3%f%;G-cDr;{zzOy2_b|qIKD&qoY+#hF*Ew` wRS(#V4Ol7Gp@a~^Cp|#6Nwa^qj<>`A0zw$SDC8qrS^xk507*qoM6N<$f=!}B(f|Me diff --git a/Crunchyroll Downloader/Resources/add_mass_cancel_hover.png b/Crunchyroll Downloader/Resources/add_mass_cancel_hover.png index e33c7ef0aae4ca8fc5f2d757bef3a9d160341248..132b092d737d4fa193c30b503bc7b16cafdf7a43 100644 GIT binary patch literal 4975 zcmeHLX;f3!7QR6l1soB|gBru+K<0!DB{GC45dsLbf;inIH*kRrBsUPSW$MExlvDT>t6+}>^Vo@e5rJ{8zwN;^7OHTqSuGc@V_4>~wH|w0U_x|?Y-`Quc zoa9G@Ewi(6wt*nXP8b{%2|+jm7`t0pfbYr--(Vb9!#wkk#H&p#5MzBj5F?N2(l zD6!2-yF{Pio$@8cp4~}%fU6ry7@e~y`F8I8?k?9jxar-0sH*~PR~u&8RWt7NYOCxW zXRph#v%7Waa31Mg-bwFF6e&r@bD9DUDentM?@W`|dp!BPmg7DBOoZox@-N7lC1=CE zE*{@(cDcY~$aV2(^Ql}r*4*Roi=8%o;~UWBIFpkiPl_DPA{JJv&amd?$MM;+1_Jw0nl$(@%+G+0L$s zr-ZdRPbw@9^zhAV?*%#1p|gtv@rr3U9|l==d7;PJn{(->7;J|&RitBmfZoY!pFYNm z*KPiFK1rR`OpM9+{#@2_k~ik(KC-*dD^bGZ^S&Ft!_8Z~e}(F4oyD{J+9%HOAt_%x zyt|v*#5%p_>X@Y=%Ojh3mUPJqXT19?IuO2>JXMr4I_e^rLOO;IsZN&Fi8n z1&au&Gg8h+?Dj4w;4XL2umA56hgDk2@kjiG&aD;4*fw?MmVR?<>`9kSaF5yK4p?p~ zHyHNnw~sbdd_y?*@ei4&PL3SgU}^Q37S+C)>fhz<=CCEdr@z2SCx8MTiRWCIMSmQW zF@H+OL+$i=>xTFGUU=5Or#!Cp6WgEjo9aVZ-hV!cyxyh$nA@~v zb@7_aA68>A1G`{1Ly4RHY<;s&QQyuTwmWo%?7jP)ho;3AJ6wt@?NaYx4!5pzYD>C+ z)?IN4a?uClt!L7zyZzspyZ1<9#m?Z%nHSIc4U8IY7PfwYTe>+tx-3xr`#{#uC*$fV z)So=_#QwMS@+@0i&YH3n^$&(6eTq`(kNAP*Nxv=DuD@k?v?@gJg5&iyHfuu+BiR>R z%f^JowyoQKXXFLqbbjT^Hrz*F`d_Q=i_^@jn(n{x#HtfGd;6U43CL&Zr{3%SuCF1! zx`cZYK+nnS^(4(AC(2HV3pf}3YNqp#E2sBe5D$}Ge`^)g(%RWsWie88@#VtD&s~5EuDY>GaexU!&F={ zIV~-Xltw2h)$wF1hr=OLXk;3V2sDVAbOi?MhzgCH5n>!82+>H?s0u@s3cL{$7Av(F zk3ax&{EPVHDv{_Vyh1a<0^ozJgH>cIi9(jk$&)QKm>?B^Oa%0o7Mf_#(#esCMyXXx z5J4)Uz}zN7NF^`rRa$kjDIKYVj3gs+psE30sjsMv86~E4CIVLP0XgsV|dm2mRpsEklj07a+E*bEs6gvo@NL)`KFxXC14#y*8l_K6GFcQuUh!FA!G!o_2N<=b@$$$Yk z1E@l(Ow+s)MWb>g3WJS&f;?Ds3XR2JGiWp_hyF_G14OL>wP-}8Qb_c1WaGwgK{|k1 z*jT9mz+?fk;qui8j49R8N@X&SU907NH^B}MAb(jDdV&8Ly(M` zM0mWZaJjH#+=&KGMWiN2z;0Y5Nq`mc2sq&rCG}z*{fq6AvL!5*7-10EESi+aV9D4- z*oR3WQo&yNNM%x(N`qfV*C=IJ8mvYF;z6b$8&E=~Z14*v$Xxikep&)zWQqdLH-$x{ zu%oFQE|bQku?ggfWXZ-e{UTdm^8fJRYf_lh1c2T68fY${SCL;fs|mi06#k8`iGBDR zJpkypPTq*$w{*Rw>x~$ABjvZ%^_H$TV&ILG-&WWEjV_y4*BwLwegUO{%ghnk;ZMLt z$U+>lEC?DizRSLqw>uafGF(;596Syd}~N-mc0|gdm2BRCT8OcrrAp|nDw8lpihBjWA7JUwTD8#`9SFW z9z+RANn`ZF_@AbX_p zdC(s-3)>$Lc5Lu`?pUK+?Udbe!o8+%Yya+0i>mENp`b9mztnQ{QT7pG$-Nt^_zj-d VSz6quePe)XNGJ#ksta77`zJiKU(f&m delta 4157 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 Hu0mjfn~h!M diff --git a/Crunchyroll Downloader/Resources/main_button_download-deactivate.png b/Crunchyroll Downloader/Resources/main_button_download-deactivate.png index 5fd5a05fd90f31221f2e448f442d880d44f5e9ff..a9f952317f88311f526f8a5f464fcd4b444963e8 100644 GIT binary patch literal 5146 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 QkN^Mx07*qoM6N<$f}I##*Z=?k diff --git a/Crunchyroll Downloader/network_scan.vb b/Crunchyroll Downloader/network_scan.vb index 1c8abb4..5554118 100644 --- a/Crunchyroll Downloader/network_scan.vb +++ b/Crunchyroll Downloader/network_scan.vb @@ -330,7 +330,7 @@ Public Class network_scan Dim L1Name As String = L1Name_Split(1) Me.Invoke(New Action(Function() As Object Main.ListItemAdd(Main.Pfad, L1Name, Title, DisplayReso, "Unknown", "None", "", m3u8Final, Pfad2) - Main.liList.Add(My.Resources.htmlvorThumbnail + "" + My.Resources.htmlnachTumbnail + "
" + Title + My.Resources.htmlvorAufloesung + "[Auto]" + My.Resources.htmlvorSoftSubs + vbNewLine + "None" + My.Resources.htmlvorHardSubs + "null" + My.Resources.htmlnachHardSubs + "") + 'Main.liList.Add(My.Resources.htmlvorThumbnail + "" + My.Resources.htmlnachTumbnail + "
" + Title + My.Resources.htmlvorAufloesung + "[Auto]" + My.Resources.htmlvorSoftSubs + vbNewLine + "None" + My.Resources.htmlvorHardSubs + "null" + My.Resources.htmlnachHardSubs + "") Return Nothing End Function)) Else @@ -432,7 +432,7 @@ Public Class network_scan Dim L1Name As String = L1Name_Split(1) Me.Invoke(New Action(Function() As Object Main.ListItemAdd(Main.Pfad, L1Name, Title, DisplayReso, "Unknown", "None", thumbnail4, m3u8Final, Pfad2) - Main.liList.Add(My.Resources.htmlvorThumbnail + thumbnail4 + My.Resources.htmlnachTumbnail + "
" + Title + My.Resources.htmlvorAufloesung + "[Auto]" + My.Resources.htmlvorSoftSubs + vbNewLine + "None" + My.Resources.htmlvorHardSubs + "null" + My.Resources.htmlnachHardSubs + "") + 'Main.liList.Add(My.Resources.htmlvorThumbnail + thumbnail4 + My.Resources.htmlnachTumbnail + "
" + Title + My.Resources.htmlvorAufloesung + "[Auto]" + My.Resources.htmlvorSoftSubs + vbNewLine + "None" + My.Resources.htmlvorHardSubs + "null" + My.Resources.htmlnachHardSubs + "") Return Nothing End Function)) ElseIf ComboBox1.SelectedItem.ToString = "Subtile" Then diff --git a/Crunchyroll Downloader/packages.config b/Crunchyroll Downloader/packages.config index 2085cfb..44a6436 100644 --- a/Crunchyroll Downloader/packages.config +++ b/Crunchyroll Downloader/packages.config @@ -1,8 +1,8 @@  - - - - + + + + \ No newline at end of file