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 f660d0a..db4a800 100644 Binary files a/.vs/Crunchyroll Downloader/v17/.suo and b/.vs/Crunchyroll Downloader/v17/.suo differ 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: ' - - + +