diff --git a/.vs/Crunchyroll Downloader/v17/.suo b/.vs/Crunchyroll Downloader/v17/.suo index aa3fbe4..f660d0a 100644 Binary files a/.vs/Crunchyroll Downloader/v17/.suo and b/.vs/Crunchyroll Downloader/v17/.suo differ diff --git a/Crunchyroll Downloader/Anime_Add.Designer.vb b/Crunchyroll Downloader/Anime_Add.Designer.vb index c5491b9..6368901 100644 --- a/Crunchyroll Downloader/Anime_Add.Designer.vb +++ b/Crunchyroll Downloader/Anime_Add.Designer.vb @@ -364,8 +364,8 @@ Partial Class Anime_Add Me.Controls.Add(Me.btn_dl) Me.Controls.Add(Me.Btn_min) Me.Controls.Add(Me.Btn_Close) - Me.Controls.Add(Me.groupBox2) Me.Controls.Add(Me.groupBox1) + Me.Controls.Add(Me.groupBox2) Me.Font = New System.Drawing.Font("Arial", 24.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Name = "Anime_Add" Me.Padding = New System.Windows.Forms.Padding(10, 60, 20, 20) diff --git a/Crunchyroll Downloader/Anime_Add.vb b/Crunchyroll Downloader/Anime_Add.vb index e656277..1210121 100644 --- a/Crunchyroll Downloader/Anime_Add.vb +++ b/Crunchyroll Downloader/Anime_Add.vb @@ -177,6 +177,24 @@ Public Class Anime_Add If CBool(InStr(textBox1.Text, ":\")) Then Main.ProcessLocal(textBox1.Text) + ElseIf CBool(InStr(textBox1.Text, ".m3u8")) Then + + ' Main.ProcessLocal(textBox1.Text) + Dim NameKomplett As String = TextBox2.Text + If NameKomplett = Nothing Or NameKomplett = "Use Custom Name" Then + NameKomplett = GeräteID2().Replace("CRD-Temp-File", "misc_download-#") + End If + Dim Namep1 As String = "Other" + Dim Namep2 As String = NameKomplett + Dim Reso As String = "NaN" + Dim HardSub As String = "maybe?" + Dim ThumbnialURL As String = "no" + Dim URL_DL As String = textBox1.Text + Dim Pfad_DL As String = Path.Combine(Main.Pfad, Namep2) + Dim Service As String = "other" + + + Main.ItemConstructor(NameKomplett, NameP1, NameP2, Reso, HardSub, ThumbnialURL, URL_DL, Pfad_DL, 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 9ecc25d..0ccbe6e 100644 --- a/Crunchyroll Downloader/CRD_List_Item.vb +++ b/Crunchyroll Downloader/CRD_List_Item.vb @@ -85,6 +85,8 @@ Public Class CRD_List_Item If Service = "FM" Then MetroStyleManager1.Style = MetroColorStyle.DarkPurple + ElseIf Service = "other" Then + MetroStyleManager1.Style = MetroColorStyle.Black Else MetroStyleManager1.Style = MetroColorStyle.Orange End If diff --git a/Crunchyroll Downloader/Main.vb b/Crunchyroll Downloader/Main.vb index 033a95a..3fc0e16 100644 --- a/Crunchyroll Downloader/Main.vb +++ b/Crunchyroll Downloader/Main.vb @@ -942,38 +942,18 @@ Public Class Main Next + 'MsgBox(season_number + vbNewLine + id + vbNewLine + title + vbNewLine + audio_localeMain) 'add dubs to local seasons For i As Integer = 0 To Dubs.Count - 1 localSeasons.Add(New CR_Seasons(Dubs.Item(i).guid, Dubs.Item(i).audio_locale, Dubs.Item(i).Auth, season_number + " - " + title)) Next - 'localSeasons.Add(New CR_Seasons(guid, audio_locale, Auth, season_number)) - 'MsgBox(audio_locale) - - 'Debug.WriteLine("Start-Seasons") - - 'Debug.WriteLine(localSeasons.Item(0).guid) - 'Debug.WriteLine("END-Seasons") - + 'if version are null then add the main version If localSeasons.Count = 0 Then - Continue For + localSeasons.Add(New CR_Seasons(id, audio_localeMain, Auth, season_number + " - " + title)) End If - 'If localSeasons.Count = 0 Then - ' Anime_Add.CB_Season.Items.Add(ConvertSubValue(audio_localeMain, ConvertSubsEnum.DisplayText) + " - Season " + season_number) - ' CR_MassSeasons.Add(New CR_Seasons(id, audio_localeMain, Auth)) - 'End If - - 'If localSeasons.Count > 0 Then - ' For i As Integer = 0 To CR_MassSeasons.Count - 1 - ' If CR_MassSeasons.Item(i).guid = localSeasons.Item(0).guid Then - ' localSeasons.Clear() - ' Exit For - ' End If - ' Next - 'End If - - + 'add seasons to DubList If localSeasons.Count > 0 Then For i As Integer = 0 To localSeasons.Count - 1 'Anime_Add.CB_Season.Items.Add(ConvertSubValue(localSeasons.Item(i).audio_locale, ConvertSubsEnum.DisplayText) + " - Season " + season_number) @@ -987,6 +967,8 @@ Public Class Main Next Dim CleanDubs As List(Of String) = DubList.Distinct().ToList + + 'MsgBox(CleanDubs.Count.ToString) Anime_Add.CB_Dub.Enabled = True Dim Index As Integer = 0 For i As Integer = 0 To CleanDubs.Count - 1