From 4ee9664b3a1229d67506706ca107e4b5a6d1368d Mon Sep 17 00:00:00 2001 From: hama3254 <52826614+hama3254@users.noreply.github.com> Date: Thu, 11 Jan 2024 22:02:32 +0100 Subject: [PATCH] fixes and improvements fix UI #876 change language text #868 fix integer overflow v4 processing (maybe #872) --- .editorconfig | 13 +++++++++++ .vs/Crunchyroll Downloader/v17/.suo | Bin 217088 -> 230400 bytes Crunchyroll Downloader.sln | 9 +++++-- Crunchyroll Downloader/Anime_Add.vb | 5 ++-- Crunchyroll Downloader/CRD_List_Item.vb | 4 ++-- .../CheckBoxComboBox.Designer.vb | 22 +++++++++++++++++- Crunchyroll Downloader/CheckBoxComboBox.vb | 20 ++++++++-------- .../Crunchyroll Downloader.vbproj | 5 +++- Crunchyroll Downloader/Main.vb | 6 ++--- .../My Project/AssemblyInfo.vb | 4 ++-- 10 files changed, 65 insertions(+), 23 deletions(-) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..edb1959 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,13 @@ +[*.vb] + +# IDE0059: Unnötige Zuweisung eines Werts. +dotnet_diagnostic.IDE0059.severity = none + +# IDE0054: Verbundzuweisung verwenden +dotnet_diagnostic.IDE0054.severity = none + +# IDE0017: Initialisierung von Objekten vereinfachen +dotnet_diagnostic.IDE0017.severity = none + +# IDE0140: Objekterstellung kann vereinfacht werden +dotnet_diagnostic.IDE0140.severity = none diff --git a/.vs/Crunchyroll Downloader/v17/.suo b/.vs/Crunchyroll Downloader/v17/.suo index f660d0a634b348ff4cb999c74db74bcb776dc9e9..db4a800759542221e5e3f2f7203efb2eed8a1539 100644 GIT binary patch delta 12290 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 JYAuO?{{biB_No8? delta 9048 zcmeHMdtB7jwx6|r!@$6ZBf)^kV?aYhz~QCfixJ4we2|h7Qh|V`5s-oz$7Fm|lx8`* z*k)unc_uA00h^zh)hHgbuE((J^{91Gv72di^5fNxkuqoPVR&eId*1WukF)uFS&zMc zd#|sEi|A zrBOP|6p{u1I8hIRFJU6#F2Yd4qXc2q5~70%qX?q?Fc#YlKcXWDSp*S|zJ$>P9o12k6xD=8LMF+#5f%MR zCmKTVA%qeF2*SZ>MEwa4N0q~oLrfAOjo{~0Ivl-3r-T@i`wJc65rQY77vUa)fgmPo zB|$|Hk?2|OC7qHmhmcJW1Ki;zk%60T;DGM|_rf_V5(L4u0WEaaV-;L7c7FXjuqQ6(V zsJAIadb4ewD`LdhA7e+pe?nBq|4H<)ODE*N5r0(3Yw}+vP+TFP$Zey47)ml zr&-0IHyXqBZ4wLeK6=9lMPS49aBK{ZY5~g%WTx1N#)#PC&=9yElxur-=9No!XOMeB zS#N{T#*muTpl{XeviUu(?i<%@@w@L@UjJ6vXRhZxrsYqEytlo#_BHi1c5;+2JIVEy zM6KC3%b5#}*}j{=GFHjW-(Wf0wkEN0Q&td+e0Q=cd;S4zSo^~x3;+DJH0Ri03_Ip%bBffv}G7B0)^DNP_hQG1+yZyA8xx2&}p?$ZrcV z;z?27Abu<1P4;$WD9}3dhu!Sds9S=YT#feiX#4^3`w4#)E&ANwqegUfL};suduTs( z@#lN!M9Y&Tx4LwviT;m^KkK5RjVNEaK5x6M~jm%VU;y%rIFV~;Nz{W+7S9_V`$0@}tyF1-0SVepl zJj5==(`pcJYO(gZtIJqL!mBK3LL~C8O{KAX!YZ(6(Xtk=Nl)|s0gVIhe;Fjjny$8* zWt1cl9V22Sy%A2(5 zF0BvoqE>7?f@Zk%eOgu=R2NLVzDHdc@!^F2gaL$G3Bt#Lgh;|5LKGo}Ao`-B za~Qe>N4$$qVTbDasYkdZBT2WY$B>jp7)O#nQ#SjCO(tmy;ZDL`gsFsSge<~L!cuXZ zG3F9?58+<$>Tz@;oFy3oZxO!QAKzN4wb zu~eAKOd|toa-@l@Zge1DG8)s2$NpCQ+1jMi-dpj#=~up*`kKSBidKXhZTFoIuDDL_ z)EkEXDJ5;FH5H-3JQQNSU42;TzP0}=?V~naEnAhdu4J6JBun{i2K35`BrV!6kQ^Zz1^= z!bZZM306XTef}JRiC)=th@IkLphj9k z_gh<>VOLs?BIB)zn#9EDq~yh8^NSZ0y~BpIJk)#ABl^twrSpmk%5$d`m6tR7XQiG^ zbXW1FL?^@$mh#^p^qN~TXF==&suT=wJ`D!;Y1;z#wE3kEFDRPN>RJbTB_>20I(mJb zdY#6MC+y~HoJ?BK7m?x=^v4*grwx?ggExbcl*F9;>RZcFoXqPR{PY`Sn0!aU9l|6O`qRryle-{ z*T^rN!B`gC=EK*l!0{|^k3XwxNoVlgOU(3x$%dfCpLWhn-FG;r>EWEh{Q2dZIAOk0 z4lCsfB}@i2hy!$u2u9}@62IsMk$pPP>z!1?V^q*z(4oUL5?i~@yr%8pEun$6 zW73+|=oXfpH)ZF{NlR0|?e~sX&5%#iiT`w0_RJ+O&1oN5nwECw+T;s&yf9HQium|} zy&PB8B?OCS?IXwUy!A-mbNb@6H1BsmTvycpwWNaNv@{w<(Ww`F(&KaBBeS<&)@$J; zaH9r%xvvJI)#98hj8gFN8W;w*$-6a>3j7{FP;<2}3=^Mqa)b{Y2b&Itf_g^sUp_qi z{V`a>mkx(|R@Pr@4FUWY#hm-hmdJ$ws07R!$!q&U;U6TlzaXO4C{W%gmhyRjcun{v z*A9e2v>HH3O*PhRK-+MbYqp)c`ylPqv$XhcZP(C*q zbW*pCyx|!rls|tKf+X8cFyYPYZB}yAHZaMijkHi+ZO#K#4T-k*N#fxXU?jJXCA)QV z;A>@li*rZ?)xC+`XE^8 zex!%H)&rpI^48i+k^H%Cb(<%XC3U~ZDC=QBG6Zc$0a3<}pdGBoDdP^%_@;gE5x3|d zTD+F16w`e+(2oSS@T?CYQX-KAKOsbOV+-ZWbHsV~r8`;i{-xan6wy5Y3`DCu6w&F5 z`86$I0H|inX+9%8ure9IF=?u#9SkOWf432ID^8#O>VfGn}f-ey?XTF z&3aTyRL6El1oJ8f^pou>97D&w-^pyNCqhja*;W^fdcGwXJ-NvXP5(M?e9?&48X%ke z(cXO%WD7(iaQi?qDhf^fJ0v6M=SD{|y5% zlWDgb_$MEui5a)kf*FkVuC^v*#?ZJVVD5B}jmyIW%>HaE_=ZvGCIy=$xB`KID zuBP~*ffy&+Y7Dhe9X}BcD2h)iEJ#V26*DX)Au%R#Xkuc_tfKssnEd$s_*uge5(<)& zl06g-zB>mC$7p!dtc&E!d!i!!;Gi8^td?JVNbR+Nk$=M6X9jlq28W=xX* zx(OxVp(`j;DTdXOOhNezz(NicSR%&2s89}DF+_@jiZ11K1NZ4U@P0BPLv~o{4Zw}r zSlXRL@;@GM}Sr@cL(*4|Y7gVKdS@?+MiXxMO=ACUm5P zJrmt{O+CK#TdxFRmJEB);nqoQX|xrKZ%3y)i!#`$wxRqX+R<3uxN!bnI;OEPZ|L~W z0x6R(K7j_-vRErybyAKy-!mMH9-TMv?4gz+>M>x7n z2b{w%fu|{P9IIRIBj+4Ns~Zp3!EtVwDJ9C@-{1v}wS`vgo^0tU`KdNsA@R&$Sj*Ng z_my{^q;o>YtM1-*4CLmIajiIv82Euq(7jb6y@uQp0Gq^yub20?VzL`sHcl^oISG=p zCP{mNn=fFpocty3S5tzVpGW9CP-#4tG9%< zd!?~T)>0HC&&rWJfa~T-wcOB48cUZIS~;sg+C>Kvdh4(dTZnwvONv&~6SS>N{Q=Xs z{S>O??Ag)|;3X$;wDXbKGo%LcYOb`E8=KJ}|NVZ6Hd;EAM#!V@mZI@SBgoo?(s?&t Ww-2;EJDx9XQrk=tZGX!G!1zxh^m;x3 diff --git a/Crunchyroll Downloader.sln b/Crunchyroll Downloader.sln index 813654b..3ade316 100644 --- a/Crunchyroll Downloader.sln +++ b/Crunchyroll Downloader.sln @@ -1,10 +1,15 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.27703.2035 +# Visual Studio Version 17 +VisualStudioVersion = 17.6.33815.320 MinimumVisualStudioVersion = 10.0.40219.1 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Crunchyroll Downloader", "Crunchyroll Downloader\Crunchyroll Downloader.vbproj", "{9B604819-2DB7-4BE1-BA43-43BABEBB5EC3}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{BDF9FC54-2F89-41D3-A506-81319A019CDE}" + ProjectSection(SolutionItems) = preProject + .editorconfig = .editorconfig + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x64 = Debug|x64 diff --git a/Crunchyroll Downloader/Anime_Add.vb b/Crunchyroll Downloader/Anime_Add.vb index 1210121..3d838e7 100644 --- a/Crunchyroll Downloader/Anime_Add.vb +++ b/Crunchyroll Downloader/Anime_Add.vb @@ -189,12 +189,13 @@ Public Class Anime_Add Dim Reso As String = "NaN" Dim HardSub As String = "maybe?" Dim ThumbnialURL As String = "no" - Dim URL_DL As String = textBox1.Text + Dim URL_DL As String = "-i " + Chr(34) + textBox1.Text + Chr(34) + " " + Main.ffmpeg_command Dim Pfad_DL As String = Path.Combine(Main.Pfad, Namep2) Dim Service As String = "other" + MsgBox(URL_DL) - Main.ItemConstructor(NameKomplett, NameP1, NameP2, Reso, HardSub, ThumbnialURL, URL_DL, Pfad_DL, Service) + Main.ItemConstructor(NameKomplett, Namep1, Namep2, Reso, HardSub, ThumbnialURL, URL_DL, Chr(34) + Pfad_DL + Chr(34), Service) ElseIf CBool(InStr(textBox1.Text, "crunchyroll.com")) Or CBool(InStr(textBox1.Text, "funimation.com")) Then diff --git a/Crunchyroll Downloader/CRD_List_Item.vb b/Crunchyroll Downloader/CRD_List_Item.vb index 0ccbe6e..6737db3 100644 --- a/Crunchyroll Downloader/CRD_List_Item.vb +++ b/Crunchyroll Downloader/CRD_List_Item.vb @@ -702,7 +702,7 @@ Public Class CRD_List_Item Dim Zeile2 As String = zeile.Replace("#EXT-X-BYTERANGE:", "") Dim Zeile3() As String = Zeile2.Split(New String() {"@"}, System.StringSplitOptions.RemoveEmptyEntries) - Dim CurrentSize As Integer = Integer.Parse(Zeile3(1)) + Dim CurrentSize As Long = Long.Parse(Zeile3(1)) Dim NewBytes As Integer = Integer.Parse(Zeile3(0)) Dim File As String = Folder + String.Format("{0:0000}", Count) Dim Evaluator = New Thread(Sub() Me.DownloadTSv4(DownloadFile, File, CurrentSize, NewBytes)) @@ -743,7 +743,7 @@ Public Class CRD_List_Item End Function - Private Sub DownloadTSv4(ByVal DL_URL As String, ByVal DL_Pfad As String, ByVal CurrentSize As Integer, ByVal NewBytes As Integer) + Private Sub DownloadTSv4(ByVal DL_URL As String, ByVal DL_Pfad As String, ByVal CurrentSize As Long, ByVal NewBytes As Integer) Dim retryCount As Integer = 3 HybrideLog = HybrideLog + vbNewLine + Date.Now.ToString + ": " + DL_Pfad + " - " + DL_URL + " - " + CurrentSize.ToString While CBool(retryCount > 0) diff --git a/Crunchyroll Downloader/CheckBoxComboBox.Designer.vb b/Crunchyroll Downloader/CheckBoxComboBox.Designer.vb index 192fec8..b698600 100644 --- a/Crunchyroll Downloader/CheckBoxComboBox.Designer.vb +++ b/Crunchyroll Downloader/CheckBoxComboBox.Designer.vb @@ -24,27 +24,47 @@ Partial Class CheckBoxComboBox Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() Me.Animation = New System.Windows.Forms.Timer(Me.components) + Me.BGP = New MetroFramework.Controls.MetroPanel() Me.SuspendLayout() ' 'Animation ' Me.Animation.Interval = 10 ' + 'BGP + ' + Me.BGP.AutoScroll = True + Me.BGP.Dock = System.Windows.Forms.DockStyle.Fill + Me.BGP.HorizontalScrollbar = True + Me.BGP.HorizontalScrollbarBarColor = True + Me.BGP.HorizontalScrollbarHighlightOnWheel = False + Me.BGP.HorizontalScrollbarSize = 10 + Me.BGP.Location = New System.Drawing.Point(5, 5) + Me.BGP.Name = "BGP" + Me.BGP.Size = New System.Drawing.Size(310, 317) + Me.BGP.TabIndex = 0 + Me.BGP.VerticalScrollbar = True + Me.BGP.VerticalScrollbarBarColor = True + Me.BGP.VerticalScrollbarHighlightOnWheel = False + Me.BGP.VerticalScrollbarSize = 10 + ' 'CheckBoxComboBox ' Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None Me.BorderStyle = MetroFramework.Forms.MetroFormBorderStyle.FixedSingle Me.ClientSize = New System.Drawing.Size(320, 327) Me.ControlBox = False + Me.Controls.Add(Me.BGP) Me.DisplayHeader = False Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "CheckBoxComboBox" - Me.Padding = New System.Windows.Forms.Padding(10, 30, 10, 10) + Me.Padding = New System.Windows.Forms.Padding(5, 5, 5, 5) Me.TextAlign = MetroFramework.Forms.MetroFormTextAlign.Center Me.ResumeLayout(False) End Sub Friend WithEvents Animation As Timer + Friend WithEvents BGP As MetroFramework.Controls.MetroPanel End Class diff --git a/Crunchyroll Downloader/CheckBoxComboBox.vb b/Crunchyroll Downloader/CheckBoxComboBox.vb index 787c7fb..b7c6ead 100644 --- a/Crunchyroll Downloader/CheckBoxComboBox.vb +++ b/Crunchyroll Downloader/CheckBoxComboBox.vb @@ -11,14 +11,15 @@ Public Class CheckBoxComboBox Dim Manager As New MetroStyleManager Dim Dubs As New List(Of MetroCheckBox) Dim Subs As New List(Of MetroCheckBox) - Dim MyHeight As Integer = 330 + Dim MyHeight As Integer = 300 Private Sub Reso_Load(sender As Object, e As EventArgs) Handles MyBase.Load Manager.Owner = Me Me.StyleManager = Manager + BGP.StyleManager = Manager Me.Height = 15 Animation.Enabled = True - + BGP.StyleManager.Style = MetroColorStyle.Orange Me.StyleManager.Style = MetroColorStyle.Orange If Me.Text = "CR Dub selection" Then @@ -46,7 +47,7 @@ Public Class CheckBoxComboBox Dubs.Add(Dub) Me.Controls.Add(Dub) Next - MyHeight = (Main.LangValueEnum.Count - 1) * 30 + 'MyHeight = (Main.LangValueEnum.Count - 1) * 30 ElseIf Me.Text = "CR Sub selection" Then @@ -57,11 +58,11 @@ Public Class CheckBoxComboBox SubT.Name = Main.LangValueEnum(i).CR_Value SubT.FontSize = MetroCheckBoxSize.SomethingInBetween SubT.TextAlign = ContentAlignment.MiddleCenter - SubT.SetBounds(2, 30 * Subs.Count + 1, 316, 25) + SubT.SetBounds(2, 30 * Subs.Count + 1, 295, 25) SubT.UseCustomBackColor = True SubT.UseCustomForeColor = True SubT.ForeColor = Color.Black - + SubT.StyleManager = Manager AddHandler SubT.MouseEnter, AddressOf ItemMouseEnter AddHandler SubT.MouseLeave, AddressOf ItemMouseLeave AddHandler SubT.CheckedChanged, AddressOf ItemCheckedChanged @@ -71,10 +72,10 @@ Public Class CheckBoxComboBox End If Subs.Add(SubT) - Me.Controls.Add(SubT) + BGP.Controls.Add(SubT) Next - MyHeight = (Main.LangValueEnum.Count - 2) * 30 + 'MyHeight = 300 '(Main.LangValueEnum.Count - 2) * 30 End If @@ -112,9 +113,9 @@ Public Class CheckBoxComboBox Private Sub CheckBoxComboBox_LocationChanged(sender As Object, e As EventArgs) Handles Me.LocationChanged If Me.Text = "CR Dub selection" Then - Me.Location = New Point(Einstellungen.Location.X + 116, Einstellungen.Location.Y + 204) + Me.Location = New Point(Einstellungen.Location.X + 116, Einstellungen.Location.Y + 200) ElseIf Me.Text = "CR Sub selection" Then - Me.Location = New Point(Einstellungen.Location.X + 116, Einstellungen.Location.Y + 344) + Me.Location = New Point(Einstellungen.Location.X + 116, Einstellungen.Location.Y + 340) End If @@ -166,5 +167,4 @@ Public Class CheckBoxComboBox End If End Sub - End Class \ No newline at end of file diff --git a/Crunchyroll Downloader/Crunchyroll Downloader.vbproj b/Crunchyroll Downloader/Crunchyroll Downloader.vbproj index eef5ff8..978ebce 100644 --- a/Crunchyroll Downloader/Crunchyroll Downloader.vbproj +++ b/Crunchyroll Downloader/Crunchyroll Downloader.vbproj @@ -104,7 +104,7 @@ 41999,42016,42017,42018,42019,42020,42021,42022,42032,42036 - + False ..\..\..\metroframework-modern-ui\MetroFramework\bin\x64\Debug\MetroFramework.dll @@ -272,6 +272,9 @@ + + .editorconfig + diff --git a/Crunchyroll Downloader/Main.vb b/Crunchyroll Downloader/Main.vb index 3fc0e16..5796f22 100644 --- a/Crunchyroll Downloader/Main.vb +++ b/Crunchyroll Downloader/Main.vb @@ -4417,11 +4417,11 @@ Public Class Main LangValueEnum.Add(New NameValuePair("English (India)", "eng", "en-IN", Nothing)) - LangValueEnum.Add(New NameValuePair("తెలుగు", "tel", "te-IN", Nothing)) + LangValueEnum.Add(New NameValuePair("తెలుగు (Telegu)", "tel", "te-IN", Nothing)) - LangValueEnum.Add(New NameValuePair("हिंदी", "hin", "hi-IN", Nothing)) + LangValueEnum.Add(New NameValuePair("हिंदी (Hindi)", "hin", "hi-IN", Nothing)) - LangValueEnum.Add(New NameValuePair("தமிழ்", "tam", "ta-IN", Nothing)) + LangValueEnum.Add(New NameValuePair("தமிழ் (Tamil)", "tam", "ta-IN", Nothing)) LangValueEnum.Add(New NameValuePair("中文 (中国)", "zho", "zh-CN", Nothing)) diff --git a/Crunchyroll Downloader/My Project/AssemblyInfo.vb b/Crunchyroll Downloader/My Project/AssemblyInfo.vb index 48e9e60..6545ffd 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: ' - - + +