2023.11.21.0

YouTube Add absolute paths support PlaylistArrayForm: fix RTB issue Single media: the file name is not changed manually SCrawler Automation: add manual tasks DownloaderUrlsArrForm: fix RTB issue SiteSettingsBase: add use of Netscape cookies if enabled for a class; disable saving Netscape cookies on init Add feeds update when users' location and/or basic info changes API.TikTok: add ID, username and friendly name extraction from data; update request URL; update 'GetUserUrl' function; add new option 'Use video date as file date' API.YouTube: set 'UseNetscapeCookies'
2026-03-14 15:52:18 +00:00 · 2023-11-21 08:38:37 +03:00
parent 45adf735a7
commit 0ec617c1dc
26 changed files with 359 additions and 117 deletions
--- a/SCrawler.YouTube/.editorconfig
+++ b/SCrawler.YouTube/.editorconfig
@@ -1,3 +1,3 @@
 [*.vb]
 # Modifier preferences
-file_header_template = Copyright (C) 2023  Andy https://github.com/AAndyProgram\nThis program is free software: you can redistribute it and/or modify\nit under the terms of the GNU General Public License as published by\nthe Free Software Foundation, either version 3 of the License, or\n(at your option) any later version.\n\nThis program is distributed in the hope that it will be useful,\nbut WITHOUT ANY WARRANTY; without even the implied warranty of\nMERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\nGNU General Public License for more details.\n\nYou should have received a copy of the GNU General Public License\nalong with this program.  If not, see <https://www.gnu.org/licenses/>
+file_header_template = Copyright (C) Andy https://github.com/AAndyProgram\nThis program is free software: you can redistribute it and/or modify\nit under the terms of the GNU General Public License as published by\nthe Free Software Foundation, either version 3 of the License, or\n(at your option) any later version.\n\nThis program is distributed in the hope that it will be useful,\nbut WITHOUT ANY WARRANTY; without even the implied warranty of\nMERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\nGNU General Public License for more details.\n\nYou should have received a copy of the GNU General Public License\nalong with this program.  If not, see <https://www.gnu.org/licenses/>
--- a/SCrawler.YouTube/Controls/MusicPlaylistsForm.Designer.vb
+++ b/SCrawler.YouTube/Controls/MusicPlaylistsForm.Designer.vb
@@ -427,10 +427,14 @@ Namespace API.YouTube.Controls
            Me.TXT_OUTPUT_PATH.Buttons.Add(ActionButton8)
            Me.TXT_OUTPUT_PATH.Buttons.Add(ActionButton9)
            Me.TXT_OUTPUT_PATH.Buttons.Add(ActionButton10)
-            Me.TXT_OUTPUT_PATH.CaptionMode = PersonalUtilities.Forms.Controls.Base.ICaptionControl.Modes.Label
+            Me.TXT_OUTPUT_PATH.CaptionMode = PersonalUtilities.Forms.Controls.Base.ICaptionControl.Modes.CheckBox
            Me.TXT_OUTPUT_PATH.CaptionText = "Output path"
+            Me.TXT_OUTPUT_PATH.CaptionToolTipEnabled = True
+            Me.TXT_OUTPUT_PATH.CaptionToolTipText = "If this checkbox is selected, this path is absolute and artist folder will not be" &
+    " created in it"
            Me.TXT_OUTPUT_PATH.CaptionVisible = True
            Me.TXT_OUTPUT_PATH.CaptionWidth = 112.0R
+            Me.TXT_OUTPUT_PATH.ChangeControlsEnableOnCheckedChange = False
            ListColumn1.Name = "COL_NAME"
            ListColumn1.Text = "Name"
            ListColumn1.Width = -1
--- a/SCrawler.YouTube/Controls/MusicPlaylistsForm.vb
+++ b/SCrawler.YouTube/Controls/MusicPlaylistsForm.vb
@@ -80,6 +80,14 @@ Namespace API.YouTube.Controls
                End If
                LIST_PLAYLISTS.SelectedIndex = 0

+                If .ObjectType = Base.YouTubeMediaType.Channel Then
+                    With TXT_OUTPUT_PATH
+                        .CaptionMode = ICaptionControl.Modes.Label
+                        .CaptionToolTipText = String.Empty
+                        .CaptionToolTipEnabled = False
+                    End With
+                End If
+
                TXT_OUTPUT_PATH.Text = MyYouTubeSettings.OutputPath.Value

                If Not .UserTitle.IsEmptyString Then
@@ -266,6 +274,7 @@ Namespace API.YouTube.Controls
                    If Not TXT_SUBS.Checked Then .PostProcessing_OutputSubtitlesFormats.Clear()
                    .OutputAudioCodec = CMB_FORMATS.Text
                    If Not TXT_FORMATS_ADDIT.Checked Then .PostProcessing_OutputAudioFormats.Clear()
+                    .AbsolutePath = TXT_OUTPUT_PATH.Checked
                    .File = TXT_OUTPUT_PATH.Text.CSFileP
                    If MyYouTubeSettings.OutputPathAutoChange Then MyYouTubeSettings.OutputPath.Value = .File
                    If MyDownloaderSettings.OutputPathAutoAddPaths Then MyYouTubeSettings.DownloadLocations.Add(.File, False)
--- a/SCrawler.YouTube/Controls/PlaylistArrayForm.Designer.vb
+++ b/SCrawler.YouTube/Controls/PlaylistArrayForm.Designer.vb
@@ -26,7 +26,7 @@ Namespace API.YouTube.Controls
            Dim TP_MAIN As System.Windows.Forms.TableLayoutPanel
            Dim FRM_PLS As System.Windows.Forms.GroupBox
            Me.CH_PLS_ONE = New System.Windows.Forms.CheckBox()
-            Me.TXT_URLS = New System.Windows.Forms.RichTextBox()
+            Me.TXT_URLS = New System.Windows.Forms.TextBox()
            CONTAINER_MAIN = New System.Windows.Forms.ToolStripContainer()
            TP_MAIN = New System.Windows.Forms.TableLayoutPanel()
            FRM_PLS = New System.Windows.Forms.GroupBox()
@@ -94,13 +94,14 @@ Namespace API.YouTube.Controls
            '
            'TXT_URLS
            '
-            Me.TXT_URLS.DetectUrls = False
+            Me.TXT_URLS.AcceptsReturn = True
            Me.TXT_URLS.Dock = System.Windows.Forms.DockStyle.Fill
            Me.TXT_URLS.Location = New System.Drawing.Point(3, 16)
+            Me.TXT_URLS.MaxLength = 2147483647
+            Me.TXT_URLS.Multiline = True
            Me.TXT_URLS.Name = "TXT_URLS"
            Me.TXT_URLS.Size = New System.Drawing.Size(372, 261)
            Me.TXT_URLS.TabIndex = 0
-            Me.TXT_URLS.Text = ""
            '
            'PlaylistArrayForm
            '
@@ -119,10 +120,11 @@ Namespace API.YouTube.Controls
            TP_MAIN.ResumeLayout(False)
            TP_MAIN.PerformLayout()
            FRM_PLS.ResumeLayout(False)
+            FRM_PLS.PerformLayout()
            Me.ResumeLayout(False)

        End Sub
        Private WithEvents CH_PLS_ONE As CheckBox
-        Private WithEvents TXT_URLS As RichTextBox
+        Private WithEvents TXT_URLS As TextBox
    End Class
 End Namespace
--- a/SCrawler.YouTube/Controls/VideoOptionsForm.Designer.vb
+++ b/SCrawler.YouTube/Controls/VideoOptionsForm.Designer.vb
@@ -275,6 +275,7 @@ Namespace API.YouTube.Controls
            ActionButton1.Name = "ArrowDown"
            ActionButton1.Tag = PersonalUtilities.Forms.Controls.Base.ActionButton.DefaultButtons.ArrowDown
            Me.TXT_FILE.Buttons.Add(ActionButton1)
+            Me.TXT_FILE.ChangeControlsEnableOnCheckedChange = False
            ListColumn1.Name = "COL_NAME"
            ListColumn1.Text = "Name"
            ListColumn1.Width = -1
--- a/SCrawler.YouTube/Controls/VideoOptionsForm.vb
+++ b/SCrawler.YouTube/Controls/VideoOptionsForm.vb
@@ -76,6 +76,12 @@ Namespace API.YouTube.Controls
                            If Not def.ValueBetween(-1, 10000) Then def = 1080
                        End If
                        NUM_RES.Value = def
+                        With TXT_FILE
+                            .CaptionMode = ICaptionControl.Modes.CheckBox
+                            .CaptionWidth = 18
+                            .CaptionToolTipText = "If this checkbox is selected, this path is absolute and artist folder will not be created in it"
+                            .CaptionToolTipEnabled = True
+                        End With
                    Else
                        TP_OPTIONS.Controls.Remove(NUM_RES)
                        TP_OPTIONS.ColumnStyles(3).Width = 0
@@ -297,8 +303,8 @@ Namespace API.YouTube.Controls
                            .SelectedVideoIndex = -1
                            .SelectedAudioIndex = cntIndex
                        End If
-                        .File = f
                        .FileSetManually = True
+                        .File = f
                        .UpdateInfoFields()
                        '#If DEBUG Then
                        'Debug.WriteLine(.Command(False))
@@ -309,6 +315,7 @@ Namespace API.YouTube.Controls
                        Else
                            .SetMaxResolution(NUM_RES.Value)
                        End If
+                        .AbsolutePath = TXT_FILE.Checked
                        .File = f
                    End If
                End With
--- a/SCrawler.YouTube/Objects/YouTubeMediaContainerBase.vb
+++ b/SCrawler.YouTube/Objects/YouTubeMediaContainerBase.vb
@@ -543,6 +543,16 @@ Namespace API.YouTube.Objects
                Return _FileIsPlaylistObject
            End Get
        End Property
+        Private _AbsolutePath As Boolean = False
+        Public Property AbsolutePath As Boolean
+            Get
+                Return _AbsolutePath
+            End Get
+            Set(ByVal ap As Boolean)
+                _AbsolutePath = ap
+                If Elements.Count > 0 Then Elements.ForEach(Sub(e As YouTubeMediaContainerBase) e.AbsolutePath = ap)
+            End Set
+        End Property
        Public Overridable Property File As SFile Implements IYouTubeMediaContainer.File
            Get
                Return _File
@@ -550,11 +560,16 @@ Namespace API.YouTube.Objects
            Set(ByVal f As SFile)
                Select Case ObjectType
                    Case YouTubeMediaType.Channel : _File = f.Path
-                    Case YouTubeMediaType.PlayList : _File.Path = $"{f.PathWithSeparator}{GetPlayListTitle()}"
+                    Case YouTubeMediaType.PlayList
+                        If AbsolutePath Then
+                            _File.Path = f.Path
+                        Else
+                            _File.Path = $"{f.PathWithSeparator}{GetPlayListTitle()}"
+                        End If
                    Case YouTubeMediaType.Single
                        If PlaylistCount > 0 And Not FileIgnorePlaylist Then
                            _File.Path = f.Path
-                            Dim pls$ = GetPlayListTitle()
+                            Dim pls$ = If(AbsolutePath, String.Empty, GetPlayListTitle())
                            If Not _File.Path.Contains(pls) Then _File.Path = $"{_File.PathWithSeparator(Not pls.IsEmptyString)}{pls}"
                        ElseIf Not f.Name.IsEmptyString Then
                            _File = f