added temp folder option

added temp folder option from #449
2024-06-02 22:28:44 +02:00 · 2022-03-19 12:01:12 +01:00 · 2022-03-19 12:01:12 +01:00 · b04c1b224f
commit b04c1b224f
parent 730540870c
12 changed files with 135 additions and 45 deletions
--- a/Downloader/v17/.suo
+++ b/Downloader/v17/.suo
--- a/Downloader/CRD_List_Item.vb
+++ b/Downloader/CRD_List_Item.vb
@ -28,6 +28,7 @@ Public Class CRD_List_Item
    Dim Debug2 As Boolean = False
    Dim MergeSubstoMP4 As Boolean = False

+    Dim TempFolder As String = Nothing
    Dim DownloadPfad As String = Nothing
    Dim ToDispose As Boolean = False
    Dim Failed As Boolean = False
@ -259,7 +260,7 @@ Public Class CRD_List_Item
            '    Catch ex As Exception
            '    End Try
            'End If
-            StartDownload(HistoryDL_URL, HistoryDL_Pfad, HistoryFilename, HybridMode)
+            StartDownload(HistoryDL_URL, HistoryDL_Pfad, HistoryFilename, HybridMode, TempFolder)
            StatusRunning = True
            Label_website.Text = Label_website_Text
            Exit Sub
@ -318,7 +319,7 @@ Public Class CRD_List_Item
                            Catch ex As Exception
                            End Try
                        End If
-                        StartDownload(HistoryDL_URL, HistoryDL_Pfad, HistoryFilename, HybridMode)
+                        StartDownload(HistoryDL_URL, HistoryDL_Pfad, HistoryFilename, HybridMode, TempFolder)
                        StatusRunning = True
                        Label_website.Text = Label_website_Text
                    Else
@ -359,7 +360,7 @@ Public Class CRD_List_Item
                        End Try

                        If proc.HasExited Then
-                            StartDownload(HistoryDL_URL, HistoryDL_Pfad, HistoryFilename, HybridMode)
+                            StartDownload(HistoryDL_URL, HistoryDL_Pfad, HistoryFilename, HybridMode, TempFolder)
                            StatusRunning = True
                            Label_website.Text = Label_website_Text
                            bt_pause.BackgroundImage = My.Resources.main_pause
@ -424,11 +425,11 @@ Public Class CRD_List_Item

 #Region "Download + Update UI"

-    Public Sub StartDownload(ByVal DL_URL As String, ByVal DL_Pfad As String, ByVal Filename As String, ByVal DownloadHybridMode As Boolean)
+    Public Sub StartDownload(ByVal DL_URL As String, ByVal DL_Pfad As String, ByVal Filename As String, ByVal DownloadHybridMode As Boolean, ByVal TempFolder As String)
        'MsgBox(DL_URL)

        Me.StyleManager = MetroStyleManager1
-
+        Me.TempFolder = TempFolder
        DownloadPfad = DL_Pfad
        HistoryDL_URL = DL_URL
        HistoryDL_Pfad = DL_Pfad
@ -996,7 +997,7 @@ Public Class CRD_List_Item
        Dim Folder As String = GeräteID()
        Dim DL_URL_old As String = DL_URL
        Dim PauseTime As Integer = 0
-        Dim Pfad2 As String = Path.GetDirectoryName(DL_Pfad.Replace(Chr(34), "")) + "\" + Folder + "\"
+        Dim Pfad2 As String = TempFolder + "\" + Folder + "\" 'Path.GetDirectoryName(DL_Pfad.Replace(Chr(34), "")) + "\" + Folder + "\"
        If CBool(InStr(DL_Pfad, "CRD-Temp-File-")) Then
            Pfad2 = DL_Pfad.Replace(Chr(34), "") + "\"
            Dim DL_PfadSplit() As String = DL_Pfad.Split(New String() {"CRD-Temp-File-"}, System.StringSplitOptions.RemoveEmptyEntries)
--- a/Downloader/Main.vb
+++ b/Downloader/Main.vb
@ -86,6 +86,7 @@ Public Class Main
    Public c As Boolean = True
    Public LoginOnly As String = "False"
    Public Pfad As String = My.Computer.FileSystem.CurrentDirectory
+    Public TempFolder As String = Pfad
    Public ProfileFolder As String = Path.Combine(My.Computer.FileSystem.SpecialDirectories.MyDocuments, "CRD-Profile")
    Public ffmpeg_command As String = " -c copy -bsf:a aac_adtstoasc" '" -c:v hevc_nvenc -preset fast -b:v 6M -bsf:a aac_adtstoasc " 
    Public Reso As Integer
@ -433,6 +434,14 @@ Public Class Main
            Pfad = rkg.GetValue("Ordner").ToString
        Catch ex As Exception
        End Try
+
+        Try
+            Dim rkg As RegistryKey = Registry.CurrentUser.OpenSubKey("Software\CRDownloader")
+            TempFolder = rkg.GetValue("TempFolder").ToString
+        Catch ex As Exception
+            TempFolder = Pfad
+        End Try
+
        Try
            Dim rkg As RegistryKey = Registry.CurrentUser.OpenSubKey("Software\CRDownloader")
            Episode_Prefix = rkg.GetValue("Prefix_E").ToString
@ -725,7 +734,7 @@ Public Class Main


        'MsgBox(URL_DL + vbNewLine + Pfad_DL + vbNewLine + NameKomplett + vbNewLine + TempHybridMode.ToString)
-        Item.StartDownload(URL_DL, Pfad_DL, NameKomplett, TempHybridMode)
+        Item.StartDownload(URL_DL, Pfad_DL, NameKomplett, TempHybridMode, TempFolder)
    End Sub

 #Region "Manga DL"
--- a/Project/AssemblyInfo.vb
+++ b/Project/AssemblyInfo.vb
@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")>

-<Assembly: AssemblyVersion("3.8.3.0")>
-<Assembly: AssemblyFileVersion("3.8.3.0")>
+<Assembly: AssemblyVersion("3.8.4.0")>
+<Assembly: AssemblyFileVersion("3.8.4.0")>
 <Assembly: NeutralResourcesLanguage("en")>
--- a/Downloader/bin/x64/Debug/Crunchyroll
+++ b/Downloader/bin/x64/Debug/Crunchyroll
--- a/Downloader/bin/x64/Debug/Crunchyroll
+++ b/Downloader/bin/x64/Debug/Crunchyroll
--- a/Downloader/einstellungen.Designer.vb
+++ b/Downloader/einstellungen.Designer.vb
@ -41,6 +41,8 @@ Partial Class Einstellungen
        Me.GB_SubLanguage = New System.Windows.Forms.GroupBox()
        Me.ComboBox1 = New MetroFramework.Controls.MetroComboBox()
        Me.TabPage2 = New MetroFramework.Controls.MetroTabPage()
+        Me.GroupBox18 = New System.Windows.Forms.GroupBox()
+        Me.ListViewAdd_True = New MetroFramework.Controls.MetroCheckBox()
        Me.GroupBox16 = New System.Windows.Forms.GroupBox()
        Me.DD_DLMode = New MetroFramework.Controls.MetroComboBox()
        Me.GroupBox4 = New System.Windows.Forms.GroupBox()
@ -143,13 +145,14 @@ Partial Class Einstellungen
        Me.Label5 = New MetroFramework.Controls.MetroLabel()
        Me.BackgroundWorker1 = New System.ComponentModel.BackgroundWorker()
        Me.Btn_Save = New System.Windows.Forms.Button()
-        Me.GroupBox18 = New System.Windows.Forms.GroupBox()
-        Me.ListViewAdd_True = New MetroFramework.Controls.MetroCheckBox()
+        Me.MetroLabel3 = New MetroFramework.Controls.MetroLabel()
+        Me.TempTB = New MetroFramework.Controls.MetroTextBox()
        CType(Me.pictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.GroupBox14.SuspendLayout()
        Me.SoftSubs.SuspendLayout()
        Me.GB_SubLanguage.SuspendLayout()
        Me.TabPage2.SuspendLayout()
+        Me.GroupBox18.SuspendLayout()
        Me.GroupBox16.SuspendLayout()
        Me.GroupBox4.SuspendLayout()
        Me.GroupBox2.SuspendLayout()
@ -180,7 +183,6 @@ Partial Class Einstellungen
        Me.GroupBox8.SuspendLayout()
        Me.TabPage7.SuspendLayout()
        CType(Me.PictureBox7, System.ComponentModel.ISupportInitialize).BeginInit()
-        Me.GroupBox18.SuspendLayout()
        Me.SuspendLayout()
        '
        'ToolTip1
@ -408,15 +410,41 @@ Partial Class Einstellungen
        Me.TabPage2.VerticalScrollbarSize = 10
        Me.TabPage2.Visible = False
        '
+        'GroupBox18
+        '
+        Me.GroupBox18.BackColor = System.Drawing.Color.Transparent
+        Me.GroupBox18.Controls.Add(Me.ListViewAdd_True)
+        Me.GroupBox18.Font = New System.Drawing.Font("Arial", 9.75!)
+        Me.GroupBox18.ForeColor = System.Drawing.Color.Black
+        Me.GroupBox18.Location = New System.Drawing.Point(5, 150)
+        Me.GroupBox18.Name = "GroupBox18"
+        Me.GroupBox18.Size = New System.Drawing.Size(490, 59)
+        Me.GroupBox18.TabIndex = 32
+        Me.GroupBox18.TabStop = False
+        Me.GroupBox18.Text = "Multi-Download"
+        '
+        'ListViewAdd_True
+        '
+        Me.ListViewAdd_True.AutoSize = True
+        Me.ListViewAdd_True.FontSize = MetroFramework.MetroCheckBoxSize.Medium
+        Me.ListViewAdd_True.Location = New System.Drawing.Point(119, 21)
+        Me.ListViewAdd_True.Name = "ListViewAdd_True"
+        Me.ListViewAdd_True.Size = New System.Drawing.Size(255, 19)
+        Me.ListViewAdd_True.TabIndex = 5
+        Me.ListViewAdd_True.Text = "redirect multi-download to the queue"
+        Me.ListViewAdd_True.UseSelectable = True
+        '
        'GroupBox16
        '
        Me.GroupBox16.BackColor = System.Drawing.Color.Transparent
+        Me.GroupBox16.Controls.Add(Me.MetroLabel3)
+        Me.GroupBox16.Controls.Add(Me.TempTB)
        Me.GroupBox16.Controls.Add(Me.DD_DLMode)
        Me.GroupBox16.Font = New System.Drawing.Font("Arial", 9.75!)
        Me.GroupBox16.ForeColor = System.Drawing.Color.Black
        Me.GroupBox16.Location = New System.Drawing.Point(5, 11)
        Me.GroupBox16.Name = "GroupBox16"
-        Me.GroupBox16.Size = New System.Drawing.Size(490, 59)
+        Me.GroupBox16.Size = New System.Drawing.Size(490, 133)
        Me.GroupBox16.TabIndex = 31
        Me.GroupBox16.TabStop = False
        Me.GroupBox16.Text = "Download Mode"
@ -442,7 +470,7 @@ Partial Class Einstellungen
        Me.GroupBox4.Controls.Add(Me.CB_Format)
        Me.GroupBox4.Font = New System.Drawing.Font("Arial", 9.75!)
        Me.GroupBox4.ForeColor = System.Drawing.Color.Black
-        Me.GroupBox4.Location = New System.Drawing.Point(5, 200)
+        Me.GroupBox4.Location = New System.Drawing.Point(5, 270)
        Me.GroupBox4.Name = "GroupBox4"
        Me.GroupBox4.Size = New System.Drawing.Size(490, 78)
        Me.GroupBox4.TabIndex = 40
@ -480,7 +508,7 @@ Partial Class Einstellungen
        Me.GroupBox2.Controls.Add(Me.Panel1)
        Me.GroupBox2.Font = New System.Drawing.Font("Arial", 9.75!)
        Me.GroupBox2.ForeColor = System.Drawing.Color.Black
-        Me.GroupBox2.Location = New System.Drawing.Point(5, 280)
+        Me.GroupBox2.Location = New System.Drawing.Point(5, 350)
        Me.GroupBox2.Name = "GroupBox2"
        Me.GroupBox2.Size = New System.Drawing.Size(490, 63)
        Me.GroupBox2.TabIndex = 50
@ -686,7 +714,7 @@ Partial Class Einstellungen
        Me.GB_Resolution.Controls.Add(Me.A1080p)
        Me.GB_Resolution.Font = New System.Drawing.Font("Arial", 9.75!)
        Me.GB_Resolution.ForeColor = System.Drawing.Color.Black
-        Me.GB_Resolution.Location = New System.Drawing.Point(5, 135)
+        Me.GB_Resolution.Location = New System.Drawing.Point(5, 210)
        Me.GB_Resolution.Name = "GB_Resolution"
        Me.GB_Resolution.Size = New System.Drawing.Size(490, 59)
        Me.GB_Resolution.TabIndex = 30
@ -1014,7 +1042,7 @@ Partial Class Einstellungen
        Me.TabControl1.FontWeight = MetroFramework.MetroTabControlWeight.Regular
        Me.TabControl1.Location = New System.Drawing.Point(22, 60)
        Me.TabControl1.Name = "TabControl1"
-        Me.TabControl1.SelectedIndex = 4
+        Me.TabControl1.SelectedIndex = 1
        Me.TabControl1.Size = New System.Drawing.Size(509, 567)
        Me.TabControl1.TabIndex = 0
        Me.TabControl1.UseSelectable = True
@ -1028,9 +1056,9 @@ Partial Class Einstellungen
        Me.MetroTabPage2.HorizontalScrollbarBarColor = True
        Me.MetroTabPage2.HorizontalScrollbarHighlightOnWheel = False
        Me.MetroTabPage2.HorizontalScrollbarSize = 10
-        Me.MetroTabPage2.Location = New System.Drawing.Point(4, 44)
+        Me.MetroTabPage2.Location = New System.Drawing.Point(4, 35)
        Me.MetroTabPage2.Name = "MetroTabPage2"
-        Me.MetroTabPage2.Size = New System.Drawing.Size(501, 519)
+        Me.MetroTabPage2.Size = New System.Drawing.Size(501, 528)
        Me.MetroTabPage2.TabIndex = 8
        Me.MetroTabPage2.Text = "Naming"
        Me.MetroTabPage2.VerticalScrollbarBarColor = True
@ -1222,9 +1250,9 @@ Partial Class Einstellungen
        Me.MetroTabPage1.HorizontalScrollbarBarColor = True
        Me.MetroTabPage1.HorizontalScrollbarHighlightOnWheel = False
        Me.MetroTabPage1.HorizontalScrollbarSize = 10
-        Me.MetroTabPage1.Location = New System.Drawing.Point(4, 44)
+        Me.MetroTabPage1.Location = New System.Drawing.Point(4, 35)
        Me.MetroTabPage1.Name = "MetroTabPage1"
-        Me.MetroTabPage1.Size = New System.Drawing.Size(501, 519)
+        Me.MetroTabPage1.Size = New System.Drawing.Size(501, 528)
        Me.MetroTabPage1.TabIndex = 7
        Me.MetroTabPage1.Text = "Crunchyroll"
        Me.MetroTabPage1.VerticalScrollbarBarColor = True
@ -1478,9 +1506,9 @@ Partial Class Einstellungen
        Me.TabPage7.Controls.Add(Me.Label4)
        Me.TabPage7.Controls.Add(Me.Label6)
        Me.TabPage7.Controls.Add(Me.Label5)
-        Me.TabPage7.Location = New System.Drawing.Point(4, 44)
+        Me.TabPage7.Location = New System.Drawing.Point(4, 35)
        Me.TabPage7.Name = "TabPage7"
-        Me.TabPage7.Size = New System.Drawing.Size(501, 519)
+        Me.TabPage7.Size = New System.Drawing.Size(501, 528)
        Me.TabPage7.TabIndex = 5
        Me.TabPage7.Text = " About  "
        '
@ -1612,29 +1640,49 @@ Partial Class Einstellungen
        Me.Btn_Save.TabIndex = 9
        Me.Btn_Save.UseVisualStyleBackColor = False
        '
-        'GroupBox18
+        'MetroLabel3
        '
-        Me.GroupBox18.BackColor = System.Drawing.Color.Transparent
-        Me.GroupBox18.Controls.Add(Me.ListViewAdd_True)
-        Me.GroupBox18.Font = New System.Drawing.Font("Arial", 9.75!)
-        Me.GroupBox18.ForeColor = System.Drawing.Color.Black
-        Me.GroupBox18.Location = New System.Drawing.Point(5, 76)
-        Me.GroupBox18.Name = "GroupBox18"
-        Me.GroupBox18.Size = New System.Drawing.Size(490, 59)
-        Me.GroupBox18.TabIndex = 32
-        Me.GroupBox18.TabStop = False
-        Me.GroupBox18.Text = "Multi-Download"
+        Me.MetroLabel3.FontWeight = MetroFramework.MetroLabelWeight.Regular
+        Me.MetroLabel3.Location = New System.Drawing.Point(6, 64)
+        Me.MetroLabel3.Name = "MetroLabel3"
+        Me.MetroLabel3.Size = New System.Drawing.Size(469, 22)
+        Me.MetroLabel3.TabIndex = 19
+        Me.MetroLabel3.Text = "Temporary Folder"
+        Me.MetroLabel3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
        '
-        'ListViewAdd_True
+        'TempTB
        '
-        Me.ListViewAdd_True.AutoSize = True
-        Me.ListViewAdd_True.FontSize = MetroFramework.MetroCheckBoxSize.Medium
-        Me.ListViewAdd_True.Location = New System.Drawing.Point(119, 21)
-        Me.ListViewAdd_True.Name = "ListViewAdd_True"
-        Me.ListViewAdd_True.Size = New System.Drawing.Size(255, 19)
-        Me.ListViewAdd_True.TabIndex = 5
-        Me.ListViewAdd_True.Text = "redirect multi-download to the queue"
-        Me.ListViewAdd_True.UseSelectable = True
+        '
+        '
+        '
+        Me.TempTB.CustomButton.Image = Nothing
+        Me.TempTB.CustomButton.Location = New System.Drawing.Point(445, 1)
+        Me.TempTB.CustomButton.Name = ""
+        Me.TempTB.CustomButton.Size = New System.Drawing.Size(23, 23)
+        Me.TempTB.CustomButton.Style = MetroFramework.MetroColorStyle.Blue
+        Me.TempTB.CustomButton.TabIndex = 1
+        Me.TempTB.CustomButton.Theme = MetroFramework.MetroThemeStyle.Light
+        Me.TempTB.CustomButton.UseSelectable = True
+        Me.TempTB.CustomButton.Visible = False
+        Me.TempTB.FontSize = MetroFramework.MetroTextBoxSize.Medium
+        Me.TempTB.Lines = New String() {"https://www.crunchyroll.com/"}
+        Me.TempTB.Location = New System.Drawing.Point(6, 90)
+        Me.TempTB.MaxLength = 32767
+        Me.TempTB.Name = "TempTB"
+        Me.TempTB.PasswordChar = Global.Microsoft.VisualBasic.ChrW(0)
+        Me.TempTB.ReadOnly = True
+        Me.TempTB.ScrollBars = System.Windows.Forms.ScrollBars.None
+        Me.TempTB.SelectedText = ""
+        Me.TempTB.SelectionLength = 0
+        Me.TempTB.SelectionStart = 0
+        Me.TempTB.ShortcutsEnabled = True
+        Me.TempTB.Size = New System.Drawing.Size(469, 25)
+        Me.TempTB.TabIndex = 20
+        Me.TempTB.Text = "https://www.crunchyroll.com/"
+        Me.TempTB.TextAlign = System.Windows.Forms.HorizontalAlignment.Center
+        Me.TempTB.UseSelectable = True
+        Me.TempTB.WaterMarkColor = System.Drawing.Color.FromArgb(CType(CType(109, Byte), Integer), CType(CType(109, Byte), Integer), CType(CType(109, Byte), Integer))
+        Me.TempTB.WaterMarkFont = New System.Drawing.Font("Segoe UI", 12.0!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Pixel)
        '
        'Einstellungen
        '
@ -1660,6 +1708,8 @@ Partial Class Einstellungen
        Me.SoftSubs.PerformLayout()
        Me.GB_SubLanguage.ResumeLayout(False)
        Me.TabPage2.ResumeLayout(False)
+        Me.GroupBox18.ResumeLayout(False)
+        Me.GroupBox18.PerformLayout()
        Me.GroupBox16.ResumeLayout(False)
        Me.GroupBox4.ResumeLayout(False)
        Me.GroupBox4.PerformLayout()
@ -1699,8 +1749,6 @@ Partial Class Einstellungen
        Me.GroupBox8.PerformLayout()
        Me.TabPage7.ResumeLayout(False)
        CType(Me.PictureBox7, System.ComponentModel.ISupportInitialize).EndInit()
-        Me.GroupBox18.ResumeLayout(False)
-        Me.GroupBox18.PerformLayout()
        Me.ResumeLayout(False)
        Me.PerformLayout()

@ -1828,4 +1876,6 @@ Partial Class Einstellungen
    Friend WithEvents CB_SoftSubSettings As MetroFramework.Controls.MetroComboBox
    Friend WithEvents GroupBox18 As GroupBox
    Friend WithEvents ListViewAdd_True As MetroFramework.Controls.MetroCheckBox
+    Friend WithEvents MetroLabel3 As MetroFramework.Controls.MetroLabel
+    Friend WithEvents TempTB As MetroFramework.Controls.MetroTextBox
 End Class
--- a/Downloader/einstellungen.vb
+++ b/Downloader/einstellungen.vb
@ -32,6 +32,7 @@ Public Class Einstellungen


        ProfileTextBox.Text = Main.ProfileFolder
+        TempTB.Text = Main.TempFolder
        LeadingZeroDD.SelectedIndex = Main.LeadingZero

        Bitrate_Funi.SelectedIndex = Main.Funimation_Bitrate
@ -1250,6 +1251,35 @@ Public Class Einstellungen
        End If
    End Sub

+    Private Sub DD_DLMode_SelectedIndexChanged(sender As Object, e As EventArgs) Handles DD_DLMode.SelectedIndexChanged
+
+        If DD_DLMode.SelectedIndex > 0 Then
+            TempTB.Enabled = True
+        Else
+            TempTB.Enabled = False
+        End If
+
+    End Sub
+
+    Private Sub TempTB_Click(sender As Object, e As EventArgs) Handles TempTB.Click
+
+        Dim FolderBrowserDialog1 As New FolderBrowserDialog()
+        FolderBrowserDialog1.RootFolder = Environment.SpecialFolder.MyComputer
+        If FolderBrowserDialog1.ShowDialog() = DialogResult.OK Then
+
+            Main.TempFolder = FolderBrowserDialog1.SelectedPath
+            TempTB.Text = FolderBrowserDialog1.SelectedPath
+            Dim rk0 As RegistryKey = Registry.CurrentUser.CreateSubKey("Software\CRDownloader")
+            rk0.SetValue("TempFolder", Main.TempFolder, RegistryValueKind.String)
+
+
+        End If
+
+    End Sub
+
+
+
+



--- a/Downloader/obj/x64/Debug/Crunchyroll
+++ b/Downloader/obj/x64/Debug/Crunchyroll
--- a/Downloader/obj/x64/Debug/Crunchyroll
+++ b/Downloader/obj/x64/Debug/Crunchyroll
--- a/Downloader.vbproj.AssemblyReference.cache
+++ b/Downloader.vbproj.AssemblyReference.cache
--- a/Downloader.vbproj.GenerateResource.cache
+++ b/Downloader.vbproj.GenerateResource.cache