From afd5f06a17df0a73dbb902c5f73d17396d2cda9f Mon Sep 17 00:00:00 2001 From: hama3254 <52826614+hama3254@users.noreply.github.com> Date: Thu, 2 May 2024 17:43:12 +0200 Subject: [PATCH] minor fixes fix hybrid mode 'keep cache' (keyfile false positive) #946 removed Browser dependency (browser no longer open in the background) --- .vs/Crunchyroll Downloader/v17/.suo | Bin 239616 -> 246784 bytes Crunchyroll Downloader/Anime_Add.Designer.vb | 2 +- Crunchyroll Downloader/Anime_Add.vb | 6 +++++- Crunchyroll Downloader/Browser.vb | 8 ++++---- Crunchyroll Downloader/CRD_List_Item.vb | 12 ++++++------ Crunchyroll Downloader/Main.vb | 16 ++++++++-------- 6 files changed, 24 insertions(+), 20 deletions(-) diff --git a/.vs/Crunchyroll Downloader/v17/.suo b/.vs/Crunchyroll Downloader/v17/.suo index 3d57eac046bc8920917d6fbded09ab8212cbd904..1292a2f2352f66e21cb6e3bdd18bbbbd3d7f4d4b 100644 GIT binary patch delta 8478 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 delta 7924 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 Q%i@f<2CbIl`B1X|1AP7b$p8QV diff --git a/Crunchyroll Downloader/Anime_Add.Designer.vb b/Crunchyroll Downloader/Anime_Add.Designer.vb index 6368901..c5491b9 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.groupBox1) Me.Controls.Add(Me.groupBox2) + Me.Controls.Add(Me.groupBox1) 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 104cffd..9962dba 100644 --- a/Crunchyroll Downloader/Anime_Add.vb +++ b/Crunchyroll Downloader/Anime_Add.vb @@ -164,6 +164,8 @@ Public Class Anime_Add End Try 'Timer3.Enabled = True + btn_dl.Cursor = Cursors.Default + btn_dl.BackgroundImage = My.Resources.main_button_download_default End Sub @@ -458,17 +460,19 @@ Public Class Anime_Add Dim JsonUrl As String = "https://www.crunchyroll.com/content/v2/cms/seasons/" + guid + "/episodes?preferred_audio_language=" + Main.DubSprache.CR_Value + "&locale=" + Main.locale - Dim Loc_CR_Cookies = " -H " + Chr(34) + Main.CR_Cookies.Replace(Chr(34), "").Replace(" -H ", "") + Chr(34) + Dim Loc_CR_Cookies = "" 'No more cookies " -H " + Chr(34) + Main.CR_Cookies.Replace(Chr(34), "").Replace(" -H ", "") + Chr(34) Dim EpisodeJson As String = Nothing 'CurlAuth(JsonUrl, Loc_CR_Cookies, Main.CR_MassSeasons.Item(ComboBox1.SelectedIndex).Auth) ' + Debug.WriteLine("TEST") Try EpisodeJson = CurlAuthNew(JsonUrl, Loc_CR_Cookies, Main.CR_MassSeasons.Item(CB_Season.SelectedIndex).Auth) ' Catch ex As Exception + Debug.WriteLine("TEST Failed" + ex.ToString) If CBool(InStr(ex.ToString, "Error - Getting")) Then MsgBox("Error invalid CR respone") Exit Sub diff --git a/Crunchyroll Downloader/Browser.vb b/Crunchyroll Downloader/Browser.vb index bb740cc..668b984 100644 --- a/Crunchyroll Downloader/Browser.vb +++ b/Crunchyroll Downloader/Browser.vb @@ -69,10 +69,10 @@ Public Class Browser Main.BowserWasOpen = True - If Application.OpenForms().OfType(Of Anime_Add).Any = True Then - Anime_Add.btn_dl.Cursor = Cursors.Default - Anime_Add.btn_dl.BackgroundImage = My.Resources.main_button_download_default - End If + 'If Application.OpenForms().OfType(Of Anime_Add).Any = True Then + ' Anime_Add.btn_dl.Cursor = Cursors.Default + ' Anime_Add.btn_dl.BackgroundImage = My.Resources.main_button_download_default + 'End If If Main.Startseite IsNot My.Settings.Startseite Then Main.LoadBrowser(Main.Startseite, 1) diff --git a/Crunchyroll Downloader/CRD_List_Item.vb b/Crunchyroll Downloader/CRD_List_Item.vb index 845469c..a70b2b6 100644 --- a/Crunchyroll Downloader/CRD_List_Item.vb +++ b/Crunchyroll Downloader/CRD_List_Item.vb @@ -991,12 +991,12 @@ Public Class CRD_List_Item KeyLine = KeyFileUri(0) + "URI=" + Chr(34) + KeyFileCache + Chr(34) End If - If KeepCacheFiles = True Then - 'Dim Bytes() As Byte = File.ReadAllBytes(Application.StartupPath + "\" + KeyFile) - 'File.WriteAllBytes(Folder + "\" + KeyFile, Bytes) - Dim Evaluator2 = New Thread(Sub() Me.TS_DownloadAsync(KeyFileUri3, Folder + "\" + KeyFile)) - Evaluator2.Start() - End If + 'If KeepCacheFiles = True Then + ' 'Dim Bytes() As Byte = File.ReadAllBytes(Application.StartupPath + "\" + KeyFile) + ' 'File.WriteAllBytes(Folder + "\" + KeyFile, Bytes) + ' Dim Evaluator2 = New Thread(Sub() Me.TS_DownloadAsync(KeyFileUri3, Folder + "\" + KeyFile)) + ' Evaluator2.Start() + 'End If End If m3u8FileContent = m3u8FileContent + KeyLine + vbLf diff --git a/Crunchyroll Downloader/Main.vb b/Crunchyroll Downloader/Main.vb index a55f159..b1e0035 100644 --- a/Crunchyroll Downloader/Main.vb +++ b/Crunchyroll Downloader/Main.vb @@ -2122,13 +2122,13 @@ Public Class Main Private Sub Btn_add_Click(sender As Object, e As EventArgs) Handles Btn_add.Click - If File.Exists("cookies.txt") = False Then - If Application.OpenForms().OfType(Of Browser).Any = True Then - Else - UserBowser = False - Browser.Show() - End If - End If + 'If File.Exists("cookies.txt") = False Then + ' If Application.OpenForms().OfType(Of Browser).Any = True Then + ' Else + ' UserBowser = False + ' Browser.Show() + ' End If + 'End If If Anime_Add.WindowState = System.Windows.Forms.FormWindowState.Minimized Then Anime_Add.WindowState = System.Windows.Forms.FormWindowState.Normal @@ -2897,7 +2897,7 @@ Public Class Main LoadingUrl = Url LoadedUrls.Clear() Dim NoBrowser As Boolean = False - + WebbrowserURL = Url 'CR_v1Token = "Get" 'Browser.WebView2.Source = New Uri(Url)