2023.6.19.0

YT.Progress: make the playlists parsing progress more informative; change form display method
YT.YouTubeMediaContainerBase: fix sort algo
YT.Tray: add 'Add' button; add 'Ctrl+Click' on tray icon to add download
YT.Settings: add setting 'Download on click in tray: show form'
LPSG: some files didn't download (encoding)
Twitter: hide cache deletion errors
Mastogon: fixed bug in 'ReparseMissing' function
Reddit: downloaded gifs are static
XHamster: videos are not downloading or downloading incorrectly
Progress: fix bugs; minor improvements

Changelog.md

@@ -1,3 +1,63 @@
+# 2023.6.19.0
+
+*2023-06-19*
+
+- Added
+  - **OnlyFans**
+  - YouTube: make the playlists parsing progress more informative
+  - YouTube: add `Add` button to tray
+  - YouTube: add `Ctrl+Click` on tray icon to add download
+  - YouTube: add setting `Download on click in tray: show form`
+  - Minor improvements to progress bars
+  - Other improvements
+- Fixed
+  - YouTube: incorrect sorting algorithm
+  - LPSG: some files didn't download
+  - Reddit: downloaded gifs are static (Issue #141)
+  - xHamster: videos are not downloading or downloading incorrectly (Issue #144)
+  - Progress bar bugs
+  - Minor bugs
+
+# 2023.6.9.0
+
+*2023-06-09*
+
+- Fixed
+  - YouTube: opening paths to downloaded playlists and channels
+  - Twitter: make the algorithm faster
+  - Make progress more informative
+
+# 2023.6.8.0
+
+*2023-06-08*
+
+- Added
+  - YouTube: append artist name to music playlist output path
+  - YouTube: save thumbnail path for playlist and channel
+- Fixed
+  - YouTube: opening paths to downloaded playlists and channels
+  - Twitter: profile not fully downloaded
+  - Corrected form size for small monitors (Issue #136)
+
+# 2023.6.5.0
+
+*2023-06-05*
+
+- Added
+  - **Instagram**: add additional authorization headers
+  - Setting to prevent user icon and banner from downloading (Request #129)
+  - Add standalone downloader to tray context menu
+  - YouTube downloader: added `Replace modification date` property
+  - Minor improvements
+- Fixed
+  - Fascist **Twitter**: posts not downloading (new API)
+  - Main window: refill bug when the number of filtered profiles = 0
+  - Standalone downloader: new items are not added to the queue
+  - Standalone downloader: bug when not downloaded videos do not appear in the list when loading the program
+  - Standalone downloader: add videos array not working
+  - Saved posts: remove main progress perform when downloading saved posts
+  - Minor bugs
+
 # 2023.5.12.0
 
 *2023-05-12*

ProgramsComparison.md

@@ -117,7 +117,7 @@ https://github.com/RipMeApp/ripme
 | **Free options** | The program is completely free | The program is completely free, but site limits are not declared |
 | Operating Systems | Windows 10+ | Windows, MacOS, Linux |
 | Select want content type to download | Yes | Yes |
-| Suported sites | 15 internal and any site using plugins | 86+ sites (declared) |
+| Suported sites | 15+ internal and any site using plugins | 86+ sites (declared) |
 | Other sites support | **Yes** | No |
 | Still supported | **Yes** | **No (last release date May 4, 2021)** |
 

README.md

@@ -1,3 +1,5 @@
+# :rainbow_flag: Happy LGBT Pride Month :tada:
+
 # :rainbow_flag: Social networks crawler :rainbow_flag:
 
 [![GitHub release (latest by date)](https://img.shields.io/github/v/release/AAndyProgram/SCrawler)](https://github.com/AAndyProgram/SCrawler/releases/latest)
@@ -9,7 +11,7 @@
 :eu:
 :greece:
 
-A program to download photo and video from [any site](#supported-sites) (e.g. YouTube, YouTube Music, Reddit, Twitter, Mastodon, Instagram, TikTok, RedGifs, PornHub, XHamster, XVIDEOS, ThisVid, LPSG, Pinterest).
+A program to download photo and video from [any site](#supported-sites) (e.g. YouTube, YouTube Music, OnlyFans, Reddit, Twitter, Mastodon, Instagram, TikTok, RedGifs, PornHub, XHamster, XVIDEOS, ThisVid, LPSG, Pinterest).
 
 **If you like SCrawler, please like the program on [this site](https://alternativeto.net/software/scrawler/about/) and/or [this](https://www.softpedia.com/get/Internet/Download-Managers/Social-networks-crawler.shtml)**
 <!---Do you like this program? Consider adding to my coffee fund by making a donation to show your support. :blush:
@@ -29,6 +31,7 @@ A program to download photo and video from [any site](#supported-sites) (e.g. Yo
   - Reddit images, galleries of images, videos, saved posts;
   - Redgifs videos (https://www.redgifs.com/);
   - Twitter images and videos, saved (bookmarked) posts;
+  - OnlyFans images and videos, saved (bookmarked) posts;
   - Mastodon images and videos, saved (bookmarked) posts;
   - Instagram images and videos, tagged posts, stories, saved posts;
   - TikTok videos (*currently broken*; [limited](https://github.com/AAndyProgram/SCrawler/wiki/Settings#tiktok-limits));
@@ -63,6 +66,7 @@ A program to download photo and video from [any site](#supported-sites) (e.g. Yo
 - **YouTube Music**
 - **Reddit**
 - **Twitter**
+- **OnlyFans**
 - **Mastodon**
 - **Instagram**
 - TikTok (*currently broken*; [limited](https://github.com/AAndyProgram/SCrawler/wiki/Settings#tiktok-limits))
@@ -120,6 +124,7 @@ The program parses user posts and compares file names with existing ones to remo
   - **[SITES REQUIREMENTS](https://github.com/AAndyProgram/SCrawler/wiki/Settings#sites-requirements)**
   - [Reddit](https://github.com/AAndyProgram/SCrawler/wiki/Settings#reddit)
   - [Twitter](https://github.com/AAndyProgram/SCrawler/wiki/Settings#twitter)
+  - [OnlyFans](https://github.com/AAndyProgram/SCrawler/wiki/Settings#onlyfans)
   - [Mastodon](https://github.com/AAndyProgram/SCrawler/wiki/Settings#Mastodon)
   - [Instagram](https://github.com/AAndyProgram/SCrawler/wiki/Settings#instagram)
   - [TikTok](https://github.com/AAndyProgram/SCrawler/wiki/Settings#tiktok)

SCrawler.YouTube/Base/YouTubeSettings.vb

@@ -94,12 +94,12 @@ Namespace API.YouTube.Base
         End Property
 #End Region
 #Region "Defaults"
+        <Browsable(True), GridVisible, XMLVN({"Defaults"}), Category("Defaults"), DisplayName("Replace modification date"),
+            Description("Set the file date to the date the video was added (website) (if available). Default: false.")>
+        Public ReadOnly Property ReplaceModificationDate As XMLValue(Of Boolean)
         <Browsable(True), GridVisible, XMLVN({"Defaults"}), Category("Defaults"), DisplayName("Use cookies"),
             Description("By default, use cookies when downloading from YouTube.")>
         Public ReadOnly Property DefaultUseCookies As XMLValue(Of Boolean)
-        <Browsable(True), GridVisible(False), XMLVN({"Defaults"}, 100), Category("Defaults"), DisplayName("Items limit"),
-            Description("Number of items displayed in the list.")>
-        Public ReadOnly Property ItemsListLimit As XMLValue(Of Integer)
         <Browsable(True), GridVisible(False), XMLVN({"Defaults"}), Category("Defaults"),
             DisplayName("Auto remove"), Description("Automatically remove downloaded items from the list.")>
         Public ReadOnly Property RemoveDownloadedAutomatically As XMLValue(Of Boolean)
@@ -152,6 +152,9 @@ Namespace API.YouTube.Base
         <Browsable(True), GridVisible(False), XMLVN({"Defaults"}, False), Category("Defaults"), DisplayName("Confirm exit"),
             Description("Exit confirmation when closing the program.")>
         Public ReadOnly Property ExitConfirm As XMLValue(Of Boolean)
+        <Browsable(True), GridVisible(False), XMLVN({"Defaults"}), Category("Defaults"), DisplayName("Download on click in tray: show form"),
+            Description("Show main window when download by clicking (Ctrl+Click) the tray icon. Default: false")>
+        Public ReadOnly Property ShowFormDownTrayClick As XMLValue(Of Boolean)
 #End Region
 #Region "Defaults Video"
         <Browsable(True), GridVisible, XMLVN({"DefaultsVideo"}, "MKV"), Category("Defaults Video"), DisplayName("Default format"),

SCrawler.YouTube/Controls/MusicPlaylistsForm.vb

@@ -81,6 +81,14 @@ Namespace API.YouTube.Controls
 
                 If Not .UserTitle.IsEmptyString Then
                     Text = .UserTitle
+                    If .ObjectType = Base.YouTubeMediaType.PlayList Then
+                        If Not .PlaylistTitle.IsEmptyString AndAlso Not .PlaylistTitle = .UserTitle Then
+                            Text &= $" - { .PlaylistTitle}"
+                        ElseIf Not .Title.IsEmptyString AndAlso Not .Title = .UserTitle Then
+                            Text &= $" - { .Title}"
+                        End If
+                    End If
+                    If Not TXT_OUTPUT_PATH.IsEmptyString AndAlso Not TXT_OUTPUT_PATH.Text.Contains(.UserTitle) Then TXT_OUTPUT_PATH.Text = $"{TXT_OUTPUT_PATH.Text.TrimEnd("\")}\{ .UserTitle}\"
                 ElseIf Not .PlaylistTitle.IsEmptyString Then
                     Text = .PlaylistTitle
                 End If

SCrawler.YouTube/Controls/ParsingProgressForm.Designer.vb

@@ -82,7 +82,6 @@ Namespace API.YouTube.Controls
             Me.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide
             Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent
             Me.Text = "Parsing progress"
-            Me.TopMost = True
             TP_MAIN.ResumeLayout(False)
             TP_MAIN.PerformLayout()
             Me.ResumeLayout(False)

SCrawler.YouTube/Controls/ParsingProgressForm.vb

@@ -17,9 +17,27 @@ Namespace API.YouTube.Controls
                 Return TokenSource.Token
             End Get
         End Property
-        Public Sub New()
+        Private ReadOnly CountMax As Integer
+        Private CountCurrent As Integer = 1
+        Friend Sub NextPlaylist()
+            CountCurrent += 1
+            MyProgress.InformationTemporary(True) = InfoStr
+            MyProgress.Information = InfoStr
+        End Sub
+        Private ReadOnly Property InfoStr As String
+            Get
+                Const MainMsg$ = "Data parsing in progress"
+                If CountMax > 1 Then
+                    Return $"{MainMsg} [{CountCurrent - 1}/{CountMax}]"
+                Else
+                    Return MainMsg
+                End If
+            End Get
+        End Property
+        Public Sub New(Optional ByVal _Count As Integer = 1)
             InitializeComponent()
-            MyProgress = New MyProgress(PR_MAIN, LBL_MAIN, "Data parsing in progress") With {.ResetProgressOnMaximumChanges = False}
+            CountMax = _Count
+            MyProgress = New MyProgress(PR_MAIN, LBL_MAIN, InfoStr) With {.ResetProgressOnMaximumChanges = False}
             TokenSource = New CancellationTokenSource
         End Sub
         Public Sub SetInitialValues(ByVal Count As Integer, ByVal Info As String)

SCrawler.YouTube/Downloader/MediaItem.vb

@@ -115,31 +115,36 @@ Namespace DownloadObjects.STDownloader
             Me.New
             Const d$ = " " & ChrW(183) & " "
             MyContainer = Container
-            MyContainer.Progress = MyProgress
-            If MyContainer.HasElements Then FileOption = SFO.Path Else FileOption = SFO.File
-            If Not MyContainer.SiteKey = YouTubeSiteKey Then
-                BTT_DOWN_AGAIN.Visible = False
-                SEP_DOWN_AGAIN.Visible = False
-            End If
+            With MyContainer
+                .Progress = MyProgress
+                If .HasElements Then FileOption = SFO.Path Else FileOption = SFO.File
+                If .DownloadState = Plugin.UserMediaStates.Downloaded AndAlso
+                   (.ObjectType = Base.YouTubeMediaType.Channel Or .ObjectType = Base.YouTubeMediaType.PlayList) AndAlso FileOption = SFO.File AndAlso
+                   Not .File.Exists AndAlso .File.Exists(SFO.Path, False) Then FileOption = SFO.Path
+                If Not .SiteKey = YouTubeSiteKey Then
+                    BTT_DOWN_AGAIN.Visible = False
+                    SEP_DOWN_AGAIN.Visible = False
+                End If
 
-            ICON_SITE.Image = MyContainer.SiteIcon
-            LBL_TIME.Text = AConvert(Of String)(Container.Duration, TimeToStringProvider, String.Empty)
-            LBL_TITLE.Text = Container.ToString(True)
-            If Not Container.SiteKey = YouTubeSiteKey And Container.ContentType = Plugin.UserMediaTypes.Picture Then
-                LBL_INFO.Text = Container.File.Extension.StringToUpper
-            ElseIf Not Container.IsMusic Then
-                If Container.Height > 0 Then
-                    LBL_INFO.Text = $"{Container.File.Extension.StringToUpper}{d}{Container.Height}p"
+                ICON_SITE.Image = .SiteIcon
+                LBL_TIME.Text = AConvert(Of String)(.Duration, TimeToStringProvider, String.Empty)
+                LBL_TITLE.Text = .ToString(True)
+                If Not .SiteKey = YouTubeSiteKey And .ContentType = Plugin.UserMediaTypes.Picture Then
+                    LBL_INFO.Text = .File.Extension.StringToUpper
+                ElseIf Not .IsMusic Then
+                    If .Height > 0 Then
+                        LBL_INFO.Text = $"{ .File.Extension.StringToUpper}{d}{ .Height}p"
+                    Else
+                        LBL_INFO.Text = .File.Extension.StringToUpper
+                    End If
                 Else
-                    LBL_INFO.Text = Container.File.Extension.StringToUpper
+                    If .Bitrate > 0 Then
+                        LBL_INFO.Text = $"{ .File.Extension.StringToUpper}{d}{ .Bitrate}k"
+                    Else
+                        LBL_INFO.Text = .File.Extension.StringToUpper
+                    End If
                 End If
-            Else
-                If Container.Bitrate > 0 Then
-                    LBL_INFO.Text = $"{Container.File.Extension.StringToUpper}{d}{Container.Bitrate}k"
-                Else
-                    LBL_INFO.Text = Container.File.Extension.StringToUpper
-                End If
-            End If
+            End With
             UpdateMediaIcon()
         End Sub
 #End Region
@@ -277,6 +282,7 @@ Namespace DownloadObjects.STDownloader
 #Region "Context buttons' handlers"
         Public Sub AddToQueue()
             ControlInvokeFast(Me, Sub()
+                                      Pending = True
                                       BTT_DOWN.Visible = False
                                       SEP_DOWN.Visible = False
                                   End Sub, EDP.None)
@@ -300,6 +306,8 @@ Namespace DownloadObjects.STDownloader
                 Throw oex
             Catch ex As Exception
                 ErrorsDescriber.Execute(EDP.SendToLog, ex, $"MediaItem.Download:{vbCr}{MyContainer.ToString}{vbCr}{MyContainer.URL})")
+            Finally
+                Pending = False
             End Try
         End Sub
 #End Region
@@ -372,7 +380,7 @@ Namespace DownloadObjects.STDownloader
                         m.Show()
                     End If
                 Else
-                    If MyContainer.File.Exists(SFO.Path, False) Then MyContainer.File.Open(SFO.Path,, EDP.ShowMainMsg) Else m.Show()
+                    If MyContainer.File.Exists(SFO.Path, False) Then GlobalOpenPath(MyContainer.File, EDP.ShowMainMsg) Else m.Show()
                 End If
             End If
             OnDoubleClick(e)

SCrawler.YouTube/Downloader/VideoListForm.Designer.vb

@@ -143,7 +143,8 @@ Namespace DownloadObjects.STDownloader
             Me.BTT_ADD.Size = New System.Drawing.Size(184, 22)
             Me.BTT_ADD.Tag = "a"
             Me.BTT_ADD.Text = "Add (Ins)"
-            Me.BTT_ADD.ToolTipText = "Click to add." & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Ctrl+click to use cookies for download (if supported)."
+            Me.BTT_ADD.ToolTipText = "Click to add." & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Ctrl+click to use cookies for download (if supported)." & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Shift to a" &
+    "dd without downloading."
             '
             'BTT_ADD_PLS_ARR
             '
@@ -154,7 +155,8 @@ Namespace DownloadObjects.STDownloader
             Me.BTT_ADD_PLS_ARR.Size = New System.Drawing.Size(184, 22)
             Me.BTT_ADD_PLS_ARR.Tag = "pls"
             Me.BTT_ADD_PLS_ARR.Text = "Add playlist array"
-            Me.BTT_ADD_PLS_ARR.ToolTipText = "Click to add." & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Ctrl+click to use cookies for download (if supported)."
+            Me.BTT_ADD_PLS_ARR.ToolTipText = "Click to add." & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Ctrl+click to use cookies for download (if supported)." & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Shift to a" &
+    "dd without downloading."
             '
             'BTT_ADD_NO_SHORTS
             '
@@ -166,7 +168,7 @@ Namespace DownloadObjects.STDownloader
             Me.BTT_ADD_NO_SHORTS.Tag = "ans"
             Me.BTT_ADD_NO_SHORTS.Text = "Add (without Shorts)"
             Me.BTT_ADD_NO_SHORTS.ToolTipText = "Download all videos except 'Shorts'." & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Click to add." & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Ctrl+click to use cookies fo" &
-    "r download (if supported)."
+    "r download (if supported)." & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Shift to add without downloading."
             '
             'BTT_ADD_SHORTS_ONLY
             '
@@ -178,7 +180,7 @@ Namespace DownloadObjects.STDownloader
             Me.BTT_ADD_SHORTS_ONLY.Tag = "as"
             Me.BTT_ADD_SHORTS_ONLY.Text = "Add (Shorts only)"
             Me.BTT_ADD_SHORTS_ONLY.ToolTipText = "Download only 'Shorts' videos." & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Click to add." & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Ctrl+click to use cookies for down" &
-    "load (if supported)."
+    "load (if supported)." & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Shift to add without downloading."
             '
             'BTT_DOWN
             '
@@ -187,7 +189,7 @@ Namespace DownloadObjects.STDownloader
             Me.BTT_DOWN.Name = "BTT_DOWN"
             Me.BTT_DOWN.Size = New System.Drawing.Size(81, 22)
             Me.BTT_DOWN.Text = "Download"
-            Me.BTT_DOWN.ToolTipText = "Download pending items"
+            Me.BTT_DOWN.ToolTipText = "Download pending items (F5)"
             '
             'BTT_STOP
             '

SCrawler.YouTube/Downloader/VideoListForm.resx

@@ -134,6 +134,27 @@
   </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="BTT_ADD.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAN1SURBVEhLrZVJTFNRFIafQhgD1OBUpiiKYg22AopFKggK
+        FdRYQUEZgsqgGBAChaiYRlG2RuPOuCDGGDcG48phgcQog0KFV4QKKZ2wSIJxf83vuc8SWRAw8E7yp23u
+        yf/de95/X4Wlyu+eT4f/fR8sJL7mbVt+cSOVWcUyB3U4/EUHvUiy6HDKliVBvG3LL26SMKRiQd0CQj8K
+        CO8XEPnZF5WuXPkAGlHFwnoErOtfhU2D/vQ7FM2efPkASQTgO481+yNxJAwZoxtwe6ZEPoCWALHmAOwZ
+        USDHGkHz34p7s1XyAc6LGpZsUSDXGomzk9tRZdfg0a86+QCN4j6m/xaFUvsO1DgS0ehMxZNfxv8DLJbz
+        OZX2p/8uscej1pGMlikdbnqy0fGzCWufBi4q5fPgDmmHWXMZp3znjepw0pqJMlsOap3HcdV9Cnc8ZfQ9
+        GdfcB3DLk4O2aT06ZpvweNYogR7O1uHuTAVuTRej2V1AI8xDjb0Qys5gSABuHvqBMt4rIGrQD2qKIU+K
+        YSIW5+w7ccWZgutTB8lAj/bpXAlw83s2melQ5dDg9EQcssY2Qm0JRfSAHxTkU2gx/APwnXNzvqi2hFCz
+        Evle83pXClrdmWjz6AmQjRvfM2F0p9GzSEL5pAonxjcjfXQ9EsQQRAz6QtEnIJAuZf6XeYC8ER1iyFxD
+        O8iyKqUYVjrUaHDtxbWpDLSS6VV3OoyuNNQ796Ca1krtKhwb34QDdFLJfMAX/DJy81WvBRj65gHOWA9B
+        OxJOMYxCsS0edfQwmygpLWTITRtdqZIaaFTVNBKepqPjMUj7uh47hoOh/OSDEBpxQJcA4RWpkwDv5wEu
+        iYnMKKYy02gpM41dYCZrNTN9q6LPi8wkXmYPflwi872otKtRNLkNuePRaHGWIb8n43eFuJ+ViFpWREol
+        aYdIn0m9WiYBeEwXiticeFO72MIqHbtQZIvDETplCp22xlEkrS0qHtOlijeaxAZ2mp5LzlgkkuhGbzEH
+        otx2UjLxti2//gJqWPZYhPSi42/TcErKWat3xiutv4AKttsShihKyhqKM/9vKJjL+UqLm9SJxSx6wB8K
+        imHQOwE+byglZhkB5ylh3DyAdr6ax/AlAXpkBBRT/AJp5wJdIOEF6RkBumUEFAwbpJEYekl0gQxdpLdy
+        ASjL3GhBLZlzQfgD9Y2tq0N6ki0AAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="BTT_ADD_PLS_ARR.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
         YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAN5SURBVEhLrZVJTFNRFIafljBIgBqcymAU54oWGSRCK1oU
@@ -152,206 +173,185 @@
         KksYKp0HJZPAttkXNzGLdSxnIEZ60fG3aTQl5Yg9MOO51l9AFdtijUIcJWUhxZl/Gwoncj7X4iYNYimL
         7w2BkmK44LUAxQtKiUVGwHFRy7h5KHU+n8fwKQE+yAgopfiFUecCXSDhCekhAd7ICCj8apRGYuwi0QUy
         viK9lAtAWeZGU2rGnAvCHy5drfKWDYjrAAAAAElFTkSuQmCC
-</value>
-  </data>
-  <data name="BTT_ADD_PLS_ARR.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAN7SURBVEhLrZVJTFNRFIafQhgkQA1OZYriSI0UtUI0vIKg
-        UEGNBRSUIQ4MihElUAgOqeKwcGM07owLYoxxYzSuHBZIjAoKrfpaoBZLJyiaYNxf83vus0QWBAy+k/xp
-        k3vzf+ee99/3hNkq7GZIZ/itEEwnvhbcNvfiRmlWDcu1iNj5UYRBItlE7HflyZDgtrkXN9n4ScMWdAuI
-        eSsg7r2AhL5Q1PoKlQPoJA2LfSdg8ft5WG4JR7oUg9ZAiXKATALwzlOs4dhkj0XO4FJc+V6pHECU0liK
-        NQJb7CoUOOJp/qtwc6JOOcBRScd0NhUKHQk4NLIWde503P3ZqBygWcpihi+JqHKnosGzCc3ebbj/0/Rv
-        gJlyPqkjluxfle51OOXRoW1UxKVAPjp/tGDRg8gZpX4U1Sl3mDeZccp30aCIYkcuql0FOOXdi3b/flwN
-        VNN/Hc769egIFODyuAGdEy24N2GSQXcmGnHjew06xivQ6i+lERahwV0G9eMoyABuHvOGMt4jINESBi3F
-        kCfFOJyCI+71OO3NxLnR7WRgwLXxQhlwaSyfzETUedJxYHg18oaWQWuLQVJ/GFTkU2Yz/gXwzrk5X9Ta
-        ommzGiVB8zO+TJz35+JywECAfFwYy4XJn0XPYjMOj2iwz7kC2YNLsEGKRrwlFKpeAZF0KUs+TgEU2UUk
-        k3k6dZDnUMsxrPVo0eTLwNnRHJwn03Z/Nky+LJzxbkE9rVW5NdjjXA49nVQ27w8Fv4zcfN5zAcbeKYCD
-        jh3Yao+jGCaiwrUOjfQwWygpbWTITZt922Q10ajqaSQ8TbudycgaWILUz1FQfwhBNI04okuA8Iz0mACv
-        pwBOSBnMNKBnZmcVMw8fY+av9czsqqPf4+yi/SS7/e0EmWeg1q1F+cgaFDqT0OatRtmHHb9qpGxWKYms
-        nKQniZ9IfaQekckAHtPpIjYpvun6QBur9aSh3LUau+iUmXTaBk+5vDajeExnK76xw97EDtBzKRhKwGa6
-        0SutkTjsKpZNgtvmXtzELDWw/KF4+UXH36ZxlJRDjuCM/7f+AGrYRlssEikpCynO/NtQOpnz/y1u0ihV
-        sKT+cKgohgteCQh5QSmxKgg4KukZN4+gzufzGD4lwDsFARUUv0jqXKALJDwhPSRAt4KA0s9GeSTGHhJd
-        IGMX6aVSAMoyN5pWs+ZcEH4DgcGuQfDpaFIAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="BTT_ADD_NO_SHORTS.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         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
-        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
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAN9SURBVEhLrZVZSFRRGMdvKa6oE5Y1bpTtRY1N5pB407Tu
+        TFrRpJXlgpVLTWiJTlIZli0QPUTLW/QgEdFLFD21PFREZYtONTON08jsOiYYvp/4953LSD6Iht0P/jBw
+        Dv/fd77zP3eE6SrqekR39I0ITCa+Ft428+JGOouWFfWJ2PpFhMFKsonY4y6WIeFtMy9ukvdVy+JeC0h8
+        JyD5o4C0z5GoD5QoBxCtWpb0XsC8j7OwsC8a2dZEnAyVKQcoJADvPMsSDa09CYWO+bg4UqUcQLLqWJYl
+        BhvsKuidqTT/Jbg+2qAc4JBVZDk2FUqcaTjgWY4GbzbujDUrB2h1bGWGH+mo9q6EyadFqz8P98bM/waY
+        KufjMjn0v6u8K9Dky0H7oIjzIQndv9ow937slFI/jO+WOywezzjlu9QhYrezCDVuPZr8O3EquAeXQjX0
+        Oweng5vQFdLjwrAB3aNtuDtqlkG3R5txbaQOXcOVOBkspxGWwuTdB/WjeMgAbp74ljLeIyC9LwoaiiFP
+        inEgCwe9q3Hcr8OZwc1kYMDl4RIZcH5IIjMRDb5s7B1YiuL+BdDYEpHRGwUV+eyzGf8CeOfcnC9qbAm0
+        WY2ysPmJgA4dwSJcCBkIIOHsUBHMwXy6i/Wo9azCLtciFDhSsMaagNS+SKg+CIilR1n2ZQKg1C4ik8yz
+        qYNip1qOYb1Pg5ZALk4PFqKDTE8FC2AO5OOEfwMaaa3auwo7XAuxiU4qm/dGgj9Gbj7rmQDjhwmA/c4t
+        2GhPphimo9K9As10mW2UlHYy5KatgTxZLTSqRhoJT9N2Vybyv6dg5bd4qD9FIIFGHPNSgPCU9IgAbyYA
+        jg4UMLNHzzqD1axz8DDrGmpkXaEGdnHoCLviPsZu/TxK5rmo92pQ4VmGElcG2v01qLXt+F3nMLAqm8Qq
+        rBLTk6SvpM+kHonJAB7TySI2Lr7ppqed1fvWosK9FNvolDo6rclXIa9NKR7T6YpvvOpuYXvpXvT9aVhP
+        L3qxJRa17t2ySXjbzIubnHOZmNSfKn/o+Nc0mZJywBme8f8WN+nsr2PrbElIp6TMoTjz/4by8Zz/b3GT
+        Znsly+iNhopiGPdKQMRzSolFQcAhq55x8xjqfDaP4RMCvFcQUEnxi6XOBXpAwmPSAwK8VhBQ/s0oj8TY
+        Q6IHZHxJeqEUgLLMjSbVtDkXhD9St6/+w21JdAAAAABJRU5ErkJggg==
 </value>
   </data>
   <data name="BTT_ADD_SHORTS_ONLY.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAOBSURBVEhLrZVZSFRRGMdvKS6JOmHbuETZpkaN1ZQYTtZY
-        zp2xbVLLcqHMpaws0UnaqMx6iYiinqIHiYheouip5aEkKjV1qhmXmzXeWXSmwOj9xL/vXEbyQTTsfvCH
-        gXP4/77znf+5I0xWYTdCWsJvhmA88bXgtqkXN8q065mx24AtHw0QHSSnAYWuHAUS3Db14iZZn/RsRquA
-        mHcC4joEJHSGotJrUQ+Q7dCz2PcCZndMw4LucKQ7YnDSn68ewEgA3nmyPRyre2KxsW8umn+UqAcQHZks
-        2R6BtT0amKR4mv9i3BipUg9Q7sxmeqcGFikB+waXoUpOx91fteoB6iUTE78kolRORY17Neo963H/l+3f
-        ABPlfFRHJfPvEjkFx9x6NA4ZcNGfi5afDZj1IHJCaR9FtSgd5oxmnPKd12fALsmIMpcJxzzbccpXiMv+
-        Mvqtx2nfBjT5TbgUENEy0oB7IzYFdGekFtd/VKApUIyTvgIaYR5q5D3QPo6CAuDmMW8p420CErvDoKMY
-        8qRYvybjgLwcxz0ZODO0iQxEXAlYFMDF4VwyM6DKnY7dX5cgp38edM4YJHWFQUM+e5zWvwDeOTfnizpn
-        NG3WIj9ofsKbgbM+Iy75RQLk4tywETZfFt3FGuwfTMPOgYXI7puDFY5oxHeHQtMuIJIeZf7HMYC8HgPm
-        k3k6dZAjaZUYVrp1qPOuw+mhjThLpqd82bB5s3DCsxbVtFYqp2HbwAJsoJMq5l2h4I+Rm097LsDaPgaw
-        V9qMzJ44imEiil0pqKXLbKCkNJIhN633rldUR6OqppHwNG0dmI+s3jlI/RwF7YcQRNOII14JEJ6RHhPg
-        zRjAYdcmZnOb2fnhUnbBf5A1B6pZ8/cqdiVwiF2Vj7Bb3w+T+TpUyjoUDS6FZSAJjZ4ylPfu+F0hWVhJ
-        r8iKHCIzk8RPpE5Sm8gUAI/peBEbFd90293IKt0rUeRaAjOdMoNOW+MuUtYmFI/pZMU3XpPr2G66F1N/
-        AtbQi15kj8R+1y7FJLht6sVNmr7VsNz+eOVDx7+mcZSUfVJwxv9b3OT8lwq2yhmLRErKTIoz/28oGM35
-        /xY3qe0rZkld4dBQDGe8FhDyglJiVxFQ7jAzbh5BnU/nMXxKgPcqAoopfpHUuUAPSHhCekiAVhUBBZ+t
-        ykisbSR6QNZXpJdqASjL3GhcTZpzQfgDSh6wcB+AKZwAAAAASUVORK5CYII=
+        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
 </value>
   </data>
   <data name="MENU_ADD.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         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
-        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
+        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
 </value>
   </data>
   <data name="BTT_STOP.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         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
-        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
-        epieAAAAAElFTkSuQmCC
+        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
+        4dDtOAAAAABJRU5ErkJggg==
 </value>
   </data>
   <data name="BTT_DELETE.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         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
-        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
-        AAAAAElFTkSuQmCC
+        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
+        P/QAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="BTT_CLEAR_DONE.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         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
-        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
-        AAAAAElFTkSuQmCC
+        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
+        P/QAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="BTT_CLEAR_ALL.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         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
-        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
-        AAAAAElFTkSuQmCC
+        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
+        P/QAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="BTT_LOG.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

SCrawler.YouTube/Downloader/VideoListForm.vb

@@ -81,7 +81,13 @@ Namespace DownloadObjects.STDownloader
             If Not MyYouTubeSettings Is Nothing Then MyYouTubeSettings.Close()
         End Sub
         Private Sub VideoListForm_KeyDown(sender As Object, e As KeyEventArgs) Handles Me.KeyDown
-            If e.KeyCode = Keys.Insert Then BTT_ADD.PerformClick() : e.Handled = True
+            Dim b As Boolean = True
+            Select Case e.KeyCode
+                Case Keys.Insert : BTT_ADD.PerformClick()
+                Case Keys.F5 : BTT_DOWN.PerformClick()
+                Case Else : b = False
+            End Select
+            If b Then e.Handled = True
         End Sub
 #End Region
 #Region "Refill, save list"
@@ -230,83 +236,82 @@ Namespace DownloadObjects.STDownloader
                                                                                                                                     BTT_ADD_NO_SHORTS.KeyClick, BTT_ADD_SHORTS_ONLY.KeyClick
             Dim pForm As ParsingProgressForm = Nothing
             Try
-                Dim canProcess As Boolean = True
-                If TP_CONTROLS.Controls.Count >= MyYouTubeSettings.ItemsListLimit Then canProcess = TP_CONTROLS.Controls.Cast(Of MediaItem).ListExists(ControlsDownloaded)
-                If canProcess Then
-                    Dim useCookies As Boolean = MyYouTubeSettings.DefaultUseCookies
-                    If e.Control Then useCookies = True
-                    Dim useCookiesParse As Boolean? = Nothing
-                    If useCookies Then useCookiesParse = True
+                Dim useCookies As Boolean = MyYouTubeSettings.DefaultUseCookies
+                Dim sTag$ = If(Sender?.Tag, String.Empty)
+                Dim disableDown As Boolean = e.Shift
+                If e.Control Then useCookies = True
+                Dim useCookiesParse As Boolean? = Nothing
+                If useCookies Then useCookiesParse = True
 
-                    Dim c As IYouTubeMediaContainer = Nothing
-                    Dim url$ = String.Empty
-                    Dim GetDefault As Boolean = True
-                    Dim GetShorts As Boolean = True
+                Dim c As IYouTubeMediaContainer = Nothing
+                Dim url$ = String.Empty
+                Dim GetDefault As Boolean = True
+                Dim GetShorts As Boolean = True
 
-                    If Sender.Tag = "pls" Then
-                        Using pf As New PlaylistArrayForm With {.DesignXML = DesignXML}
-                            pf.ShowDialog()
-                            If pf.DialogResult = DialogResult.OK Then
-                                With pf.URLs
-                                    If .Count > 0 Then
-                                        pForm = New ParsingProgressForm
-                                        pForm.Show()
-                                        pForm.SetInitialValues(.Count, "Parsing playlists...")
-                                        Dim containers As New List(Of IYouTubeMediaContainer)
-                                        For Each u$ In .Self : containers.Add(YouTubeFunctions.Parse(u, useCookiesParse, pForm.Token, pForm.MyProgress, True, False)) : pForm.MyProgress.Perform() : Next
-                                        pForm.Dispose()
-                                        If containers.Count > 0 Then containers.ListDisposeRemoveAll(Function(cc) cc.HasError Or Not cc.Exists)
-                                        If containers.Count > 0 Then
-                                            c = New Channel With {.UserTitle = IIf(pf.IsOneArtist, containers(0).UserTitle, "Playlists")}
-                                            c.Elements.AddRange(containers)
-                                        End If
+                If sTag = "pls" Then
+                    Using pf As New PlaylistArrayForm With {.DesignXML = DesignXML}
+                        pf.ShowDialog()
+                        If pf.DialogResult = DialogResult.OK Then
+                            With pf.URLs
+                                If .Count > 0 Then
+                                    pForm = New ParsingProgressForm(.Count)
+                                    pForm.Show(Me)
+                                    pForm.SetInitialValues(.Count, "Parsing playlists...")
+                                    Dim containers As New List(Of IYouTubeMediaContainer)
+                                    For Each u$ In .Self
+                                        containers.Add(YouTubeFunctions.Parse(u, useCookiesParse, pForm.Token, pForm.MyProgress, True, False))
+                                        pForm.NextPlaylist()
+                                        pForm.MyProgress.Perform()
+                                    Next
+                                    pForm.Dispose()
+                                    If containers.Count > 0 Then containers.ListDisposeRemoveAll(Function(cc) cc.HasError Or Not cc.Exists)
+                                    If containers.Count > 0 Then
+                                        c = New Channel With {
+                                            .UserTitle = IIf(pf.IsOneArtist, containers(0).UserTitle, "Playlists"),
+                                            .IsMusic = containers.Any(Function(cc) cc.IsMusic)
+                                        }
+                                        c.Elements.AddRange(containers)
                                     End If
-                                End With
-                            End If
-                        End Using
-                    Else
-                        Select Case CStr(Sender.Tag)
-                            Case "ans" : GetShorts = False
-                            Case "as" : GetDefault = False : GetShorts = True
-                        End Select
-                        url = BufferText
-                        If url.IsEmptyString OrElse Not YouTubeFunctions.IsMyUrl(url) Then url = InputBoxE("Enter a valid URL to the YouTube video:", "YouTube link")
-                    End If
-
-                    If Not c Is Nothing OrElse YouTubeFunctions.IsMyUrl(url) Then
-                        If c Is Nothing Then
-                            pForm = New ParsingProgressForm
-                            pForm.Show()
-                            pForm.SetInitialValues(1, "Parsing data...")
-                            c = YouTubeFunctions.Parse(url, useCookiesParse, pForm.Token, pForm.MyProgress, GetDefault, GetShorts)
-                            pForm.Dispose()
-                        End If
-                        If Not c Is Nothing Then
-                            Dim f As Form
-                            Select Case c.ObjectType
-                                Case YouTubeMediaType.Single : f = New VideoOptionsForm(c)
-                                Case YouTubeMediaType.Channel, YouTubeMediaType.PlayList
-                                    If c.IsMusic Then
-                                        f = New MusicPlaylistsForm(c)
-                                    Else
-                                        f = New VideoOptionsForm(c)
-                                    End If
-                                Case Else : c.Dispose() : Throw New ArgumentException($"Object type {c.ObjectType} not implemented", "IYouTubeMediaContainer.ObjectType")
-                            End Select
-                            If Not f Is Nothing Then
-                                If TypeOf f Is IDesignXMLContainer Then DirectCast(f, IDesignXMLContainer).DesignXML = DesignXML
-                                f.ShowDialog()
-                                If f.DialogResult = DialogResult.OK Then
-                                    If TP_CONTROLS.Controls.Count >= MyYouTubeSettings.ItemsListLimit Then _
-                                       RemoveControls(TP_CONTROLS.Controls.Cast(Of MediaItem).LastOrDefault(ControlsDownloaded))
-                                    ControlCreateAndAdd(c)
                                 End If
-                                f.Dispose()
-                            End If
+                            End With
+                        End If
+                    End Using
+                Else
+                    Select Case sTag
+                        Case "ans" : GetShorts = False
+                        Case "as" : GetDefault = False : GetShorts = True
+                    End Select
+                    url = BufferText
+                    If url.IsEmptyString OrElse Not YouTubeFunctions.IsMyUrl(url) Then url = InputBoxE("Enter a valid URL to the YouTube video:", "YouTube link")
+                End If
+
+                If Not c Is Nothing OrElse YouTubeFunctions.IsMyUrl(url) Then
+                    If c Is Nothing Then
+                        pForm = New ParsingProgressForm
+                        pForm.Show(Me)
+                        pForm.SetInitialValues(1, "Parsing data...")
+                        c = YouTubeFunctions.Parse(url, useCookiesParse, pForm.Token, pForm.MyProgress, GetDefault, GetShorts)
+                        pForm.Dispose()
+                    End If
+                    If Not c Is Nothing Then
+                        Dim f As Form
+                        Select Case c.ObjectType
+                            Case YouTubeMediaType.Single : f = New VideoOptionsForm(c)
+                            Case YouTubeMediaType.Channel, YouTubeMediaType.PlayList
+                                If c.IsMusic Then
+                                    f = New MusicPlaylistsForm(c)
+                                Else
+                                    f = New VideoOptionsForm(c)
+                                End If
+                            Case Else : c.Dispose() : Throw New ArgumentException($"Object type {c.ObjectType} not implemented", "IYouTubeMediaContainer.ObjectType")
+                        End Select
+                        If Not f Is Nothing Then
+                            If TypeOf f Is IDesignXMLContainer Then DirectCast(f, IDesignXMLContainer).DesignXML = DesignXML
+                            f.ShowDialog()
+                            If f.DialogResult = DialogResult.OK Then ControlCreateAndAdd(c, disableDown)
+                            f.Dispose()
                         End If
                     End If
-                Else
-                    MsgBoxE({$"Number of items to download exceeded!{vbCr}Reduce the number of items or increase the limit.", "New download"}, vbCritical)
                 End If
             Catch oex As OperationCanceledException
             Catch dex As ObjectDisposedException
@@ -425,8 +430,10 @@ Namespace DownloadObjects.STDownloader
             UpdateLogButton()
         End Sub
         Protected Sub AddToDownload(ByRef Item As MediaItem, ByVal RunThread As Boolean)
-            If MyJob.Count = 0 OrElse Not MyJob.Items.Exists(Function(i) i.MyContainer.GetHashCode) Then
-                Item.Pending = True
+            Dim hc% = Item.MyContainer.GetHashCode
+            If MyJob.Count = 0 OrElse Not MyJob.Items.Exists(Function(i) i.MyContainer.GetHashCode = hc) Then
+                'TODELETE: YT video downloader 'Item.Pending'
+                'Item.Pending = True
                 MyJob.Add(Item)
                 Item.AddToQueue()
                 If RunThread Then StartDownloading()
@@ -475,7 +482,10 @@ Namespace DownloadObjects.STDownloader
                         Task.WaitAll(t.ToArray)
                         MyProgress.Perform(t.Count)
                         If Indexes.Count > 0 Then
-                            For i = Indexes.Count - 1 To 0 Step -1 : MyJob.Items.RemoveAt(Indexes(i)) : Next
+                            For i = Indexes.Count - 1 To 0 Step -1
+                                MyJob.Item(Indexes(i)).Pending = False
+                                MyJob.Items.RemoveAt(Indexes(i))
+                            Next
                         End If
                         t.Clear()
                     End If

SCrawler.YouTube/My Project/AssemblyInfo.vb

@@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("2023.5.12.0")>
-<Assembly: AssemblyFileVersion("2023.5.12.0")>
+<Assembly: AssemblyVersion("2023.6.19.0")>
+<Assembly: AssemblyFileVersion("2023.6.19.0")>
 <Assembly: NeutralResourcesLanguage("en")>

SCrawler.YouTube/Objects/YouTubeMediaContainerBase.vb

@@ -22,17 +22,8 @@ Imports UMStates = SCrawler.Plugin.UserMediaStates
 Imports CollectionModes = PersonalUtilities.Functions.XML.Objects.IXMLValuesCollection.Modes
 Namespace API.YouTube.Objects
     Public Class ContainerDateComparer : Implements IComparer(Of IYouTubeMediaContainer)
-        Private ReadOnly NullDateValue As New Date
         Public Function Compare(ByVal x As IYouTubeMediaContainer, ByVal y As IYouTubeMediaContainer) As Integer Implements IComparer(Of IYouTubeMediaContainer).Compare
-            If x.DateDownloaded = NullDateValue And y.DateDownloaded = NullDateValue Then
-                Return x.DateCreated.CompareTo(y.DateCreated) * -1
-            ElseIf x.DateDownloaded = NullDateValue Then
-                Return -1
-            ElseIf y.DateDownloaded = NullDateValue Then
-                Return 1
-            Else
-                Return x.DateDownloaded.CompareTo(y.DateDownloaded) * -1
-            End If
+            Return x.DateCreated.CompareTo(y.DateCreated) * -1
         End Function
     End Class
     Public MustInherit Class YouTubeMediaContainerBase : Implements IYouTubeMediaContainer
@@ -440,7 +431,7 @@ Namespace API.YouTube.Objects
             End Get
         End Property
         Protected _Exists As Boolean = True
-        Public ReadOnly Property Exists As Boolean Implements IDownloadableMedia.Exists
+        Public Overridable ReadOnly Property Exists As Boolean Implements IDownloadableMedia.Exists
             Get
                 If Not _Exists Then
                     Return False
@@ -643,6 +634,7 @@ Namespace API.YouTube.Objects
                     End If
                     If Not cmd.IsEmptyString Then
                         cmd = $"yt-dlp -f ""{cmd}"""
+                        If Not MyYouTubeSettings.ReplaceModificationDate Then cmd &= " --no-mtime"
                         cmd.StringAppend(formats, " ")
                         cmd.StringAppend(subs, " ")
                         cmd.StringAppend(YouTubeFunctions.GetCookiesCommand(WithCookies, YouTubeCookieNetscapeFile), " ")
@@ -864,6 +856,7 @@ Namespace API.YouTube.Objects
                                 .Information = $"Download {MediaType}"
                             End With
                         End If
+                        .MainProcessName = "yt-dlp"
                         .FileExchanger = MyCache.NewInstance(Of BatchFileExchanger)(CachePath, EDP.ReturnValue)
                         .FileExchanger.DeleteCacheOnDispose = True
                         .AddCommand("chcp 65001")
@@ -1038,6 +1031,14 @@ Namespace API.YouTube.Objects
         End Sub
 #End Region
 #Region "Save"
+        Private Function GetThumbnails() As IEnumerable(Of SFile)
+            If HasElements Then
+                Return ListAddList(Of SFile)(New List(Of SFile)({ThumbnailFile}),
+                                             Elements.SelectMany(Function(ee As YouTubeMediaContainerBase) ee.GetThumbnails))
+            Else
+                Return {ThumbnailFile}
+            End If
+        End Function
         Public Overridable Sub Save() Implements IDownloadableMedia.Save
             Try
                 Dim fSettings As SFile = FileSettings
@@ -1066,6 +1067,11 @@ Namespace API.YouTube.Objects
                 Else
                     If CachePath.Exists(SFO.Path, False) Then CachePath.Delete(SFO.Path, SFODelete.DeletePermanently, EDP.None)
                     CachePath = Nothing
+                    If ThumbnailFile.IsEmptyString And HasElements Then
+                        With ListAddList(Nothing, GetThumbnails, LAP.NotContainsOnly).ListWithRemove(Function(tf) tf.IsEmptyString)
+                            If .ListExists Then _ThumbnailFile = .FirstOrDefault(Function(tf) tf.Exists)
+                        End With
+                    End If
                 End If
 
                 Using x As New XmlFile With {.AllowSameNames = True}

SCrawler.YouTubeDownloader/MainFrame.Designer.vb

@@ -20,9 +20,12 @@ Partial Public Class MainFrame : Inherits SCrawler.DownloadObjects.STDownloader.
     Private Sub InitializeComponent()
         Me.components = New System.ComponentModel.Container()
         Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(MainFrame))
+        Dim CONTEXT_SEP_1 As System.Windows.Forms.ToolStripSeparator
         Me.TRAY_ICON = New System.Windows.Forms.NotifyIcon(Me.components)
         Me.TRAY_CONTEXT = New System.Windows.Forms.ContextMenuStrip(Me.components)
         Me.BTT_TRAY_CLOSE = New System.Windows.Forms.ToolStripMenuItem()
+        Me.CONTEXT_BTT_ADD = New PersonalUtilities.Forms.Controls.KeyClick.ToolStripMenuItemKeyClick()
+        CONTEXT_SEP_1 = New System.Windows.Forms.ToolStripSeparator()
         Me.TRAY_CONTEXT.SuspendLayout()
         Me.SuspendLayout()
         '
@@ -32,13 +35,13 @@ Partial Public Class MainFrame : Inherits SCrawler.DownloadObjects.STDownloader.
         Me.TRAY_ICON.BalloonTipTitle = "YouTube Downloader"
         Me.TRAY_ICON.ContextMenuStrip = Me.TRAY_CONTEXT
         Me.TRAY_ICON.Icon = CType(resources.GetObject("TRAY_ICON.Icon"), System.Drawing.Icon)
-        Me.TRAY_ICON.Text = "YouTube Downloader"
+        Me.TRAY_ICON.Text = "YouTube Downloader" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Ctrl+Click to add download"
         '
         'TRAY_CONTEXT
         '
-        Me.TRAY_CONTEXT.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.BTT_TRAY_CLOSE})
+        Me.TRAY_CONTEXT.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.CONTEXT_BTT_ADD, CONTEXT_SEP_1, Me.BTT_TRAY_CLOSE})
         Me.TRAY_CONTEXT.Name = "ContextMenuStrip1"
-        Me.TRAY_CONTEXT.Size = New System.Drawing.Size(181, 48)
+        Me.TRAY_CONTEXT.Size = New System.Drawing.Size(181, 76)
         '
         'BTT_TRAY_CLOSE
         '
@@ -47,11 +50,24 @@ Partial Public Class MainFrame : Inherits SCrawler.DownloadObjects.STDownloader.
         Me.BTT_TRAY_CLOSE.Size = New System.Drawing.Size(180, 22)
         Me.BTT_TRAY_CLOSE.Text = "Close"
         '
+        'CONTEXT_BTT_ADD
+        '
+        Me.CONTEXT_BTT_ADD.Name = "CONTEXT_BTT_ADD"
+        Me.CONTEXT_BTT_ADD.Size = New System.Drawing.Size(180, 22)
+        Me.CONTEXT_BTT_ADD.Text = "Add"
+        Me.CONTEXT_BTT_ADD.Image = Global.PersonalUtilities.My.Resources.PlusPic_Green_24
+        '
+        'CONTEXT_SEP_1
+        '
+        CONTEXT_SEP_1.Name = "CONTEXT_SEP_1"
+        CONTEXT_SEP_1.Size = New System.Drawing.Size(177, 6)
+        '
         'MainFrame
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.ClientSize = New System.Drawing.Size(1008, 729)
         Me.Name = "MainFrame"
+        Me.Text = "SCrawler: Happy LGBT Pride Month! :-)"
         Me.TRAY_CONTEXT.ResumeLayout(False)
         Me.ResumeLayout(False)
         Me.PerformLayout()
@@ -61,4 +77,5 @@ Partial Public Class MainFrame : Inherits SCrawler.DownloadObjects.STDownloader.
     Private WithEvents TRAY_ICON As NotifyIcon
     Private WithEvents TRAY_CONTEXT As ContextMenuStrip
     Private WithEvents BTT_TRAY_CLOSE As ToolStripMenuItem
+    Private WithEvents CONTEXT_BTT_ADD As PersonalUtilities.Forms.Controls.KeyClick.ToolStripMenuItemKeyClick
 End Class

SCrawler.YouTubeDownloader/MainFrame.resx

@@ -123,6 +123,9 @@
   <metadata name="TRAY_CONTEXT.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>425, 17</value>
   </metadata>
+  <metadata name="CONTEXT_SEP_1.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="BTT_TRAY_CLOSE.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>

SCrawler.YouTubeDownloader/MainFrame.vb

@@ -9,6 +9,7 @@
 Imports System.ComponentModel
 Imports SCrawler.API.YouTube
 Imports PersonalUtilities.Forms
+Imports PersonalUtilities.Forms.Controls.KeyClick
 Public Class MainFrame
     Private WithEvents MyActivator As FormActivator
     Public Sub New()
@@ -66,6 +67,12 @@ CloseResume:
     Private Sub BTT_TRAY_CLOSE_Click(sender As Object, e As EventArgs) Handles BTT_TRAY_CLOSE.Click
         If CheckForClose(False) Then _IgnoreCloseConfirm = True : _IgnoreTrayOptions = True : Close()
     End Sub
+    Private Sub MyActivator_TrayIconClick(ByVal Sender As Object, ByVal e As KeyClickEventArgs) Handles MyActivator.TrayIconClick
+        If e.MouseButton = MouseButtons.Left And e.Control Then
+            BTT_ADD_KeyClick(Nothing, New KeyClickEventArgs)
+            e.Handled = Not MyYouTubeSettings.ShowFormDownTrayClick
+        End If
+    End Sub
     Private Function CheckForClose(ByVal _Ignore As Boolean) As Boolean
         If MyYouTubeSettings.ExitConfirm And Not _Ignore Then
             Return MsgBoxE({"Do you want to close the program?", "Closing the program"}, MsgBoxStyle.YesNo) = MsgBoxResult.Yes
@@ -77,6 +84,9 @@ CloseResume:
         MyBase.BTT_SETTINGS_Click(sender, e)
         TRAY_ICON.Visible = MyYouTubeSettings.CloseToTray
     End Sub
+    Protected Overrides Sub BTT_ADD_KeyClick(ByVal Sender As ToolStripMenuItemKeyClick, ByVal e As KeyClickEventArgs) Handles CONTEXT_BTT_ADD.KeyClick
+        MyBase.BTT_ADD_KeyClick(Sender, e)
+    End Sub
     Protected Overrides Sub MyJob_Started(ByVal Sender As Object, ByVal e As EventArgs)
         TRAY_ICON.Icon = My.Resources.ArrowDownIcon_Orange_24
     End Sub

SCrawler.YouTubeDownloader/My Project/AssemblyInfo.vb

@@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("2023.5.12.0")>
-<Assembly: AssemblyFileVersion("2023.5.12.0")>
+<Assembly: AssemblyVersion("2023.6.19.0")>
+<Assembly: AssemblyFileVersion("2023.6.19.0")>
 <Assembly: NeutralResourcesLanguage("en")>

SCrawler/API/Base/GDLBatch.vb

@@ -72,15 +72,22 @@ Namespace API.Base.GDL
         Friend Const UrlTextStart As String = UrlLibStart & " https"
         Friend Sub New()
             MyBase.New(True)
+            MainProcessName = "gallery-dl"
             ChangeDirectory(Settings.GalleryDLFile.File)
         End Sub
+        Public Overrides Sub Create()
+            If TempPostsList Is Nothing Then TempPostsList = New List(Of String)
+            MyBase.Create()
+        End Sub
         Protected Overrides Async Sub OutputDataReceiver(ByVal Sender As Object, ByVal e As DataReceivedEventArgs)
-            MyBase.OutputDataReceiver(Sender, e)
-            Await Validate(e.Data)
+            If Not ProcessKilled Then
+                MyBase.OutputDataReceiver(Sender, e)
+                Await Validate(e.Data)
+            End If
         End Sub
         Protected Overridable Async Function Validate(ByVal Value As String) As Task
-            If Await Task.Run(Of Boolean)(Function() Not Value.IsEmptyString AndAlso
-                                                     TempPostsList.Exists(Function(v) Value.Contains(v))) Then Kill(EDP.None)
+            If Not ProcessKilled AndAlso Await Task.Run(Of Boolean)(Function() Not Value.IsEmptyString AndAlso
+                                                                               TempPostsList.Exists(Function(v) Value.Contains(v))) Then Kill()
         End Function
     End Class
 End Namespace

SCrawler/API/Base/UserDataBase.vb

@@ -126,6 +126,7 @@ Namespace API.Base
         Private Const Name_ReadyForDownload As String = "ReadyForDownload"
         Private Const Name_DownloadImages As String = "DownloadImages"
         Private Const Name_DownloadVideos As String = "DownloadVideos"
+        Private Const Name_IconBannerDownloaded As String = "IconBannerDownloaded"
 
         Private Const Name_VideoCount As String = "VideoCount"
         Private Const Name_PicturesCount As String = "PicturesCount"
@@ -434,6 +435,18 @@ BlockNullPicture:
         Friend Property DownloadImages As Boolean = True Implements IUserData.DownloadImages
         Friend Property DownloadVideos As Boolean = True Implements IUserData.DownloadVideos
         Friend Property DownloadMissingOnly As Boolean = False Implements IUserData.DownloadMissingOnly
+        Private _IconBannerDownloaded As Boolean = False
+        Friend WriteOnly Property IconBannerDownloaded As Boolean
+            Set(ByVal IsDownloaded As Boolean)
+                If Not _IconBannerDownloaded = IsDownloaded Then _ForceSaveUserInfo = True
+                _IconBannerDownloaded = IsDownloaded
+            End Set
+        End Property
+        Friend ReadOnly Property DownloadIconBanner As Boolean
+            Get
+                Return Not _IconBannerDownloaded Or Settings.UpdateUserIconBannerEveryTime
+            End Get
+        End Property
 #End Region
 #Region "Content"
         Protected ReadOnly _ContentList As List(Of UserMedia)
@@ -751,6 +764,7 @@ BlockNullPicture:
                         ReadyForDownload = x.Value(Name_ReadyForDownload).FromXML(Of Boolean)(True)
                         DownloadImages = x.Value(Name_DownloadImages).FromXML(Of Boolean)(True)
                         DownloadVideos = x.Value(Name_DownloadVideos).FromXML(Of Boolean)(True)
+                        _IconBannerDownloaded = x.Value(Name_IconBannerDownloaded).FromXML(Of Boolean)(False)
                         DownloadedVideos(True) = x.Value(Name_VideoCount).FromXML(Of Integer)(0)
                         DownloadedPictures(True) = x.Value(Name_PicturesCount).FromXML(Of Integer)(0)
                         LastUpdated = AConvert(Of Date)(x.Value(Name_LastUpdated), ADateTime.Formats.BaseDateTime, Nothing)
@@ -799,6 +813,7 @@ BlockNullPicture:
                     x.Add(Name_ReadyForDownload, ReadyForDownload.BoolToInteger)
                     x.Add(Name_DownloadImages, DownloadImages.BoolToInteger)
                     x.Add(Name_DownloadVideos, DownloadVideos.BoolToInteger)
+                    x.Add(Name_IconBannerDownloaded, _IconBannerDownloaded.BoolToInteger)
                     x.Add(Name_VideoCount, DownloadedVideos(True))
                     x.Add(Name_PicturesCount, DownloadedPictures(True))
                     x.Add(Name_LastUpdated, AConvert(Of String)(LastUpdated, ADateTime.Formats.BaseDateTime, String.Empty))
@@ -934,12 +949,12 @@ BlockNullPicture:
             _EnvirUserExists = UserExists
             _EnvirUserSuspended = UserSuspended
             _EnvirChanged = False
+            _EnvirInvokeUserUpdated = False
             UserExists = True
             UserSuspended = False
             DownloadedPictures(False) = 0
             DownloadedVideos(False) = 0
             _PictureExists = Settings.ViewModeIsPicture AndAlso Not GetPicture(Of Image)(False) Is Nothing
-            _EnvirInvokeUserUpdated = False
         End Sub
         Private Sub EnvirChanged(ByVal NewValue As Object, <CallerMemberName> Optional ByVal Caller As String = Nothing)
             If _DownloadInProgress Then
@@ -997,8 +1012,10 @@ BlockNullPicture:
 
                 If UseMD5Comparison Then ValidateMD5(Token) : ProgressPre.Done() : ThrowAny(Token)
 
-                If _TempPostsList.Count > 0 And Not DownloadMissingOnly And __SaveData Then _
-                   TextSaver.SaveTextToFile(_TempPostsList.ListToString(Environment.NewLine), MyFilePosts, True,, EDP.None)
+                If _TempPostsList.Count > 0 And Not DownloadMissingOnly And __SaveData Then
+                    If _TempPostsList.Count > 1000 Then _TempPostsList.ListAddList(_TempPostsList.ListTake(-2, 1000, EDP.ReturnValue).ListReverse, LAP.ClearBeforeAdd)
+                    TextSaver.SaveTextToFile(_TempPostsList.ListToString(Environment.NewLine), MyFilePosts, True,, EDP.None)
+                End If
                 _ContentNew.ListAddList(_TempMediaList, LAP.ClearBeforeAdd)
                 DownloadContent(Token)
                 ThrowIfDisposed()
@@ -1021,7 +1038,6 @@ BlockNullPicture:
                         _ContentList.Clear()
                         CreatedByChannel = False
                     End If
-                    If Not UserExists Then ReadyForDownload = False
                     UpdateUserInformation()
                     If _CollectionButtonsExists AndAlso _EnvirChanged Then UpdateButtonsColor()
                 ElseIf _ForceSaveUserInfo Then
@@ -1079,7 +1095,8 @@ BlockNullPicture:
                 Progress = Data.Progress
                 If Not Responser Is Nothing Then Responser.Dispose()
                 Responser = New Responser
-                If Not HOST Is Nothing AndAlso Not HOST.Responser Is Nothing Then Responser.Copy(HOST.Responser)
+                If Not HOST Is Nothing AndAlso HOST.Available(ISiteSettings.Download.SingleObject, True) AndAlso
+                   Not HOST.Responser Is Nothing Then Responser.Copy(HOST.Responser)
                 SeparateVideoFolder = False
                 IsSingleObjectDownload = True
                 DownloadSingleObject_GetPosts(Data, Token)
@@ -1338,6 +1355,16 @@ BlockNullPicture:
                         Dim f As SFile
                         Dim v As UserMedia
                         Dim fileNumProvider As SFileNumbers = SFileNumbers.Default
+                        Dim __deleteFile As Action(Of SFile, String) = Sub(ByVal FileToDelete As SFile, ByVal FileUrl As String)
+                                                                           Try
+                                                                               If FileToDelete.Exists Then FileToDelete.Delete(,, EDP.ThrowException)
+                                                                           Catch file_io_ex As IOException
+                                                                               MyMainLOG = "File download aborted. You should download the following file again." & vbCr &
+                                                                                           $"File: {FileToDelete}{vbCr}URL: {FileUrl}"
+                                                                           Catch file_del_ex As Exception
+                                                                               ErrorsDescriber.Execute(EDP.SendToLog, file_del_ex)
+                                                                           End Try
+                                                                       End Sub
 
                         Using w As New OptionalWebClient(Me)
                             If vsf Then CSFileP($"{MyDir}\Video\").Exists(SFO.Path)
@@ -1426,7 +1453,9 @@ BlockNullPicture:
                                         DownloadContentDefault_PostProcessing(v, f, Token)
                                         dCount += 1
                                     Catch woex As OperationCanceledException When Token.IsCancellationRequested
-                                        If f.Exists Then f.Delete()
+                                        'TODELETE: UserDataBase.DownloadContentDefault: remove file when 'OperationCanceledException'
+                                        'If f.Exists Then f.Delete(,, EDP.SendToLog)
+                                        __deleteFile.Invoke(f, v.URL_BASE)
                                         v.State = UStates.Missing
                                         v.Attempts += 1
                                         _ContentNew(i) = v

SCrawler/API/BaseObjects/InternalSettingsForm.vb

@@ -154,7 +154,8 @@ Namespace API.Base
                     Dim tmpObj As Object
 
                     members = GetObjectMembers(MyObject, Function(m) (m.MemberType = MemberTypes.Field Or m.MemberType = MemberTypes.Property) AndAlso
-                                                                     Not m.GetCustomAttribute(Of PSettingAttribute) Is Nothing)
+                                                                     Not m.GetCustomAttribute(Of PSettingAttribute) Is Nothing,, True,
+                                                                     New FComparer(Of MemberInfo)(Function(mm1, mm2) mm1.Name = mm2.Name))
                     providersMembersSettings = GetObjectMembers(MySettingsInstance, providersPredicate)
                     providersMembersObj = GetObjectMembers(MyObject, providersPredicate)
 

SCrawler/API/Instagram/Declarations.vb

@@ -46,6 +46,7 @@ Namespace API.Instagram
                 If Not token.IsEmptyString Then Destination.Headers.Add(SiteSettings.Header_CSRF_TOKEN, token)
                 If Not isInternal Then
                     Destination.Cookies.Update(Source.Cookies, CookieKeeper.UpdateModes.ReplaceByNameAll, False, EDP.SendToLog)
+                    Destination.Cookies.Update(EDP.SendToLog)
                     Destination.SaveSettings()
                 End If
             End If

SCrawler/API/Instagram/SiteSettings.vb

@@ -70,33 +70,54 @@ Namespace API.Instagram
         End Class
 #End Region
 #Region "Authorization properties"
-        <PropertyOption(ControlText:="Hash", ControlToolTip:="Instagram session hash for tagged posts", IsAuth:=True), PXML("InstaHash"), ControlNumber(0)>
-        Friend ReadOnly Property HashTagged As PropertyValue
-        <PropertyOption(ControlText:="x-csrftoken", IsAuth:=True, AllowNull:=False), ControlNumber(2)>
-        Friend ReadOnly Property CSRF_TOKEN As PropertyValue
-        <PropertyOption(ControlText:="x-ig-app-id", IsAuth:=True, AllowNull:=False), ControlNumber(3)>
-        Friend Property IG_APP_ID As PropertyValue
-        <PropertyOption(ControlText:="x-ig-www-claim", IsAuth:=True, AllowNull:=True), ControlNumber(4)>
-        Friend Property IG_WWW_CLAIM As PropertyValue
-        Friend Overrides Function BaseAuthExists() As Boolean
-            Return Responser.CookiesExists And ACheck(IG_APP_ID.Value) And ACheck(CSRF_TOKEN.Value)
-        End Function
         Private Const Header_IG_APP_ID As String = "x-ig-app-id"
         Friend Const Header_IG_WWW_CLAIM As String = "x-ig-www-claim"
         Friend Const Header_CSRF_TOKEN As String = "x-csrftoken"
+        Private Const Header_ASBD_ID As String = "X-Asbd-Id"
+        Private ReadOnly Header_Browser As New HttpHeader("Sec-Ch-Ua", """Google Chrome"";v=""113"", ""Chromium"";v=""113"", ""Not-A.Brand"";v=""24""")
+        Private ReadOnly Header_BrowserExt As New HttpHeader("Sec-Ch-Ua-Full-Version-List", """Google Chrome"";v=""113.0.5672.127"", ""Chromium"";v=""113.0.5672.127"", ""Not-A.Brand"";v=""24.0.0.0""")
+        Private ReadOnly Header_Platform As New HttpHeader("Sec-Ch-Ua-Platform-Version", """10.0.0""")
+        <PropertyOption(ControlText:="Hash", ControlToolTip:="Instagram session hash for tagged posts", IsAuth:=True), PXML("InstaHash"), ControlNumber(0)>
+        Friend ReadOnly Property HashTagged As PropertyValue
+        <PropertyOption(ControlText:="x-csrftoken", IsAuth:=True, AllowNull:=False), ControlNumber(2)>
+        Friend ReadOnly Property HH_CSRF_TOKEN As PropertyValue
+        <PropertyOption(ControlText:="x-ig-app-id", IsAuth:=True, AllowNull:=False), ControlNumber(3)>
+        Friend Property HH_IG_APP_ID As PropertyValue
+        <PropertyOption(ControlText:="x-asbd-id", IsAuth:=True, AllowNull:=True), ControlNumber(4)>
+        Friend Property HH_ASBD_ID As PropertyValue
+        <PropertyOption(ControlText:="x-ig-www-claim", IsAuth:=True, AllowNull:=True), ControlNumber(5)>
+        Friend Property HH_IG_WWW_CLAIM As PropertyValue
+        <PropertyOption(ControlText:="sec-ch-ua", IsAuth:=True, AllowNull:=True), ControlNumber(6)>
+        Private Property HH_BROWSER As PropertyValue
+        <PropertyOption(ControlText:="sec-ch-ua-full", ControlToolTip:="sec-ch-ua-full-version-list", IsAuth:=True, AllowNull:=True), ControlNumber(7)>
+        Private Property HH_BROWSER_EXT As PropertyValue
+        <PropertyOption(ControlText:="sec-ch-ua-platform-ver", ControlToolTip:="sec-ch-ua-platform-version", IsAuth:=True, AllowNull:=True), ControlNumber(8)>
+        Private Property HH_PLATFORM As PropertyValue
+        <PropertyOption(ControlText:="UserAgent", IsAuth:=True, AllowNull:=True), ControlNumber(9)>
+        Private Property HH_USER_AGENT As PropertyValue
+        Friend Overrides Function BaseAuthExists() As Boolean
+            Return Responser.CookiesExists And ACheck(HH_IG_APP_ID.Value) And ACheck(HH_CSRF_TOKEN.Value)
+        End Function
         Private _FieldsChangerSuspended As Boolean = False
         Private Sub ChangeResponserFields(ByVal PropName As String, ByVal Value As Object)
             If Not _FieldsChangerSuspended And Not PropName.IsEmptyString Then
                 Dim f$ = String.Empty
+                Dim isUserAgent As Boolean = False
                 Select Case PropName
-                    Case NameOf(IG_APP_ID) : f = Header_IG_APP_ID
-                    Case NameOf(IG_WWW_CLAIM) : f = Header_IG_WWW_CLAIM
-                    Case NameOf(CSRF_TOKEN) : f = Header_CSRF_TOKEN
+                    Case NameOf(HH_IG_APP_ID) : f = Header_IG_APP_ID
+                    Case NameOf(HH_ASBD_ID) : f = Header_ASBD_ID
+                    Case NameOf(HH_IG_WWW_CLAIM) : f = Header_IG_WWW_CLAIM
+                    Case NameOf(HH_CSRF_TOKEN) : f = Header_CSRF_TOKEN
+                    Case NameOf(HH_BROWSER) : f = Header_Browser.Name
+                    Case NameOf(HH_BROWSER_EXT) : f = Header_BrowserExt.Name
+                    Case NameOf(HH_PLATFORM) : f = Header_Platform.Name
+                    Case NameOf(HH_USER_AGENT) : isUserAgent = True
                 End Select
                 If Not f.IsEmptyString Then
                     Responser.Headers.Remove(f)
                     If Not CStr(Value).IsEmptyString Then Responser.Headers.Add(f, CStr(Value))
-                    Responser.SaveSettings()
+                ElseIf isUserAgent Then
+                    Responser.UserAgent = CStr(Value)
                 End If
             End If
         End Sub
@@ -192,13 +213,53 @@ Namespace API.Instagram
             Dim app_id$ = String.Empty
             Dim www_claim$ = String.Empty
             Dim token$ = String.Empty
+            Dim asbd$ = String.Empty
+            Dim browser$ = String.Empty
+            Dim browserExt$ = String.Empty
+            Dim platform$ = String.Empty
+            Dim useragent$ = String.Empty
+
+            Dim __UpdateHeader As Action(Of HttpHeader, Boolean) = Sub(ByVal h As HttpHeader, ByVal UpdateValueIfEmpty As Boolean)
+                                                                       With Responser.Headers
+                                                                           Dim i% = .IndexOf(h)
+                                                                           Dim hh As HttpHeader
+                                                                           If i >= 0 Then
+                                                                               hh = .Item(i)
+                                                                               If hh.Value.IsEmptyString And UpdateValueIfEmpty Then hh.Value = h.Value
+                                                                           Else
+                                                                               hh = h
+                                                                           End If
+                                                                           .Add(hh)
+                                                                       End With
+                                                                   End Sub
 
             With Responser
-                If .Headers.Count > 0 Then
-                    token = .Headers.Value(Header_CSRF_TOKEN)
-                    app_id = .Headers.Value(Header_IG_APP_ID)
-                    www_claim = .Headers.Value(Header_IG_WWW_CLAIM)
-                End If
+                .Accept = "*/*"
+                useragent = .UserAgent
+                With .Headers
+                    If .Count > 0 Then
+                        token = .Value(Header_CSRF_TOKEN)
+                        app_id = .Value(Header_IG_APP_ID)
+                        www_claim = .Value(Header_IG_WWW_CLAIM)
+                        asbd = .Value(Header_ASBD_ID)
+                        browser = .Value(Header_Browser.Name)
+                        browserExt = .Value(Header_BrowserExt.Name)
+                        platform = .Value(Header_Platform.Name)
+                    End If
+                    .Add("Dnt", 1)
+                    __UpdateHeader(Header_Browser, browser.IsEmptyString)
+                    browser = .Value(Header_Browser.Name)
+                    __UpdateHeader(Header_BrowserExt, browserExt.IsEmptyString)
+                    browserExt = .Value(Header_BrowserExt.Name)
+                    .Add("Sec-Ch-Ua-Mobile", "?0")
+                    .Add("Sec-Ch-Ua-Platform", """Windows""")
+                    __UpdateHeader(Header_Platform, platform.IsEmptyString)
+                    platform = .Value(Header_Platform.Name)
+                    .Add("Sec-Fetch-Dest", "empty")
+                    .Add("Sec-Fetch-Mode", "cors")
+                    .Add("Sec-Fetch-Site", "same-origin")
+                    .Add("X-Requested-With", "XMLHttpRequest")
+                End With
                 .CookiesExtractMode = Responser.CookiesExtractModes.Response
                 .CookiesUpdateMode = CookieKeeper.UpdateModes.ReplaceByNameAll
                 .CookiesExtractedAutoSave = False
@@ -207,9 +268,14 @@ Namespace API.Instagram
             Dim n() As String = {SettingsCLS.Name_Node_Sites, Site.ToString}
 
             HashTagged = New PropertyValue(String.Empty, GetType(String))
-            CSRF_TOKEN = New PropertyValue(token, GetType(String), Sub(v) ChangeResponserFields(NameOf(CSRF_TOKEN), v))
-            IG_APP_ID = New PropertyValue(app_id, GetType(String), Sub(v) ChangeResponserFields(NameOf(IG_APP_ID), v))
-            IG_WWW_CLAIM = New PropertyValue(www_claim.IfNullOrEmpty(0), GetType(String), Sub(v) ChangeResponserFields(NameOf(IG_WWW_CLAIM), v))
+            HH_CSRF_TOKEN = New PropertyValue(token, GetType(String), Sub(v) ChangeResponserFields(NameOf(HH_CSRF_TOKEN), v))
+            HH_IG_APP_ID = New PropertyValue(app_id, GetType(String), Sub(v) ChangeResponserFields(NameOf(HH_IG_APP_ID), v))
+            HH_ASBD_ID = New PropertyValue(asbd, GetType(String), Sub(v) ChangeResponserFields(NameOf(HH_ASBD_ID), v))
+            HH_IG_WWW_CLAIM = New PropertyValue(www_claim.IfNullOrEmpty(0), GetType(String), Sub(v) ChangeResponserFields(NameOf(HH_IG_WWW_CLAIM), v))
+            HH_BROWSER = New PropertyValue(browser, GetType(String), Sub(v) ChangeResponserFields(NameOf(HH_BROWSER), v))
+            HH_BROWSER_EXT = New PropertyValue(browserExt, GetType(String), Sub(v) ChangeResponserFields(NameOf(HH_BROWSER_EXT), v))
+            HH_PLATFORM = New PropertyValue(platform, GetType(String), Sub(v) ChangeResponserFields(NameOf(HH_PLATFORM), v))
+            HH_USER_AGENT = New PropertyValue(useragent, GetType(String), Sub(v) ChangeResponserFields(NameOf(HH_USER_AGENT), v))
 
             DownloadTimeline = New PropertyValue(True)
             DownloadStories = New PropertyValue(True)
@@ -275,7 +341,7 @@ Namespace API.Instagram
         Private _NextTagged As Boolean = True
         Friend Overrides Sub DownloadStarted(ByVal What As Download)
             ActiveJobs += 1
-            If LastDownloadDate.Value.AddMinutes(120) < Now Or Not ACheck(IG_WWW_CLAIM.Value) Then IG_WWW_CLAIM.Value = "0"
+            If LastDownloadDate.Value.AddMinutes(120) < Now Or Not ACheck(HH_IG_WWW_CLAIM.Value) Then HH_IG_WWW_CLAIM.Value = "0"
         End Sub
         Friend Overrides Sub BeforeStartDownload(ByVal User As Object, ByVal What As Download)
             With DirectCast(User, UserData)
@@ -299,8 +365,8 @@ Namespace API.Instagram
                 LastDownloadDate.Value = Now
                 LastRequestsCount.Value = .RequestsCount
                 _FieldsChangerSuspended = True
-                IG_WWW_CLAIM.Value = Responser.Headers.Value(Header_IG_WWW_CLAIM)
-                CSRF_TOKEN.Value = Responser.Headers.Value(Header_CSRF_TOKEN)
+                HH_IG_WWW_CLAIM.Value = Responser.Headers.Value(Header_IG_WWW_CLAIM)
+                HH_CSRF_TOKEN.Value = Responser.Headers.Value(Header_CSRF_TOKEN)
                 _FieldsChangerSuspended = False
             End With
         End Sub

SCrawler/API/LPSG/Declarations.vb

@@ -19,7 +19,10 @@ Namespace API.LPSG
         Friend ReadOnly Property NextPageRegex As RParams = RParams.DMS("<link rel=""next"" href=""(.+?/page-(\d+))""", 2)
         Private Const FileUrlRegexDefault As String = "([^/]+?)(jpg|jpeg|gif|png|webm)"
         Private ReadOnly InputFReplacer As New ErrorsDescriber(EDP.ReturnValue)
-        Private ReadOnly InputForbidRemover As Func(Of String, String) = Function(Input) If(Input.IsEmptyString, Input, Input.StringRemoveWinForbiddenSymbols(, InputFReplacer))
+        Private ReadOnly InputForbidRemover As Func(Of String, String) = Function(Input) If(Input.IsEmptyString,
+                                                                                            Input,
+                                                                                            Input.StringRemoveWinForbiddenSymbols(, InputFReplacer)).
+                                                                                            IfNullOrEmpty($"{Settings.Cache.NewFile.Name}.file")
         Private ReadOnly FileRegEx As RParams = RParams.DMS(FileUrlRegexDefault, 0, RegexReturn.ListByMatch, InputFReplacer)
 #Disable Warning IDE0060
         Friend Function FileRegExF(ByVal Input As String, ByVal Index As Integer) As String
@@ -28,7 +31,8 @@ Namespace API.LPSG
                 Dim l As List(Of String) = RegexReplace(Input, FileRegEx)
                 If l.ListExists(3) Then
                     Dim ext$ = l(2)
-                    Dim f$ = l(1).StringTrim("-", ".")
+                    Dim f$ = l(1).StringTrim("-", ".").StringRemoveWinForbiddenSymbols
+                    If f.IsEmptyString Then f = Settings.Cache.NewFile.Name
                     Input = $"{f}.{ext}"
                 End If
             End If

SCrawler/API/Mastodon/EditorExchangeOptions.vb

@@ -0,0 +1,22 @@
+' Copyright (C) 2023  Andy https://github.com/AAndyProgram
+' This program is free software: you can redistribute it and/or modify
+' it under the terms of the GNU General Public License as published by
+' the Free Software Foundation, either version 3 of the License, or
+' (at your option) any later version.
+'
+' This program is distributed in the hope that it will be useful,
+' but WITHOUT ANY WARRANTY
+Imports SCrawler.Plugin.Attributes
+Namespace API.Mastodon
+    Friend Class EditorExchangeOptions : Inherits Twitter.EditorExchangeOptions
+        <PSetting(Address:=SettingAddress.None)> Friend Overrides Property DownloadModelMedia As Boolean
+        <PSetting(Address:=SettingAddress.None)> Friend Overrides Property DownloadModelProfile As Boolean
+        <PSetting(Address:=SettingAddress.None)> Friend Overrides Property DownloadModelSearch As Boolean
+        Friend Sub New(ByVal s As SiteSettings)
+            MyBase.New(s)
+        End Sub
+        Friend Sub New(ByVal u As UserData)
+            MyBase.New(u)
+        End Sub
+    End Class
+End Namespace

SCrawler/API/Mastodon/SiteSettings.vb

@@ -139,9 +139,9 @@ Namespace API.Mastodon
 #End Region
 #Region "UserOptions"
         Friend Overrides Sub UserOptions(ByRef Options As Object, ByVal OpenForm As Boolean)
-            If Options Is Nothing OrElse (Not TypeOf Options Is Twitter.EditorExchangeOptions OrElse
-                                          Not DirectCast(Options, Twitter.EditorExchangeOptions).SiteKey = MastodonSiteKey) Then _
-               Options = New Twitter.EditorExchangeOptions(Me) With {.SiteKey = MastodonSiteKey}
+            If Options Is Nothing OrElse (Not TypeOf Options Is EditorExchangeOptions OrElse
+                                          Not DirectCast(Options, EditorExchangeOptions).SiteKey = MastodonSiteKey) Then _
+               Options = New EditorExchangeOptions(Me) With {.SiteKey = MastodonSiteKey}
             If OpenForm Then
                 Using f As New InternalSettingsForm(Options, Me, False) : f.ShowDialog() : End Using
             End If

SCrawler/API/Mastodon/UserData.vb

@@ -13,6 +13,7 @@ Imports PersonalUtilities.Functions.XML
 Imports PersonalUtilities.Functions.RegularExpressions
 Imports PersonalUtilities.Tools.Web.Documents.JSON
 Imports UTypes = SCrawler.API.Base.UserMedia.Types
+Imports UStates = SCrawler.API.Base.UserMedia.States
 Namespace API.Mastodon
     Friend Class UserData : Inherits Twitter.UserData
 #Region "XML names"
@@ -136,11 +137,14 @@ Namespace API.Mastodon
                                                                                                   If __imgFile.Extension.IsEmptyString Then __imgFile.Extension = "jpg"
                                                                                                   __imgFile.Path = MyFile.CutPath.Path
                                                                                                   If Not __imgFile.Exists Then GetWebFile(img, __imgFile, EDP.None)
+                                                                                                  If __imgFile.Exists Then IconBannerDownloaded = True
                                                                                               End If
                                                                                           End If
                                                                                       End Sub
-                                                __getImage.Invoke(.Value("header").IfNullOrEmpty(.Value("header_static")))
-                                                __getImage.Invoke(.Value("avatar").IfNullOrEmpty(.Value("avatar_static")))
+                                                If DownloadIconBanner Then
+                                                    __getImage.Invoke(.Value("header").IfNullOrEmpty(.Value("header_static")))
+                                                    __getImage.Invoke(.Value("avatar").IfNullOrEmpty(.Value("avatar_static")))
+                                                End If
                                             End If
                                         End With
                                     End If
@@ -235,8 +239,45 @@ Namespace API.Mastodon
             Return $"https://{Domain}/api/v1/statuses/" & "{0}"
         End Function
         Protected Overrides Sub ReparseMissing(ByVal Token As CancellationToken)
-            SinglePostUrl = GetSinglePostPattern(MyCredentials.Domain)
-            MyBase.ReparseMissing(Token)
+            Dim rList As New List(Of Integer)
+            Dim URL$ = String.Empty
+            Try
+                If ContentMissingExists Then
+                    Dim SinglePostUrl$ = GetSinglePostPattern(MyCredentials.Domain)
+                    Dim m As UserMedia
+                    Dim r$, PostDate$
+                    Dim j As EContainer
+                    ProgressPre.ChangeMax(_ContentList.Count)
+                    For i% = 0 To _ContentList.Count - 1
+                        ProgressPre.Perform()
+                        If _ContentList(i).State = UStates.Missing Then
+                            m = _ContentList(i)
+                            If Not m.Post.ID.IsEmptyString Then
+                                ThrowAny(Token)
+                                URL = String.Format(SinglePostUrl, m.Post.ID)
+                                r = Responser.GetResponse(URL,, EDP.ReturnValue)
+                                If Not r.IsEmptyString Then
+                                    j = JsonDocument.Parse(r)
+                                    If Not j Is Nothing Then
+                                        PostDate = String.Empty
+                                        If j.Contains("created_at") Then PostDate = j("created_at").Value Else PostDate = String.Empty
+                                        ObtainMedia(j, m.Post.ID, PostDate, m.URL_BASE)
+                                        rList.Add(i)
+                                        j.Dispose()
+                                    End If
+                                End If
+                            End If
+                        End If
+                    Next
+                End If
+            Catch ex As Exception
+                ProcessException(ex, Token, $"ReparseMissing error [{URL}]")
+            Finally
+                If rList.Count > 0 Then
+                    For i% = rList.Count - 1 To 0 Step -1 : _ContentList.RemoveAt(i) : Next
+                    rList.Clear()
+                End If
+            End Try
         End Sub
 #End Region
 #Region "DownloadSingleObject"

SCrawler/API/OnlyFans/Declarations.vb

@@ -0,0 +1,15 @@
+' Copyright (C) 2023  Andy https://github.com/AAndyProgram
+' This program is free software: you can redistribute it and/or modify
+' it under the terms of the GNU General Public License as published by
+' the Free Software Foundation, either version 3 of the License, or
+' (at your option) any later version.
+'
+' This program is distributed in the hope that it will be useful,
+' but WITHOUT ANY WARRANTY
+Imports PersonalUtilities.Functions.RegularExpressions
+Namespace API.OnlyFans
+    Friend Module Declarations
+        Friend ReadOnly DateProvider As New ADateTime("O")
+        Friend ReadOnly RegExPostID As RParams = RParams.DM("(?<=onlyfans\.com/)(\d+)", 0, EDP.ReturnValue)
+    End Module
+End Namespace

SCrawler/API/OnlyFans/SiteSettings.vb

@@ -0,0 +1,165 @@
+' Copyright (C) 2023  Andy https://github.com/AAndyProgram
+' This program is free software: you can redistribute it and/or modify
+' it under the terms of the GNU General Public License as published by
+' the Free Software Foundation, either version 3 of the License, or
+' (at your option) any later version.
+'
+' This program is distributed in the hope that it will be useful,
+' but WITHOUT ANY WARRANTY
+Imports SCrawler.API.Base
+Imports SCrawler.Plugin
+Imports SCrawler.Plugin.Attributes
+Imports PersonalUtilities.Forms
+Imports PersonalUtilities.Tools.Web.Clients
+Imports PersonalUtilities.Tools.Web.Cookies
+Imports PersonalUtilities.Functions.RegularExpressions
+Namespace API.OnlyFans
+    <Manifest("AndyProgram_OnlyFans"), SavedPosts, SeparatedTasks(1)>
+    Friend Class SiteSettings : Inherits SiteSettingsBase
+#Region "Icon"
+        Friend Overrides ReadOnly Property Icon As Icon
+            Get
+                Return My.Resources.SiteResources.OnlyFansIcon_32
+            End Get
+        End Property
+        Friend Overrides ReadOnly Property Image As Image
+            Get
+                Return My.Resources.SiteResources.OnlyFansPic_32
+            End Get
+        End Property
+#End Region
+#Region "Declarations"
+        Private Const HeaderBrowser As String = "sec-ch-ua"
+        Private Const HeaderUserID As String = "User-Id"
+        Private Const HeaderXBC As String = "X-Bc"
+        Private Const HeaderAppToken As String = "App-Token"
+        <PropertyOption(ControlText:=HeaderUserID, AllowNull:=False)>
+        Friend ReadOnly Property HH_USER_ID As PropertyValue
+        <PropertyOption(ControlText:=HeaderXBC, AllowNull:=False)>
+        Private ReadOnly Property HH_X_BC As PropertyValue
+        <PropertyOption(ControlText:=HeaderAppToken, AllowNull:=False)>
+        Private ReadOnly Property HH_APP_TOKEN As PropertyValue
+        <PropertyOption(ControlText:=HeaderBrowser, AllowNull:=False)>
+        Private ReadOnly Property HH_BROWSER As PropertyValue
+        <PropertyOption(AllowNull:=False)>
+        Private ReadOnly Property UserAgent As PropertyValue
+        Private Sub UpdateHeader(ByVal PropertyName As String, ByVal Value As String)
+            Dim hName$ = String.Empty
+            Dim isUserAgent As Boolean = False
+            Select Case PropertyName
+                Case NameOf(HH_USER_ID) : hName = HeaderUserID
+                Case NameOf(HH_X_BC) : hName = HeaderXBC
+                Case NameOf(HH_APP_TOKEN) : hName = HeaderAppToken
+                Case NameOf(HH_BROWSER) : hName = HeaderBrowser
+                Case NameOf(UserAgent) : isUserAgent = True
+            End Select
+            If Not hName.IsEmptyString Then
+                Responser.Headers.Add(hName, Value)
+            ElseIf isUserAgent Then
+                Responser.UserAgent = Value
+            End If
+        End Sub
+        <PXML("LastDateUpdated")> Private ReadOnly Property LastDateUpdated_XML As PropertyValue
+        Friend Property LastDateUpdated As Date
+            Get
+                Return LastDateUpdated_XML.Value
+            End Get
+            Set(ByVal d As Date)
+                LastDateUpdated_XML.Value = d
+            End Set
+        End Property
+        <PropertyOption(ControlText:="Use old authorization rules",
+                        ControlToolTip:="Use old dynamic rules (from 'DATAHOARDERS') or new ones (from 'DIGITALCRIMINALS')." & vbCr &
+                                        "Change this value only if you know what you are doing."), PXML>
+        Friend ReadOnly Property UseOldAuthRules As PropertyValue
+        <PropertyOption(ControlText:="Dynamic rules update", ControlToolTip:="'Dynamic rules' update interval (minutes). Default: 1440", LeftOffset:=110), PXML>
+        Friend ReadOnly Property DynamicRulesUpdateInterval As PropertyValue
+        <Provider(NameOf(DynamicRulesUpdateInterval), FieldsChecker:=True)>
+        Private ReadOnly Property DynamicRulesUpdateIntervalProvider As IFormatProvider
+        <PropertyOption(ControlText:="Dynamic rules",
+                        ControlToolTip:="Overwrite 'Dynamic rules' with this URL" & vbCr &
+                                        "Change this value only if you know what you are doing."), PXML>
+        Friend ReadOnly Property DynamicRules As PropertyValue
+#End Region
+#Region "Initializer"
+        Friend Sub New()
+            MyBase.New("OnlyFans", ".onlyfans.com")
+
+            With Responser
+                .Accept = "application/json, text/plain, */*"
+                .AutomaticDecompression = Net.DecompressionMethods.GZip
+                .CookiesExtractMode = Responser.CookiesExtractModes.Any
+                .CookiesExtractedAutoSave = False
+                .CookiesUpdateMode = CookieKeeper.UpdateModes.Disabled
+                .Cookies.ChangedAllowInternalDrop = False
+                .Cookies.Changed = False
+                With .Headers
+                    .Add(HttpHeaderCollection.GetSpecialHeader(MyHeaderTypes.SecChUaPlatform))
+                    .Add(HttpHeaderCollection.GetSpecialHeader(MyHeaderTypes.SecChUaMobile))
+                    .Add(HttpHeaderCollection.GetSpecialHeader(MyHeaderTypes.SecFetchDest))
+                    .Add(HttpHeaderCollection.GetSpecialHeader(MyHeaderTypes.SecFetchMode))
+                    .Add(HttpHeaderCollection.GetSpecialHeader(MyHeaderTypes.SecFetchSite))
+                    .Add(HttpHeaderCollection.GetSpecialHeader(MyHeaderTypes.DHT))
+                    .Add(HttpHeaderCollection.GetSpecialHeader(MyHeaderTypes.Authority, "onlyfans.com"))
+                    .Add(HttpHeaderCollection.GetSpecialHeader(MyHeaderTypes.AcceptEncoding))
+                    HH_USER_ID = New PropertyValue(.Value(HeaderUserID), GetType(String), Sub(v) UpdateHeader(NameOf(HH_USER_ID), v))
+                    HH_X_BC = New PropertyValue(.Value(HeaderXBC), GetType(String), Sub(v) UpdateHeader(NameOf(HH_X_BC), v))
+                    HH_APP_TOKEN = New PropertyValue(.Value(HeaderAppToken), GetType(String), Sub(v) UpdateHeader(NameOf(HH_APP_TOKEN), v))
+                    HH_BROWSER = New PropertyValue(.Value(HeaderBrowser), GetType(String), Sub(v) UpdateHeader(NameOf(HH_BROWSER), v))
+                End With
+                UserAgent = New PropertyValue(IIf(.UserAgentExists, .UserAgent, String.Empty), GetType(String), Sub(v) UpdateHeader(NameOf(UserAgent), v))
+            End With
+
+            LastDateUpdated_XML = New PropertyValue(Now.AddYears(-1), GetType(Date))
+            UseOldAuthRules = New PropertyValue(False)
+            DynamicRulesUpdateInterval = New PropertyValue(60 * 24)
+            DynamicRulesUpdateIntervalProvider = New FieldsCheckerProviderSimple(Function(v) IIf(AConvert(Of Integer)(v, 0) > 0, v, Nothing),
+                                                                                 "The value of [{0}] field must be greater than 0")
+            DynamicRules = New PropertyValue(String.Empty, GetType(String))
+            UserRegex = RParams.DMS("onlyfans.com/(\w+)", 1, EDP.ReturnValue)
+            UrlPatternUser = "https://onlyfans.com/{0}"
+            ImageVideoContains = "onlyfans.com"
+        End Sub
+#End Region
+#Region "GetInstance"
+        Friend Overrides Function GetInstance(ByVal What As ISiteSettings.Download) As IPluginContentProvider
+            Return New UserData
+        End Function
+#End Region
+#Region "Update"
+        Friend Overrides Sub Update()
+            If _SiteEditorFormOpened Then Responser.Cookies.Changed = False
+            MyBase.Update()
+        End Sub
+#End Region
+#Region "Download"
+        Friend Overrides Function BaseAuthExists() As Boolean
+            Return Responser.CookiesExists And {HH_USER_ID, HH_X_BC, HH_APP_TOKEN, HH_BROWSER, UserAgent}.All(Function(v) ACheck(v.Value))
+        End Function
+        Friend Overrides Function ReadyToDownload(ByVal What As ISiteSettings.Download) As Boolean
+            Return BaseAuthExists() And Not SessionAborted
+        End Function
+        Friend Property SessionAborted As Boolean = False
+        Friend Overrides Sub AfterDownload(ByVal User As Object, ByVal What As ISiteSettings.Download)
+            Responser.Cookies.Update(DirectCast(User, UserData).CCookie)
+        End Sub
+        Friend Overrides Sub DownloadDone(ByVal What As ISiteSettings.Download)
+            MyBase.DownloadDone(What)
+            SessionAborted = False
+            If Responser.Cookies.Changed Then Responser.SaveCookies() : Responser.Cookies.Changed = False
+        End Sub
+#End Region
+#Region "GetUserUrl, GetUserPostUrl"
+        Friend Overrides Function GetUserUrl(ByVal User As IPluginContentProvider) As String
+            Return String.Format(UrlPatternUser, If(User.ID.IsEmptyString, User.Name, $"u{User.ID}"))
+        End Function
+        Friend Overrides Function GetUserPostUrl(ByVal User As UserDataBase, ByVal Media As UserMedia) As String
+            If Not Media.Post.ID.IsEmptyString Then
+                Return String.Format("https://onlyfans.com/{0}/{1}", Media.Post.ID, If(User.ID.IsEmptyString, User.Name, $"u{User.ID}"))
+            Else
+                Return String.Empty
+            End If
+        End Function
+#End Region
+    End Class
+End Namespace

SCrawler/API/OnlyFans/UserData.vb

@@ -0,0 +1,362 @@
+' Copyright (C) 2023  Andy https://github.com/AAndyProgram
+' This program is free software: you can redistribute it and/or modify
+' it under the terms of the GNU General Public License as published by
+' the Free Software Foundation, either version 3 of the License, or
+' (at your option) any later version.
+'
+' This program is distributed in the hope that it will be useful,
+' but WITHOUT ANY WARRANTY
+Imports System.Threading
+Imports SCrawler.API.Base
+Imports SCrawler.API.YouTube.Objects
+Imports PersonalUtilities.Functions.XML
+Imports PersonalUtilities.Functions.RegularExpressions
+Imports PersonalUtilities.Tools.Web.Clients
+Imports PersonalUtilities.Tools.Web.Clients.EventArguments
+Imports PersonalUtilities.Tools.Web.Cookies
+Imports PersonalUtilities.Tools.Web.Documents.JSON
+Imports UTypes = SCrawler.API.Base.UserMedia.Types
+Imports UStates = SCrawler.API.Base.UserMedia.States
+Namespace API.OnlyFans
+    Friend Class UserData : Inherits UserDataBase
+#Region "Declarations"
+        Friend Property CCookie As CookieKeeper = Nothing
+        Private Const HeaderSign As String = "Sign"
+        Private Const HeaderTime As String = "Time"
+        Private ReadOnly Property MySettings As SiteSettings
+            Get
+                Return HOST.Source
+            End Get
+        End Property
+        Protected Overrides Sub LoadUserInformation_OptionalFields(ByRef Container As XmlFile, ByVal Loading As Boolean)
+        End Sub
+#End Region
+#Region "Download functions"
+        Protected Overrides Sub DownloadDataF(ByVal Token As CancellationToken)
+            If Not CCookie Is Nothing Then CCookie.Dispose()
+            CCookie = Responser.Cookies.Copy
+            Responser.Cookies.Clear()
+            AddHandler Responser.ResponseReceived, AddressOf OnResponseReceived
+            UpdateCookieHeader()
+            DownloadData(IIf(IsSavedPosts, 0, String.Empty), Token)
+        End Sub
+        Private Sub OnResponseReceived(ByVal Sender As Object, ByVal e As WebDataResponse)
+            If e.CookiesExists Then
+                CCookie.Update(e.Cookies, CookieKeeper.UpdateModes.ReplaceByNameAll,, EDP.ReturnValue)
+                UpdateCookieHeader()
+            End If
+        End Sub
+        Private Sub UpdateCookieHeader()
+            Responser.Headers.Add("Cookie", CCookie.ToString(False))
+        End Sub
+        Private Const BaseUrlPattern As String = "https://onlyfans.com{0}"
+        Private Overloads Sub DownloadData(ByVal Cursor As String, ByVal Token As CancellationToken)
+
+            Dim url$ = String.Empty
+            Dim _complete As Boolean = True
+            Do
+                Try
+                    Dim tmpCursor$ = String.Empty
+                    Dim hasMore As Boolean = False
+                    Dim path$ = String.Empty
+                    Dim postDate$, postID$
+                    Dim n As EContainer
+                    Dim mediaList As List(Of UserMedia)
+                    Dim mediaResult As Boolean
+
+                    If IsSavedPosts Then
+                        path = $"/api2/v2/posts/bookmarks/all/?format=infinite&limit=10&offset={Cursor}"
+                    Else
+                        If ID.IsEmptyString Then GetUserID()
+                        If ID.IsEmptyString Then Throw New ArgumentNullException("ID", "Unable to get user ID")
+
+                        path = $"/api2/v2/users/{ID}/posts/medias?limit=50&order=publish_date_desc&skip_users=all&format=infinite&counters=1"
+                        If Not Cursor.IsEmptyString Then path &= $"&counters=0&beforePublishTime={Cursor}" Else path &= "&counters=1"
+                    End If
+
+                    If UpdateSignature(path) Then
+                        url = String.Format(BaseUrlPattern, path)
+                        ThrowAny(Token)
+
+                        Dim r$ = Responser.GetResponse(url)
+                        If Not r.IsEmptyString Then
+                            Using j As EContainer = JsonDocument.Parse(r)
+                                If j.ListExists Then
+                                    If IsSavedPosts Then
+                                        hasMore = j.Value("hasMore").FromXML(Of Boolean)(False)
+                                    Else
+                                        tmpCursor = j.Value("tailMarker")
+                                        hasMore = Not tmpCursor.IsEmptyString
+                                    End If
+                                    With j("list")
+                                        If .ListExists Then
+                                            ProgressPre.ChangeMax(.Count)
+                                            For Each n In .Self
+                                                ProgressPre.Perform()
+                                                postID = n.Value("id")
+                                                postDate = n.Value("postedAt")
+
+                                                If Not _TempPostsList.Contains(postID) Then
+                                                    _TempPostsList.Add(postID)
+                                                Else
+                                                    Exit Sub
+                                                End If
+
+                                                Select Case MyBase.CheckDatesLimit(postDate, DateProvider)
+                                                    Case DateResult.Skip : Continue For
+                                                    Case DateResult.Exit : Exit Sub
+                                                End Select
+
+                                                mediaResult = False
+                                                mediaList = TryCreateMedia(n, postID, postDate, mediaResult)
+                                                If mediaResult Then _TempMediaList.ListAddList(mediaList, LNC)
+                                            Next
+                                        Else
+                                            hasMore = False
+                                        End If
+                                    End With
+                                End If
+                            End Using
+                        End If
+                    End If
+
+                    If hasMore Then
+                        If IsSavedPosts Then tmpCursor = CInt(Cursor.IfNullOrEmpty(0)) + 10
+                        DownloadData(tmpCursor, Token)
+                    End If
+                Catch ex As Exception
+                    If ProcessException(ex, Token, $"data downloading error [{url}]") = 2 Then _complete = False
+                End Try
+            Loop While Not _complete
+        End Sub
+        Private Function TryCreateMedia(ByVal n As EContainer, ByVal PostID As String, Optional ByVal PostDate As String = Nothing,
+                                        Optional ByRef Result As Boolean = False) As List(Of UserMedia)
+            Dim postUrl$, ext$
+            Dim t As UTypes
+            Dim mList As New List(Of UserMedia)
+            Result = False
+            With n("media")
+                If .ListExists Then
+                    For Each m In .Self
+                        postUrl = m.Value({"source"}, "source").IfNullOrEmpty(m.Value("full"))
+                        Select Case m.Value("type")
+                            Case "photo" : t = UTypes.Picture : ext = "jpg"
+                            Case "video" : t = UTypes.Video : ext = "mp4"
+                            Case Else : t = UTypes.Undefined : ext = String.Empty
+                        End Select
+                        If Not t = UTypes.Undefined And Not postUrl.IsEmptyString Then
+                            Dim media As New UserMedia(postUrl, t) With {
+                                        .Post = New UserPost(PostID, AConvert(Of Date)(PostDate, DateProvider, Nothing))}
+                            media.File.Extension = ext
+                            Result = True
+                            mList.Add(media)
+                        End If
+                    Next
+                End If
+            End With
+            Return mList
+        End Function
+        Private Sub GetUserID()
+            Dim path$ = $"/api2/v2/users/{Name}"
+            Dim url$ = String.Format(BaseUrlPattern, path)
+            Try
+                If ID.IsEmptyString AndAlso UpdateSignature(path) Then
+                    Dim r$ = Responser.GetResponse(url)
+                    If Not r.IsEmptyString Then
+                        Using j As EContainer = JsonDocument.Parse(r)
+                            If j.ListExists Then
+                                ID = j.Value("id")
+                                If Not ID.IsEmptyString Then _ForceSaveUserInfo = True
+                                UserSiteNameUpdate(j.Value("name"))
+                                UserDescriptionUpdate(j.Value("about"))
+                                Dim a As Action(Of String) = Sub(ByVal address As String)
+                                                                 If Not address.IsEmptyString Then
+                                                                     Dim f As SFile = address
+                                                                     f.Separator = "\"
+                                                                     f.Path = DownloadContentDefault_GetRootDir()
+                                                                     If Not f.Exists Then GetWebFile(address, f, EDP.None)
+                                                                 End If
+                                                             End Sub
+                                a.Invoke(j.Value("avatar"))
+                                a.Invoke(j.Value("header"))
+                            End If
+                        End Using
+                    End If
+                End If
+            Catch ex As Exception
+                ProcessException(ex, Nothing, $"user info parsing error [{url}]")
+            End Try
+        End Sub
+        Protected Overrides Sub ReparseMissing(ByVal Token As CancellationToken)
+            Const PathPattern$ = "/api2/v2/posts/{0}?skip_users=all"
+            Dim rList As New List(Of Integer)
+            Dim URL$ = String.Empty
+            Try
+                If ContentMissingExists Then
+                    Dim m As UserMedia
+                    Dim mList As List(Of UserMedia)
+                    Dim mediaResult As Boolean
+                    Dim r$, path$, postDate$
+                    Dim j As EContainer
+                    ProgressPre.ChangeMax(_ContentList.Count)
+                    For i% = 0 To _ContentList.Count - 1
+                        ProgressPre.Perform()
+                        If _ContentList(i).State = UStates.Missing Then
+                            m = _ContentList(i)
+                            If Not m.Post.ID.IsEmptyString Then
+                                ThrowAny(Token)
+                                path = String.Format(PathPattern, m.Post.ID)
+                                If UpdateSignature(path) Then
+                                    URL = String.Format(BaseUrlPattern, path)
+                                    r = Responser.GetResponse(URL,, EDP.ReturnValue)
+                                    If Not r.IsEmptyString Then
+                                        j = JsonDocument.Parse(r)
+                                        If Not j Is Nothing Then
+                                            postDate = j.Value("postedAt")
+                                            mediaResult = False
+                                            mList = TryCreateMedia(j, m.Post.ID, postDate, mediaResult)
+                                            If mediaResult Then
+                                                _TempMediaList.ListAddList(mList, LNC)
+                                                rList.Add(i)
+                                                mList.Clear()
+                                            End If
+                                            j.Dispose()
+                                        End If
+                                    End If
+                                End If
+                            End If
+                        End If
+                    Next
+                End If
+            Catch ex As Exception
+                ProcessException(ex, Token, $"ReparseMissing error [{URL}]")
+            Finally
+                If rList.Count > 0 Then
+                    For i% = rList.Count - 1 To 0 Step -1 : _ContentList.RemoveAt(i) : Next
+                    rList.Clear()
+                End If
+            End Try
+        End Sub
+#End Region
+#Region "DownloadSingleObject"
+        Protected Overrides Sub DownloadSingleObject_GetPosts(ByVal Data As IYouTubeMediaContainer, ByVal Token As CancellationToken)
+            Dim postID$ = RegexReplace(Data.URL, RegExPostID)
+            If Not postID.IsEmptyString Then _ContentList.Add(New UserMedia With {.Post = postID, .State = UStates.Missing}) : ReparseMissing(Token)
+        End Sub
+#End Region
+#Region "Auth"
+        Private ReadOnly Property AuthFile As SFile
+            Get
+                Dim f As SFile = MySettings.Responser.File
+                f.Name &= "_Auth"
+                f.Extension = "json"
+                Return f
+            End Get
+        End Property
+        Private Function UpdateSignature(ByVal Path As String, Optional ByVal ForceUpdateAuth As Boolean = False) As Boolean
+            Try
+                If UpdateAuthFile(ForceUpdateAuth) Then
+                    Const nullMsg$ = "The auth parameter is null"
+                    Dim j As EContainer = JsonDocument.Parse(AuthFile.GetText)
+                    Dim pattern$ = j.Value("format")
+                    If pattern.IsEmptyString Then Throw New ArgumentNullException("format", nullMsg)
+                    pattern = pattern.Replace("{}", "{0}").Replace("{:x}", "{1:x}")
+
+                    Dim li%() = j("checksum_indexes").Select(Function(e) CInt(e(0).Value)).ToArray
+
+                    If Not li.ListExists Then Throw New ArgumentNullException("checksum_indexes", nullMsg)
+                    If j.Value("static_param").IsEmptyString Then Throw New ArgumentNullException("static_param", nullMsg)
+                    If j.Value("checksum_constant").IsEmptyString Then Throw New ArgumentNullException("checksum_constant", nullMsg)
+
+                    Dim t$ = ADateTime.ConvertToUnix64(Now.ToUniversalTime).ToString
+                    Dim h$ = String.Join(vbLf, j.Value("static_param"), t, Path, MySettings.HH_USER_ID.Value.ToString)
+
+                    Dim hash$ = GetHashSha1(h)
+                    Dim hashBytes() As Byte = System.Text.Encoding.ASCII.GetBytes(hash)
+                    Dim hashSum% = li.Sum(Function(i) hashBytes(i)) + CInt(j.Value("checksum_constant"))
+                    Dim sign$ = String.Format(pattern, hash, Math.Abs(hashSum))
+
+                    '#If DEBUG Then
+                    'Debug.WriteLine(sign)
+                    'Debug.WriteLine(t)
+                    '#End If
+
+                    Responser.Headers.Add(HeaderSign, sign)
+                    Responser.Headers.Add(HeaderTime, t)
+
+                    j.Dispose()
+                    Return True
+                Else
+                    Return False
+                End If
+            Catch ex As Exception
+                Return ErrorsDescriber.Execute(EDP.SendToLog + EDP.ReturnValue, ex, $"{ToStringForLog()}: UpdateSignature", False)
+            End Try
+        End Function
+        Private Function UpdateAuthFile(ByVal Force As Boolean) As Boolean
+            Const urlOld$ = "https://raw.githubusercontent.com/DATAHOARDERS/dynamic-rules/main/onlyfans.json"
+            Const urlNew$ = "https://raw.githubusercontent.com/DIGITALCRIMINALS/dynamic-rules/main/onlyfans.json"
+            Try
+                If MySettings.LastDateUpdated.AddMinutes(CInt(MySettings.DynamicRulesUpdateInterval.Value)) < Now Or Not AuthFile.Exists Or Force Then
+                    Dim r$ = GetWebString(If(ACheck(Of String)(MySettings.DynamicRules.Value),
+                                             CStr(MySettings.DynamicRules.Value),
+                                             IIf(MySettings.UseOldAuthRules.Value, urlOld, urlNew)),, EDP.ReturnValue)
+                    If Not r.IsEmptyString Then
+                        Using j As EContainer = JsonDocument.Parse(r, EDP.ReturnValue)
+                            If j.ListExists Then
+                                If Not j.Value("format").IsEmptyString And j("checksum_indexes").ListExists And
+                                   Not j.Value("static_param").IsEmptyString And Not j.Value("checksum_constant").IsEmptyString Then _
+                                   TextSaver.SaveTextToFile(r, AuthFile, True, False, EDP.ThrowException) : MySettings.LastDateUpdated = Now
+                            End If
+                        End Using
+                    End If
+                End If
+                Return AuthFile.Exists
+            Catch ex As Exception
+                Return ErrorsDescriber.Execute(EDP.SendToLog + EDP.ReturnValue, ex, $"{ToStringForLog()}: UpdateAuthFile", False)
+            End Try
+        End Function
+        Private Function GetHashSha1(ByVal Input As String) As String
+            Dim s As New Security.Cryptography.SHA1CryptoServiceProvider
+            Dim inputBytes() As Byte = System.Text.Encoding.UTF8.GetBytes(Input)
+            Dim hashBytes() As Byte = s.ComputeHash(inputBytes)
+            s.Dispose()
+            Dim result As String = String.Empty
+            For Each b As Byte In hashBytes : result &= b.ToString("x2") : Next
+            Return result
+        End Function
+#End Region
+#Region "DownloadContent"
+        Protected Overrides Sub DownloadContent(ByVal Token As CancellationToken)
+            DownloadContentDefault(Token)
+        End Sub
+#End Region
+#Region "DownloadingException"
+        Private _DownloadingException_AuthFileUpdate As Boolean = False
+        Protected Overrides Function DownloadingException(ByVal ex As Exception, ByVal Message As String, Optional ByVal FromPE As Boolean = False,
+                                                          Optional ByVal EObj As Object = Nothing) As Integer
+            If Responser.StatusCode = Net.HttpStatusCode.BadRequest Then
+                If Not _DownloadingException_AuthFileUpdate AndAlso UpdateAuthFile(True) Then
+                    _DownloadingException_AuthFileUpdate = True
+                    Return 2
+                Else
+                    MySettings.SessionAborted = True
+                    MyMainLOG = $"{ToStringForLog()}: OnlyFans credentials expired"
+                    Return 1
+                End If
+            ElseIf Responser.StatusCode = Net.HttpStatusCode.NotFound Then
+                UserExists = False
+                Return 1
+            Else
+                Return 0
+            End If
+        End Function
+#End Region
+#Region "IDisposable Support"
+        Protected Overrides Sub Dispose(ByVal disposing As Boolean)
+            If Not disposedValue And disposing Then CCookie.DisposeIfReady(False) : CCookie = Nothing
+            MyBase.Dispose(disposing)
+        End Sub
+#End Region
+    End Class
+End Namespace

SCrawler/API/Pinterest/UserData.vb

@@ -270,11 +270,11 @@ Namespace API.Pinterest
                 If IsBoardsRequested Then
                     If ErrorOutputData.Count > 0 Then
                         If Await Task.Run(Of Boolean)(Function() ErrorOutputData.Exists(Function(ee) Not ee.IsEmptyString AndAlso
-                                                                                                     ee.StartsWith(UrlTextStart))) Then Kill(EDP.None)
+                                                                                                     ee.StartsWith(UrlTextStart))) Then Kill()
                     End If
                 Else
                     If Await Task.Run(Of Boolean)(Function() Not Value.IsEmptyString AndAlso
-                                                             Source._TempPostsList.Exists(Function(v) Value.Contains(v))) Then Kill(EDP.None)
+                                                             Source._TempPostsList.Exists(Function(v) Value.Contains(v))) Then Kill()
                 End If
             End Function
         End Class

SCrawler/API/Reddit/UserData.vb

@@ -427,11 +427,14 @@ Namespace API.Reddit
                                                                                      If f.Extension.IsEmptyString Then f.Extension = "jpg"
                                                                                      f.Path = dir.Path
                                                                                      If Not f.Exists Then GetWebFile(img, f, EDP.ReturnValue)
+                                                                                     If f.Exists Then IconBannerDownloaded = True
                                                                                  End If
                                                                              End If
                                                                          End Sub
-                                    __getFile.Invoke(.Value("icon_img"))
-                                    __getFile.Invoke(.Value("banner_img"))
+                                    If DownloadIconBanner Then
+                                        __getFile.Invoke(.Value("icon_img"))
+                                        __getFile.Invoke(.Value("banner_img"))
+                                    End If
                                 End With
                             End If
                         End Using
@@ -582,12 +585,32 @@ Namespace API.Reddit
                             End If
                         End If
                         If Not added And e.Contains("preview") Then
-                            tmpUrl = If(e.ItemF({"preview", "images", eCount, "source", "url"})?.Value, String.Empty)
-                            If Not tmpUrl.IsEmptyString Then
-                                _TempMediaList.ListAddValue(MediaFromData(UTypes.Picture, tmpUrl, PostID, PostDate, UserID), LNC)
-                                _TotalPostsDownloaded += 1
-                                added = True
-                            End If
+                            With e.ItemF({"preview", "images", eCount})
+                                If .ListExists Then
+                                    tmpType = UTypes.Undefined
+                                    tmpUrl = String.Empty
+                                    Dim sv$ = .Value({"source"}, "url")
+                                    If Not sv.IsEmptyString AndAlso sv.Contains(".gif") Then
+                                        tmpUrl = .Value({"variants", "gif", "source"}, "url")
+                                        If Not tmpUrl.IsEmptyString Then tmpType = UTypes.GIF
+                                    End If
+                                    If tmpUrl.IsEmptyString Then
+                                        tmpUrl = .Value({"variants", "mp4", "source"}, "url")
+                                        If Not tmpUrl.IsEmptyString Then tmpType = UTypes.Video
+                                    End If
+                                    If tmpUrl.IsEmptyString Then
+                                        tmpUrl = .Value({"source"}, "url")
+                                        If Not tmpUrl.IsEmptyString Then tmpType = UTypes.Picture
+                                    End If
+                                    If Not tmpUrl.IsEmptyString And Not tmpType = UTypes.Undefined Then
+                                        Dim m As UserMedia = MediaFromData(tmpType, tmpUrl, PostID, PostDate, UserID)
+                                        If tmpType = UTypes.Video Then m.File.Extension = "mp4"
+                                        _TempMediaList.ListAddValue(m, LNC)
+                                        _TotalPostsDownloaded += 1
+                                        added = True
+                                    End If
+                                End If
+                            End With
                         End If
                     End If
                 End If

SCrawler/API/Twitter/Declarations.vb

@@ -14,7 +14,6 @@ Namespace API.Twitter
         Friend Const TwitterSite As String = "Twitter"
         Friend Const TwitterSiteKey As String = "AndyProgram_Twitter"
         Friend ReadOnly DateProvider As ADateTime = GetDateProvider()
-        Friend ReadOnly VideoNode As NodeParams() = {New NodeParams("video_info", True, True, True, True, 10)}
         Friend ReadOnly VideoSizeRegEx As RParams = RParams.DMS("\d+x(\d+)", 1, EDP.ReturnValue)
         Private Function GetDateProvider() As ADateTime
             Dim n As DateTimeFormatInfo = CultureInfo.GetCultureInfo("en-us").DateTimeFormat.Clone

SCrawler/API/Twitter/EditorExchangeOptions.vb

@@ -7,6 +7,7 @@
 ' This program is distributed in the hope that it will be useful,
 ' but WITHOUT ANY WARRANTY
 Imports SCrawler.Plugin.Attributes
+Imports DModels = SCrawler.API.Twitter.UserData.DownloadModels
 Namespace API.Twitter
     Friend Class EditorExchangeOptions
         Private Const DefaultOffset As Integer = 100
@@ -23,6 +24,18 @@ Namespace API.Twitter
                   ToolTip:="Existing files will be checked for duplicates and duplicates removed." & vbCr &
                            "Works only on the first activation 'Use MD5 comparison'.", LeftOffset:=DefaultOffset)>
         Friend Property RemoveExistingDuplicates As Boolean = False
+        <PSetting(Address:=SettingAddress.User,
+                  Caption:="Download model 'Media'",
+                  ToolTip:="Download the data using the 'https://twitter.com/UserName/media' command.", LeftOffset:=DefaultOffset)>
+        Friend Overridable Property DownloadModelMedia As Boolean = False
+        <PSetting(Address:=SettingAddress.User,
+                  Caption:="Download model 'Profile'",
+                  ToolTip:="Download the data using the 'https://twitter.com/UserName' command.", LeftOffset:=DefaultOffset)>
+        Friend Overridable Property DownloadModelProfile As Boolean = False
+        <PSetting(Address:=SettingAddress.User,
+                  Caption:="Download model 'Search'",
+                  ToolTip:="Download the data using the 'https://twitter.com/search?q=from:UserName+include:nativeretweets' command.", LeftOffset:=DefaultOffset)>
+        Friend Overridable Property DownloadModelSearch As Boolean = False
         Private ReadOnly Property MySettings As Object
         Friend Sub New(ByVal s As SiteSettings)
             GifsDownload = s.GifsDownload.Value
@@ -44,6 +57,14 @@ Namespace API.Twitter
             GifsPrefix = u.GifsPrefix
             UseMD5Comparison = u.UseMD5Comparison
             RemoveExistingDuplicates = u.RemoveExistingDuplicates
+            If Not TypeOf u Is Mastodon.UserData Then
+                Dim dm As DModels() = EnumExtract(Of DModels)(u.DownloadModel)
+                If dm.ListExists Then
+                    DownloadModelMedia = dm.Contains(DModels.Media)
+                    DownloadModelProfile = dm.Contains(DModels.Profile)
+                    DownloadModelSearch = dm.Contains(DModels.Search)
+                End If
+            End If
             MySettings = u.HOST.Source
         End Sub
     End Class

SCrawler/API/Twitter/SiteSettings.vb

@@ -12,7 +12,7 @@ Imports SCrawler.Plugin.Attributes
 Imports PersonalUtilities.Functions.RegularExpressions
 Imports PersonalUtilities.Tools.Web.Clients
 Namespace API.Twitter
-    <Manifest(TwitterSiteKey), SavedPosts, SpecialForm(False)>
+    <Manifest(TwitterSiteKey), SavedPosts, SeparatedTasks, SpecialForm(False)>
     Friend Class SiteSettings : Inherits SiteSettingsBase
 #Region "Token names"
         Friend Const Header_Authorization As String = "authorization"
@@ -41,19 +41,20 @@ Namespace API.Twitter
                 Return My.Resources.SiteResources.TwitterPic_400
             End Get
         End Property
-#Region "Auth"
-        <PropertyOption(AllowNull:=False, IsAuth:=True, ControlText:="Authorization",
-                        ControlToolTip:="Set authorization from [authorization] response header. This field must start from [Bearer] key word")>
-        Private ReadOnly Property Auth As PropertyValue
-        <PropertyOption(AllowNull:=False, IsAuth:=True, ControlText:="Token", ControlToolTip:="Set token from [x-csrf-token] response header")>
-        Private ReadOnly Property Token As PropertyValue
-#End Region
+        'TODELETE: twitter headers
+        '#Region "Auth"
+        '        <PropertyOption(AllowNull:=False, IsAuth:=False, ControlText:="Authorization",
+        '                        ControlToolTip:="Set authorization from [authorization] response header. This field must start from [Bearer] key word")>
+        '        Private ReadOnly Property Auth As PropertyValue
+        '        <PropertyOption(AllowNull:=False, IsAuth:=False, ControlText:="Token", ControlToolTip:="Set token from [x-csrf-token] response header")>
+        '        Private ReadOnly Property Token As PropertyValue
+        '#End Region
 #Region "Other properties"
-        <PropertyOption(IsAuth:=False, ControlText:=GifsDownload_Text), PXML>
+        <PropertyOption(ControlText:=GifsDownload_Text), PXML>
         Friend ReadOnly Property GifsDownload As PropertyValue
-        <PropertyOption(IsAuth:=False, ControlText:=GifsSpecialFolder_Text, ControlToolTip:=GifsSpecialFolder_ToolTip), PXML>
+        <PropertyOption(ControlText:=GifsSpecialFolder_Text, ControlToolTip:=GifsSpecialFolder_ToolTip), PXML>
         Friend ReadOnly Property GifsSpecialFolder As PropertyValue
-        <PropertyOption(IsAuth:=False, ControlText:=GifsPrefix_Text, ControlToolTip:=GifsPrefix_ToolTip), PXML>
+        <PropertyOption(ControlText:=GifsPrefix_Text, ControlToolTip:=GifsPrefix_ToolTip), PXML>
         Friend ReadOnly Property GifsPrefix As PropertyValue
         <Provider(NameOf(GifsSpecialFolder), Interaction:=True), Provider(NameOf(GifsPrefix), Interaction:=True)>
         Private ReadOnly Property GifStringChecker As IFormatProvider
@@ -75,68 +76,52 @@ Namespace API.Twitter
                 Throw New NotImplementedException("[GetFormat] is not available in the context of [GifStringProvider]")
             End Function
         End Class
-        <PropertyOption(IsAuth:=False, ControlText:=UseMD5Comparison_Text, ControlToolTip:=UseMD5Comparison_ToolTip), PXML>
+        <PropertyOption(ControlText:=UseMD5Comparison_Text, ControlToolTip:=UseMD5Comparison_ToolTip), PXML>
         Friend ReadOnly Property UseMD5Comparison As PropertyValue
+        <PXML, PropertyOption(ControlText:="Concurrent downloads", ControlToolTip:="The number of concurrent downloads.", LeftOffset:=120), TaskCounter>
+        Friend ReadOnly Property ConcurrentDownloads As PropertyValue
 #End Region
-        Friend Overrides ReadOnly Property Responser As Responser
-        Private Sub ChangeResponserFields(ByVal PropName As String, ByVal Value As Object)
-            If Not PropName.IsEmptyString Then
-                Dim f$ = String.Empty
-                Select Case PropName
-                    Case NameOf(Auth) : f = Header_Authorization
-                    Case NameOf(Token) : f = Header_Token
-                End Select
-                If Not f.IsEmptyString Then
-                    Responser.Headers.Remove(f)
-                    If Not CStr(Value).IsEmptyString Then Responser.Headers.Add(f, CStr(Value))
-                    Responser.SaveSettings()
-                End If
-            End If
-        End Sub
+        'TODELETE: twitter headers
+        'Private Sub ChangeResponserFields(ByVal PropName As String, ByVal Value As Object)
+        '    If Not PropName.IsEmptyString Then
+        '        Dim f$ = String.Empty
+        '        Select Case PropName
+        '            Case NameOf(Auth) : f = Header_Authorization
+        '            Case NameOf(Token) : f = Header_Token
+        '        End Select
+        '        If Not f.IsEmptyString Then
+        '            Responser.Headers.Remove(f)
+        '            If Not CStr(Value).IsEmptyString Then Responser.Headers.Add(f, CStr(Value))
+        '            Responser.SaveSettings()
+        '        End If
+        '    End If
+        'End Sub
 #End Region
         Friend Sub New()
-            MyBase.New(TwitterSite)
-            Responser = New Responser($"{SettingsFolderName}\Responser_{Site}.xml") With {.DeclaredError = EDP.ThrowException}
+            MyBase.New(TwitterSite, "twitter.com")
 
-            Dim a$ = String.Empty
-            Dim t$ = String.Empty
+            'TODELETE: twitter headers
+            'Dim a$ = String.Empty
+            'Dim t$ = String.Empty
 
             With Responser
-                If .File.Exists Then
-                    .CookiesDomain = "twitter.com"
-                    .CookiesEncryptKey = SettingsCLS.CookieEncryptKey
-                    .LoadSettings()
-                    a = .Headers.Value(Header_Authorization)
-                    t = .Headers.Value(Header_Token)
-                Else
-                    .ContentType = "application/json"
-                    .Accept = "*/*"
-                    .CookiesDomain = "twitter.com"
-                    .CookiesEncryptKey = SettingsCLS.CookieEncryptKey
-                    .Decoders.Add(SymbolsConverter.Converters.Unicode)
-                    .Headers.Add("sec-ch-ua", """Chromium"";v=""112"", ""Google Chrome"";v=""112"", ""Not:A-Brand"";v=""99""")
-                    .Headers.Add("sec-ch-ua-mobile", "?0")
-                    .Headers.Add("sec-fetch-dest", "empty")
-                    .Headers.Add("sec-fetch-mode", "cors")
-                    .Headers.Add("sec-fetch-site", "same-origin")
-                    .Headers.Add(Header_Token, String.Empty)
-                    .Headers.Add("x-twitter-active-user", "yes")
-                    .Headers.Add("x-twitter-auth-type", "OAuth2Session")
-                    .Headers.Add(Header_Authorization, String.Empty)
-                    .SaveSettings()
-                End If
+                'TODELETE: twitter headers
+                'a = .Headers.Value(Header_Authorization)
+                't = .Headers.Value(Header_Token)
                 .Cookies.ChangedAllowInternalDrop = False
                 .Cookies.Changed = False
             End With
 
-            Auth = New PropertyValue(a, GetType(String), Sub(v) ChangeResponserFields(NameOf(Auth), v))
-            Token = New PropertyValue(t, GetType(String), Sub(v) ChangeResponserFields(NameOf(Token), v))
+            'TODELETE: twitter headers
+            'Auth = New PropertyValue(a, GetType(String), Sub(v) ChangeResponserFields(NameOf(Auth), v))
+            'Token = New PropertyValue(t, GetType(String), Sub(v) ChangeResponserFields(NameOf(Token), v))
 
             GifsDownload = New PropertyValue(True)
             GifsSpecialFolder = New PropertyValue(String.Empty, GetType(String))
             GifsPrefix = New PropertyValue("GIF_")
             GifStringChecker = New GifStringProvider
             UseMD5Comparison = New PropertyValue(False)
+            ConcurrentDownloads = New PropertyValue(1)
 
             UserRegex = RParams.DMS("[htps:/]{7,8}.*?twitter.com/([^/]+)", 1)
             UrlPatternUser = "https://twitter.com/{0}"
@@ -151,18 +136,10 @@ Namespace API.Twitter
             Return $"https://twitter.com/{User.Name}/status/{Media.Post.ID}"
         End Function
         Friend Overrides Function BaseAuthExists() As Boolean
-            Return Responser.CookiesExists And ACheck(Token.Value) And ACheck(Auth.Value)
+            Return Responser.CookiesExists
         End Function
         Friend Overrides Function Available(ByVal What As ISiteSettings.Download, ByVal Silent As Boolean) As Boolean
-            If MyBase.Available(What, Silent) Then
-                If What = ISiteSettings.Download.SavedPosts Then
-                    Return Settings.GalleryDLFile.Exists
-                Else
-                    Return True
-                End If
-            Else
-                Return False
-            End If
+            Return Settings.GalleryDLFile.Exists And BaseAuthExists()
         End Function
         Friend Overrides Sub UserOptions(ByRef Options As Object, ByVal OpenForm As Boolean)
             If Options Is Nothing OrElse (Not TypeOf Options Is EditorExchangeOptions OrElse

SCrawler/API/Twitter/UserData.vb

@@ -6,29 +6,50 @@
 '
 ' This program is distributed in the hope that it will be useful,
 ' but WITHOUT ANY WARRANTY
-Imports System.Net
 Imports System.Threading
 Imports SCrawler.API.Base
 Imports SCrawler.API.YouTube.Objects
 Imports PersonalUtilities.Functions.XML
 Imports PersonalUtilities.Functions.RegularExpressions
-Imports PersonalUtilities.Tools.Web.Clients
+Imports PersonalUtilities.Tools
 Imports PersonalUtilities.Tools.Web.Documents.JSON
 Imports UStates = SCrawler.API.Base.UserMedia.States
 Imports UTypes = SCrawler.API.Base.UserMedia.Types
 Namespace API.Twitter
     Friend Class UserData : Inherits UserDataBase
-        Protected SinglePostUrl As String = "https://api.twitter.com/1.1/statuses/show.json?id={0}&tweet_mode=extended"
 #Region "XML names"
+        Private Const Name_FirstDownloadComplete As String = "FirstDownloadComplete"
+        Private Const Name_DownloadModel As String = "DownloadModel"
         Private Const Name_GifsDownload As String = "GifsDownload"
         Private Const Name_GifsSpecialFolder As String = "GifsSpecialFolder"
         Private Const Name_GifsPrefix As String = "GifsPrefix"
 #End Region
 #Region "Declarations"
+        Friend Enum DownloadModels As Integer
+            Undefined = 0
+            Media = 1
+            Profile = 2
+            Search = 5
+        End Enum
+        Private FirstDownloadComplete As Boolean = False
+        Friend Property DownloadModel As DownloadModels = DownloadModels.Undefined
         Friend Property GifsDownload As Boolean = True
         Friend Property GifsSpecialFolder As String = String.Empty
         Friend Property GifsPrefix As String = String.Empty
         Private ReadOnly _DataNames As List(Of String)
+        Private ReadOnly Property MySettings As SiteSettings
+            Get
+                Return HOST.Source
+            End Get
+        End Property
+        Private FileNameProvider As ANumbers = Nothing
+        Private Sub ResetFileNameProvider(Optional ByVal GroupSize As Integer? = Nothing)
+            FileNameProvider = New ANumbers With {.FormatOptions = ANumbers.Options.FormatNumberGroup + ANumbers.Options.Groups}
+            FileNameProvider.GroupSize = If(GroupSize, 3)
+        End Sub
+        Private Function RenameGdlFile(ByVal Input As SFile, ByVal i As Integer) As SFile
+            Return SFile.Rename(Input, $"{Input.PathWithSeparator}{i.NumToString(FileNameProvider)}.{Input.Extension}",, EDP.ThrowException)
+        End Function
 #End Region
 #Region "Exchange options"
         Friend Overrides Function ExchangeOptionsGet() As Object
@@ -42,6 +63,10 @@ Namespace API.Twitter
                     GifsPrefix = .GifsPrefix
                     UseMD5Comparison = .UseMD5Comparison
                     RemoveExistingDuplicates = .RemoveExistingDuplicates
+                    DownloadModel = DownloadModels.Undefined
+                    If .DownloadModelMedia Then DownloadModel += DownloadModels.Media
+                    If .DownloadModelProfile Then DownloadModel += DownloadModels.Profile
+                    If .DownloadModelSearch Then DownloadModel += DownloadModels.Search
                 End With
             End If
         End Sub
@@ -51,25 +76,48 @@ Namespace API.Twitter
             _DataNames = New List(Of String)
         End Sub
         Protected Overrides Sub LoadUserInformation_OptionalFields(ByRef Container As XmlFile, ByVal Loading As Boolean)
-            If Loading Then
-                GifsDownload = Container.Value(Name_GifsDownload).FromXML(Of Boolean)(True)
-                GifsSpecialFolder = Container.Value(Name_GifsSpecialFolder)
-                If Not Container.Contains(Name_GifsPrefix) Then
-                    GifsPrefix = "GIF_"
+            With Container
+                If Loading Then
+                    If .Contains(Name_FirstDownloadComplete) Then
+                        FirstDownloadComplete = .Value(Name_FirstDownloadComplete).FromXML(Of Boolean)(False)
+                        DownloadModel = .Value(Name_DownloadModel).FromXML(Of Integer)(DownloadModels.Undefined)
+                    Else
+                        FirstDownloadComplete = DownloadedVideos(True) + DownloadedPictures(True) > 0
+                        If .Contains(Name_DownloadModel) Then
+                            DownloadModel = .Value(Name_DownloadModel).FromXML(Of Integer)(DownloadModels.Undefined)
+                        Else
+                            If FirstDownloadComplete Then
+                                If ParseUserMediaOnly Then
+                                    DownloadModel = DownloadModels.Media
+                                Else
+                                    DownloadModel = DownloadModels.Media + DownloadModels.Profile + DownloadModels.Search
+                                End If
+                            Else
+                                DownloadModel = DownloadModels.Undefined
+                            End If
+                        End If
+                    End If
+                    GifsDownload = .Value(Name_GifsDownload).FromXML(Of Boolean)(True)
+                    GifsSpecialFolder = .Value(Name_GifsSpecialFolder)
+                    If Not .Contains(Name_GifsPrefix) Then
+                        GifsPrefix = "GIF_"
+                    Else
+                        GifsPrefix = .Value(Name_GifsPrefix)
+                    End If
+                    UseMD5Comparison = .Value(Name_UseMD5Comparison).FromXML(Of Boolean)(False)
+                    RemoveExistingDuplicates = .Value(Name_RemoveExistingDuplicates).FromXML(Of Boolean)(False)
+                    StartMD5Checked = .Value(Name_StartMD5Checked).FromXML(Of Boolean)(False)
                 Else
-                    GifsPrefix = Container.Value(Name_GifsPrefix)
+                    .Add(Name_FirstDownloadComplete, FirstDownloadComplete.BoolToInteger)
+                    .Add(Name_DownloadModel, CInt(DownloadModel))
+                    .Add(Name_GifsDownload, GifsDownload.BoolToInteger)
+                    .Add(Name_GifsSpecialFolder, GifsSpecialFolder)
+                    .Add(Name_GifsPrefix, GifsPrefix)
+                    .Add(Name_UseMD5Comparison, UseMD5Comparison.BoolToInteger)
+                    .Add(Name_RemoveExistingDuplicates, RemoveExistingDuplicates.BoolToInteger)
+                    .Add(Name_StartMD5Checked, StartMD5Checked.BoolToInteger)
                 End If
-                UseMD5Comparison = Container.Value(Name_UseMD5Comparison).FromXML(Of Boolean)(False)
-                RemoveExistingDuplicates = Container.Value(Name_RemoveExistingDuplicates).FromXML(Of Boolean)(False)
-                StartMD5Checked = Container.Value(Name_StartMD5Checked).FromXML(Of Boolean)(False)
-            Else
-                Container.Add(Name_GifsDownload, GifsDownload.BoolToInteger)
-                Container.Add(Name_GifsSpecialFolder, GifsSpecialFolder)
-                Container.Add(Name_GifsPrefix, GifsPrefix)
-                Container.Add(Name_UseMD5Comparison, UseMD5Comparison.BoolToInteger)
-                Container.Add(Name_RemoveExistingDuplicates, RemoveExistingDuplicates.BoolToInteger)
-                Container.Add(Name_StartMD5Checked, StartMD5Checked.BoolToInteger)
-            End If
+            End With
         End Sub
 #End Region
 #Region "Download functions"
@@ -79,134 +127,230 @@ Namespace API.Twitter
                 DownloadData_SavedPosts(Token)
             Else
                 If _ContentList.Count > 0 Then _DataNames.ListAddList(_ContentList.Select(Function(c) c.File.File), LAP.ClearBeforeAdd, LAP.NotContainsOnly)
-                DownloadData(String.Empty, Token)
+                DownloadData_Timeline(Token)
             End If
         End Sub
-        Private Overloads Sub DownloadData(ByVal POST As String, ByVal Token As CancellationToken)
+        Private Sub DownloadData_Timeline(ByVal Token As CancellationToken)
             Dim URL$ = String.Empty
+            Dim tCache As CacheKeeper = Nothing
             Try
+                Const entry$ = "entry"
                 Dim PostID$ = String.Empty
-                Dim PostDate$
-                Dim nn As EContainer
-                Dim NewPostDetected As Boolean = False
-                Dim ExistsDetected As Boolean = False
+                Dim PostDate$, tmpUserId$
+                Dim i%
+                Dim dirIndx% = -1
+                Dim timelineNode As Predicate(Of EContainer) = Function(ee) ee.Value("type").StringToLower = "timelineaddentries"
+                Dim pinNode As Predicate(Of EContainer) = Function(ee) ee.Value("type").StringToLower = "timelinepinentry"
+                Dim entriesNode As Predicate(Of EContainer) = Function(ee) ee.Name = "entries" Or ee.Name = entry
+                Dim sourceIdPredicate As Predicate(Of EContainer) = Function(ee) ee.Name = "source_user_id_str" Or ee.Name = "source_user_id"
+                Dim p As Predicate(Of EContainer)
+                Dim pIndx%
+                Dim isOneNode As Boolean, isPins As Boolean, ExistsDetected As Boolean, userInfoParsed As Boolean = False
+                Dim j As EContainer, rootNode As EContainer, tmpNode As EContainer, nn As EContainer = Nothing
 
-                Dim UID As Func(Of EContainer, String) = Function(e) e.XmlIfNothing.Item({"user", "id"}).XmlIfNothingValue
+                Dim __parseContainer As Func(Of EContainer, Boolean) =
+                    Function(ByVal ee As EContainer) As Boolean
+                        If dirIndx <= 1 Then
+                            nn = ee({"content", "itemContent", "tweet_results", "result", "legacy"})
+                        Else
+                            nn = ee
+                        End If
 
-                URL = $"https://api.twitter.com/1.1/statuses/user_timeline.json?screen_name={Name}&count=200&exclude_replies=false&include_rts=1&tweet_mode=extended"
-                If Not POST.IsEmptyString Then URL &= $"&max_id={POST}"
+                        If Not nn.ListExists Then nn = ee({"content", "itemContent", "tweet_results", "result", "tweet", "legacy"})
+                        If nn.ListExists Then
+                            PostID = nn.Value("id_str").IfNullOrEmpty(nn.Value("id"))
 
-                ThrowAny(Token)
-                Dim r$ = Responser.GetResponse(URL)
-                If Not r.IsEmptyString Then
-                    Using w As EContainer = JsonDocument.Parse(r)
-                        If w.ListExists Then
+                            'Date Pattern:
+                            'Sat Jan 01 01:10:15 +0000 2000
+                            If nn.Contains("created_at") Then PostDate = nn("created_at").Value Else PostDate = String.Empty
+                            Select Case CheckDatesLimit(PostDate, Declarations.DateProvider)
+                                Case DateResult.Skip, DateResult.Exit : Return False
+                            End Select
 
-                            If POST.IsEmptyString And Not w.ItemF({0, "user"}) Is Nothing Then
-                                With w.ItemF({0, "user"})
-                                    If .Value("screen_name").StringToLower = Name.ToLower Then
-                                        UserSiteNameUpdate(.Value("name"))
-                                        UserDescriptionUpdate(.Value("description"))
-                                        Dim __getImage As Action(Of String) = Sub(ByVal img As String)
-                                                                                  If Not img.IsEmptyString Then
-                                                                                      Dim __imgFile As SFile = UrlFile(img, True)
-                                                                                      If Not __imgFile.Name.IsEmptyString Then
-                                                                                          If __imgFile.Extension.IsEmptyString Then __imgFile.Extension = "jpg"
-                                                                                          __imgFile.Path = MyFile.CutPath.Path
-                                                                                          If Not __imgFile.Exists Then GetWebFile(img, __imgFile, EDP.None)
-                                                                                      End If
-                                                                                  End If
-                                                                              End Sub
-                                        Dim icon$ = .Value("profile_image_url_https")
-                                        If Not icon.IsEmptyString Then icon = icon.Replace("_normal", String.Empty)
-                                        __getImage.Invoke(.Value("profile_banner_url"))
-                                        __getImage.Invoke(icon)
-                                    End If
-                                End With
+                            If Not _TempPostsList.Contains(PostID) Then
+                                _TempPostsList.Add(PostID)
+                            ElseIf isPins Then
+                                Return False
+                            Else
+                                ExistsDetected = True
+                                Return False
                             End If
 
-                            With If(IsSavedPosts, w({"globalObjects", "tweets"}).XmlIfNothing, w)
-                                ProgressPre.ChangeMax(.Count)
-                                For Each nn In .Self
-                                    ProgressPre.Perform()
-                                    ThrowAny(Token)
-                                    If nn.Count > 0 Then
-                                        PostID = nn.Value("id")
-                                        If ID.IsEmptyString Then
-                                            ID = UID(nn)
-                                            If Not ID.IsEmptyString Then UpdateUserInformation()
-                                        End If
+                            tmpUserId = nn({"retweeted_status_result", "result", "legacy", "user_id_str"}).XmlIfNothingValue
 
-                                        'Date Pattern:
-                                        'Sat Jan 01 01:10:15 +0000 2000
-                                        If nn.Contains("created_at") Then PostDate = nn("created_at").Value Else PostDate = String.Empty
-                                        Select Case CheckDatesLimit(PostDate, Declarations.DateProvider)
-                                            Case DateResult.Skip : Continue For
-                                            Case DateResult.Exit : Exit Sub
-                                        End Select
+                            If tmpUserId.IsEmptyString Then tmpUserId = nn.ItemF({"extended_entities", "media", 0, sourceIdPredicate}).XmlIfNothingValue.
+                                                                                IfNullOrEmpty(nn.Value("user_id")).IfNullOrEmpty(nn.Value("user_id_str")).IfNullOrEmpty("/")
 
-                                        If Not _TempPostsList.Contains(PostID) Then
-                                            NewPostDetected = True
-                                            _TempPostsList.Add(PostID)
+                            If Not ParseUserMediaOnly OrElse (Not ID.IsEmptyString AndAlso tmpUserId = ID) Then ObtainMedia(nn, PostID, PostDate)
+                        End If
+                        Return True
+                    End Function
+
+                tCache = New CacheKeeper($"{DownloadContentDefault_GetRootDir()}\_tCache\") With {
+                    .CacheDeleteError = New ErrorsDescriber(EDP.None) With {.Action = Sub(ee, eex, msg, obj) Settings.Cache.AddPath(tCache)}}
+                If tCache.RootDirectory.Exists(SFO.Path, False) Then tCache.RootDirectory.Delete(SFO.Path, SFODelete.DeletePermanently, EDP.ReturnValue)
+                tCache.Validate()
+
+                Dim dirs As List(Of SFile) = GetTimelineFromGalleryDL(tCache, Token)
+                If dirs.ListExists Then
+                    For Each dir As SFile In dirs
+                        dirIndx += 1
+
+                        ExistsDetected = False
+
+                        If Not dir.IsEmptyString Then
+                            ThrowAny(Token)
+                            Dim timelineFiles As List(Of SFile) = SFile.GetFiles(dir, "*.txt",, EDP.ReturnValue)
+                            If timelineFiles.ListExists Then
+                                ResetFileNameProvider(Math.Max(timelineFiles.Count.ToString.Length, 2))
+                                'rename files
+                                For i = 0 To timelineFiles.Count - 1 : timelineFiles(i) = RenameGdlFile(timelineFiles(i), i) : Next
+                                'parse files
+                                For i = 0 To timelineFiles.Count - 1
+                                    j = JsonDocument.Parse(timelineFiles(i).GetText)
+                                    If Not j Is Nothing Then
+                                        If i = 0 Then
+                                            If Not userInfoParsed Then
+                                                userInfoParsed = True
+                                                Dim resValue$ = j.Value({"data", "user", "result"}, "__typename").StringTrim.StringToLower
+                                                If resValue.IsEmptyString Then
+                                                    UserExists = False
+                                                    j.Dispose()
+                                                    Exit Sub
+                                                ElseIf resValue = "userunavailable" Then
+                                                    UserSuspended = True
+                                                    j.Dispose()
+                                                    Exit Sub
+                                                Else
+                                                    With j({"data", "user", "result"})
+                                                        If .ListExists Then
+                                                            If ID.IsEmptyString Then
+                                                                ID = .Value("rest_id")
+                                                                If Not ID.IsEmptyString Then _ForceSaveUserInfo = True
+                                                            End If
+                                                            With .Item({"legacy"})
+                                                                If .ListExists Then
+                                                                    If .Value("screen_name").StringToLower = Name.ToLower Then
+                                                                        UserSiteNameUpdate(.Value("name"))
+                                                                        UserDescriptionUpdate(.Value("description"))
+                                                                        Dim __getImage As Action(Of String) = Sub(ByVal img As String)
+                                                                                                                  If Not img.IsEmptyString Then
+                                                                                                                      Dim __imgFile As SFile = UrlFile(img, True)
+                                                                                                                      If Not __imgFile.Name.IsEmptyString Then
+                                                                                                                          If __imgFile.Extension.IsEmptyString Then __imgFile.Extension = "jpg"
+                                                                                                                          __imgFile.Path = MyFile.CutPath.Path
+                                                                                                                          If Not __imgFile.Exists Then GetWebFile(img, __imgFile, EDP.None)
+                                                                                                                          If __imgFile.Exists Then IconBannerDownloaded = True
+                                                                                                                      End If
+                                                                                                                  End If
+                                                                                                              End Sub
+                                                                        Dim icon$ = .Value("profile_image_url_https")
+                                                                        If Not icon.IsEmptyString Then icon = icon.Replace("_normal", String.Empty)
+                                                                        If DownloadIconBanner Then
+                                                                            __getImage.Invoke(.Value("profile_banner_url"))
+                                                                            __getImage.Invoke(icon)
+                                                                        End If
+                                                                    End If
+                                                                End If
+                                                            End With
+                                                        End If
+                                                    End With
+                                                End If
+                                            End If
                                         Else
-                                            ExistsDetected = True
-                                            Continue For
-                                        End If
+                                            For pIndx = 0 To IIf(dirIndx < 2, 1, 0)
+                                                Select Case dirIndx
+                                                    Case 0, 1
+                                                        rootNode = j({"data", "user", "result", "timeline_v2", "timeline", "instructions"})
+                                                        If rootNode.ListExists Then
+                                                            p = If(pIndx = 0, pinNode, timelineNode)
+                                                            isPins = pIndx = 0
+                                                            rootNode = rootNode.Find(p, False)
+                                                            If rootNode.ListExists Then rootNode = rootNode.Find(entriesNode, False)
+                                                        End If
+                                                    Case Else
+                                                        isPins = False
+                                                        rootNode = j({"globalObjects", "tweets"})
+                                                End Select
 
-                                        If Not ParseUserMediaOnly OrElse
-                                           (Not nn.Contains("retweeted_status") OrElse (Not ID.IsEmptyString AndAlso UID(nn("retweeted_status")) = ID)) Then _
-                                           ObtainMedia(nn, PostID, PostDate)
+                                                If rootNode.ListExists Then
+                                                    With rootNode
+                                                        isOneNode = dirIndx < 2 AndAlso .Name = entry
+                                                        ProgressPre.ChangeMax(If(isOneNode, 1, .Count))
+                                                        If isOneNode Then
+                                                            ProgressPre.Perform()
+                                                            If Not __parseContainer(.Self) Then Exit For
+                                                        Else
+                                                            For Each tmpNode In .Self
+                                                                ProgressPre.Perform()
+                                                                If Not __parseContainer(tmpNode) Then Exit For
+                                                            Next
+                                                        End If
+                                                    End With
+                                                End If
+                                            Next
+
+                                            'TODO: Twitter: is this line needed?
+                                            If ExistsDetected And i = 1 Then Exit For Else ExistsDetected = False
+                                        End If
+                                        j.Dispose()
                                     End If
                                 Next
-                            End With
+                                timelineFiles.Clear()
+                            End If
                         End If
-                    End Using
-
-                    If POST.IsEmptyString And ExistsDetected Then Exit Sub
-                    If Not PostID.IsEmptyString And NewPostDetected Then DownloadData(PostID, Token)
+                    Next
+                    dirs.Clear()
                 End If
+                ThrowAny(Token)
+                If Not FirstDownloadComplete Then
+                    _ForceSaveUserInfo = True
+                    If DownloadModel = DownloadModels.Undefined Then
+                        If ParseUserMediaOnly Then
+                            DownloadModel = DownloadModels.Media
+                        Else
+                            DownloadModel = DownloadModels.Media + DownloadModels.Profile + DownloadModels.Search
+                        End If
+                    End If
+                End If
+                FirstDownloadComplete = True
             Catch ex As Exception
                 ProcessException(ex, Token, $"data downloading error [{URL}]")
+            Finally
+                If Not tCache Is Nothing Then tCache.Dispose()
+                If _TempPostsList.Count > 0 Then _TempPostsList.Sort()
             End Try
         End Sub
         Private Sub DownloadData_SavedPosts(ByVal Token As CancellationToken)
             Try
-                Dim urls As List(Of String) = GetBookmarksUrlsFromGalleryDL()
-                If urls.ListExists Then
-                    Dim postIds As New List(Of String)
-                    Dim r$
+                Dim f As SFile = GetDataFromGalleryDL("https://twitter.com/i/bookmarks", Settings.Cache, True, Token)
+                Dim files As List(Of SFile) = SFile.GetFiles(f, "*.txt")
+                If files.ListExists Then
+                    ResetFileNameProvider(Math.Max(files.Count.ToString.Length, 3))
+                    Dim id$
                     Dim j As EContainer, jj As EContainer
                     Dim jErr As New ErrorsDescriber(EDP.ReturnValue)
-                    Dim rPattern As RParams = RParams.DM("(?<=tweet-)(\d+)\Z", 0, EDP.ReturnValue)
-                    ProgressPre.ChangeMax(urls.Count)
-                    For Each url$ In urls
-                        ProgressPre.Perform()
-                        r = Responser.GetResponse(url)
-                        If Not r.IsEmptyString Then
-                            j = JsonDocument.Parse(r, jErr)
-                            If Not j Is Nothing Then
-                                jj = j.ItemF({"data", "bookmark_timeline_v2", "timeline", "instructions", 0, "entries"})
-                                If If(jj?.Count, 0) > 0 Then postIds.ListAddList(jj.Select(Function(jj2) CStr(RegexReplace(jj2.Value("entryId"), rPattern))), LNC)
-                                j.Dispose()
-                            End If
+                    For i% = 0 To files.Count - 1
+                        f = RenameGdlFile(files(i), i)
+                        j = JsonDocument.Parse(f.GetText, jErr)
+                        If Not j Is Nothing Then
+                            With j.ItemF({"data", 0, "timeline", "instructions", 0, "entries"})
+                                If .ListExists Then
+                                    ProgressPre.ChangeMax(.Count)
+                                    For Each jj In .Self
+                                        ProgressPre.Perform()
+                                        With jj({"content", "itemContent", "tweet_results", "result", "legacy"})
+                                            If .ListExists Then
+                                                id = .Value("id_str")
+                                                If _TempPostsList.Contains(id) Then j.Dispose() : Exit Sub Else ObtainMedia(.Self, id, .Value("created_at"))
+                                            End If
+                                        End With
+                                    Next
+                                End If
+                            End With
+                            j.Dispose()
                         End If
                     Next
-                    If postIds.Count > 0 Then postIds.RemoveAll(Function(pid) pid.IsEmptyString OrElse (_TempPostsList.Contains(pid) Or _DataNames.Contains(pid)))
-                    If postIds.Count > 0 Then
-                        ProgressPre.ChangeMax(postIds.Count)
-                        For Each __id$ In postIds
-                            ProgressPre.Perform()
-                            _TempPostsList.Add(__id)
-                            r = Responser.GetResponse(String.Format(SinglePostUrl, __id),, EDP.ReturnValue)
-                            If Not r.IsEmptyString Then
-                                j = JsonDocument.Parse(r, jErr)
-                                If Not j Is Nothing Then
-                                    If j.Count > 0 Then ObtainMedia(j, __id, j.Value("created_at"))
-                                    j.Dispose()
-                                End If
-                            End If
-                        Next
-                    End If
                 End If
             Catch ex As Exception
                 ProcessException(ex, Token, "data downloading error (Saved Posts)")
@@ -215,21 +359,24 @@ Namespace API.Twitter
 #End Region
 #Region "Obtain media"
         Private Sub ObtainMedia(ByVal e As EContainer, ByVal PostID As String, ByVal PostDate As String, Optional ByVal State As UStates = UStates.Unknown)
-            If Not CheckVideoNode(e, PostID, PostDate, State) Then
-                Dim s As EContainer = e.ItemF({"extended_entities", "media"})
-                If s Is Nothing OrElse s.Count = 0 Then s = e.ItemF({"retweeted_status", "extended_entities", "media"})
-                If If(s?.Count, 0) > 0 Then
-                    For Each m In s
-                        If m.Contains("media_url") Then
-                            Dim dName$ = UrlFile(m("media_url").Value)
+            Dim s As EContainer = e({"extended_entities", "media"})
+            If If(s?.Count, 0) = 0 Then s = e({"retweeted_status", "extended_entities", "media"})
+            If If(s?.Count, 0) = 0 Then s = e({"retweeted_status_result", "result", "legacy", "extended_entities", "media"})
+
+            If If(s?.Count, 0) > 0 Then
+                Dim mUrl$
+                For Each m As EContainer In s
+                    If Not CheckVideoNode(m, PostID, PostDate, State) Then
+                        mUrl = m.Value("media_url").IfNullOrEmpty(m.Value("media_url_https"))
+                        If Not mUrl.IsEmptyString Then
+                            Dim dName$ = UrlFile(mUrl)
                             If Not dName.IsEmptyString AndAlso Not _DataNames.Contains(dName) Then
                                 _DataNames.Add(dName)
-                                _TempMediaList.ListAddValue(MediaFromData(m("media_url").Value,
-                                                                          PostID, PostDate, GetPictureOption(m), State, UTypes.Picture), LNC)
+                                _TempMediaList.ListAddValue(MediaFromData(mUrl, PostID, PostDate, GetPictureOption(m), State, UTypes.Picture), LNC)
                             End If
                         End If
-                    Next
-                End If
+                    End If
+                Next
             End If
         End Sub
         Private Function CheckVideoNode(ByVal w As EContainer, ByVal PostID As String, ByVal PostDate As String,
@@ -260,34 +407,32 @@ Namespace API.Twitter
                 Dim url$, ff$
                 Dim f As SFile
                 Dim m As UserMedia
-                With w({"extended_entities", "media"})
-                    If .ListExists Then
-                        For Each n As EContainer In .Self
-                            If n.Value("type") = "animated_gif" Then
-                                With n({"video_info", "variants"})
-                                    If .ListExists Then
-                                        With .ItemF({gifUrl})
-                                            If .ListExists Then
-                                                url = .Value("url")
-                                                ff = UrlFile(url)
-                                                If Not ff.IsEmptyString Then
-                                                    If GifsDownload And Not _DataNames.Contains(ff) Then
-                                                        m = MediaFromData(url, PostID, PostDate,, State, UTypes.Video)
-                                                        f = m.File
-                                                        If Not f.IsEmptyString And Not GifsPrefix.IsEmptyString Then f.Name = $"{GifsPrefix}{f.Name}" : m.File = f
-                                                        If Not GifsSpecialFolder.IsEmptyString Then m.SpecialFolder = $"{GifsSpecialFolder}*"
-                                                        _TempMediaList.ListAddValue(m, LNC)
-                                                    End If
-                                                    Return True
+                If w.ListExists Then
+                    For Each n As EContainer In w
+                        If n.Value("type") = "animated_gif" Then
+                            With n({"video_info", "variants"})
+                                If .ListExists Then
+                                    With .ItemF({gifUrl})
+                                        If .ListExists Then
+                                            url = .Value("url")
+                                            ff = UrlFile(url)
+                                            If Not ff.IsEmptyString Then
+                                                If GifsDownload And Not _DataNames.Contains(ff) Then
+                                                    m = MediaFromData(url, PostID, PostDate,, State, UTypes.Video)
+                                                    f = m.File
+                                                    If Not f.IsEmptyString And Not GifsPrefix.IsEmptyString Then f.Name = $"{GifsPrefix}{f.Name}" : m.File = f
+                                                    If Not GifsSpecialFolder.IsEmptyString Then m.SpecialFolder = $"{GifsSpecialFolder}*"
+                                                    _TempMediaList.ListAddValue(m, LNC)
                                                 End If
+                                                Return True
                                             End If
-                                        End With
-                                    End If
-                                End With
-                            End If
-                        Next
-                    End If
-                End With
+                                        End If
+                                    End With
+                                End If
+                            End With
+                        End If
+                    Next
+                End If
                 Return False
             Catch ex As Exception
                 LogError(ex, "[API.Twitter.UserData.CheckForGif]")
@@ -295,64 +440,185 @@ Namespace API.Twitter
             End Try
         End Function
         Private Function GetVideoNodeURL(ByVal w As EContainer) As String
-            Dim v As EContainer = w.GetNode(VideoNode)
-            If v.ListExists Then
-                Dim l As New List(Of Sizes)
-                Dim u$
-                Dim nn As EContainer
-                For Each n As EContainer In v
-                    If n.Count > 0 Then
-                        For Each nn In n
-                            If nn("content_type").XmlIfNothingValue("none").Contains("mp4") AndAlso nn.Contains("url") Then
-                                u = nn.Value("url")
+            With w({"video_info", "variants"})
+                If .ListExists Then
+                    Dim l As New List(Of Sizes)
+                    Dim u$
+                    For Each n As EContainer In .Self
+                        If n.Count > 0 Then
+                            If n("content_type").XmlIfNothingValue("none").Contains("mp4") AndAlso n.Contains("url") Then
+                                u = n.Value("url")
                                 l.Add(New Sizes(RegexReplace(u, VideoSizeRegEx), u))
                             End If
-                        Next
-                    End If
-                Next
-                If l.Count > 0 Then l.RemoveAll(Function(s) s.HasError)
-                If l.Count > 0 Then l.Sort() : Return l(0).Data
-            End If
+                        End If
+                    Next
+                    If l.Count > 0 Then l.RemoveAll(Function(s) s.HasError)
+                    If l.Count > 0 Then l.Sort() : Return l(0).Data
+                End If
+            End With
             Return String.Empty
         End Function
 #End Region
 #Region "Gallery-DL Support"
-        Private Function GetBookmarksUrlsFromGalleryDL() As List(Of String)
-            Dim command$ = $"gallery-dl --verbose --simulate --cookies ""{DirectCast(HOST.Source, SiteSettings).CookiesNetscapeFile}"" https://twitter.com/i/bookmarks"
+        Private Class TwitterGDL : Inherits GDL.GDLBatch
+            Private Property Token As CancellationToken
+            Friend Sub New(ByVal Dir As SFile, ByVal _Token As CancellationToken)
+                MyBase.New
+                Commands.Clear()
+                If Not Dir.IsEmptyString Then ChangeDirectory(Dir)
+                Token = _Token
+            End Sub
+            Protected Overrides Async Function Validate(ByVal Value As String) As Task
+                If Not ProcessKilled AndAlso Await Task.Run(Function() Token.IsCancellationRequested OrElse IdExists(Value)) Then Kill()
+            End Function
+            Private Function IdExists(ByVal Value As String) As Boolean
+                Try
+                    Value = Value.StringTrim
+                    If Not Value.IsEmptyString AndAlso (Value.StartsWith("*") Or Value.StartsWith(".\gallery-dl\")) Then
+                        Dim id$ = Value.Split("\").Last.Split(".").First.Split("_").First
+                        If Not id.IsEmptyString Then Return TempPostsList.Contains(id)
+                    End If
+                Catch ex As Exception
+                End Try
+                Return False
+            End Function
+        End Class
+        Private Function GetDataFromGalleryDL(ByVal URL As String, ByVal Cache As CacheKeeper, ByVal UseTempPostList As Boolean,
+                                              Optional ByVal Token As CancellationToken = Nothing) As SFile
+            Dim command$ = $"""{Settings.GalleryDLFile}"" --verbose --no-download --no-skip --cookies ""{MySettings.CookiesNetscapeFile}"" --write-pages "
             Try
-                Using batch As New GDL.GDLBatch With {.TempPostsList = _TempPostsList} : Return GDL.GetUrlsFromGalleryDl(batch, command) : End Using
+                Dim dir As SFile = Cache.NewPath
+                If dir.Exists(SFO.Path,, EDP.ThrowException) Then
+                    Using batch As New TwitterGDL(dir, Token)
+                        If UseTempPostList Then
+                            batch.TempPostsList = _TempPostsList
+                            command &= GdlGetIdFilterString()
+                        End If
+                        command &= URL
+                        '#If DEBUG Then
+                        'Debug.WriteLine(command)
+                        '#End If
+                        batch.Execute(command)
+                    End Using
+                    Return dir
+                End If
+                Return Nothing
             Catch ex As Exception
-                HasError = True
-                LogError(ex, $"GetJson({command})")
+                Return ErrorsDescriber.Execute(EDP.SendToLog, ex, $"{ToStringForLog()}: GetDataFromGalleryDL({command})")
+            End Try
+        End Function
+        Private Function GetTimelineFromGalleryDL(ByVal Cache As CacheKeeper, ByVal Token As CancellationToken) As List(Of SFile)
+            Dim command$ = String.Empty
+            Try
+                Dim confCache As CacheKeeper = Cache.NewInstance(Of BatchFileExchanger)
+                Dim conf As SFile = $"{confCache.RootDirectory.PathWithSeparator}TwitterGdlConfig.conf"
+                Dim confText$ = "{""extractor"":{""cookies"": """ & MySettings.CookiesNetscapeFile.ToString.Replace("\", "/") &
+                                """,""cookies-update"": false,""twitter"":{""cards"": false,""conversations"": true,""pinned"": false,""quoted"": false,""replies"": true,""retweets"": true,""strategy"": null,""text-tweets"": false,""twitpic"": false,""unique"": true,""users"": ""timeline"",""videos"": true}}}"
+                If conf.Exists(SFO.Path, True, EDP.ThrowException) Then TextSaver.SaveTextToFile(confText, conf)
+                If Not conf.Exists Then Throw New IO.FileNotFoundException("Can't find Twitter GDL config file", conf)
+
+                Dim outList As New List(Of SFile)
+                Dim rootDir As CacheKeeper = Cache.NewInstance
+                Dim dir As SFile
+                Dim dm As List(Of DownloadModels) = EnumExtract(Of DownloadModels)(DownloadModel).ListIfNothing
+                Dim process As Boolean
+                Dim bProcess As Boolean = DownloadModel = DownloadModels.Undefined Or Not FirstDownloadComplete
+
+                Using tgdl As New TwitterGDL(Nothing, Token) With {
+                    .TempPostsList = _TempPostsList,
+                    .AutoClear = True,
+                    .AutoReset = True,
+                    .CommandPermanent = $"chcp {BatchExecutor.UnicodeEncoding}",
+                    .FileExchanger = confCache
+                }
+                    tgdl.FileExchanger.DeleteCacheOnDispose = False
+                    tgdl.FileExchanger.DeleteRootOnDispose = False
+                    For i As Byte = 0 To 2
+                        dir = rootDir.NewPath
+                        dir.Exists(SFO.Path, True, EDP.ThrowException)
+                        outList.Add(dir)
+                        tgdl.ChangeDirectory(dir)
+                        command = $"""{Settings.GalleryDLFile}"" --verbose --no-download --no-skip --config ""{conf}"" --write-pages "
+                        command &= GdlGetIdFilterString()
+                        Select Case i
+                            Case 0 : command &= $"https://twitter.com/{Name}/media" : process = bProcess Or dm.Contains(DownloadModels.Media)
+                            Case 1 : command &= $"https://twitter.com/{Name}" : process = bProcess Or dm.Contains(DownloadModels.Profile)
+                            Case 2 : command &= $"https://twitter.com/search?q=from:{Name}+include:nativeretweets" : process = bProcess Or dm.Contains(DownloadModels.Search)
+                            Case Else : process = False
+                        End Select
+                        '#If DEBUG Then
+                        'Debug.WriteLine(command)
+                        '#End If
+                        ThrowAny(Token)
+                        If process Then tgdl.Execute(command)
+                        ThrowAny(Token)
+                    Next
+                End Using
+                dm.Clear()
+
+                Return outList
+            Catch ex As Exception
+                ProcessException(ex, Token, $"{ToStringForLog()}: GetTimelineFromGalleryDL({command})")
                 Return Nothing
             End Try
         End Function
+        Private Function GdlGetIdFilterString() As String
+            Return If(_TempPostsList.Count > 0, $"--filter ""int(tweet_id) > {_TempPostsList.Last} or abort()"" ", String.Empty)
+        End Function
 #End Region
 #Region "ReparseMissing"
         Protected Overrides Sub ReparseMissing(ByVal Token As CancellationToken)
+            Const SinglePostPattern$ = "https://twitter.com/{0}/status/{1}"
             Dim rList As New List(Of Integer)
             Dim URL$ = String.Empty
+            Dim cache As CacheKeeper = Nothing
             Try
                 If ContentMissingExists Then
                     Dim m As UserMedia
-                    Dim r$, PostDate$
+                    Dim PostDate$
                     Dim j As EContainer
+                    Dim f As SFile
+                    Dim i%, ii%
+                    Dim files As List(Of SFile)
+                    ResetFileNameProvider()
+                    If IsSingleObjectDownload Then
+                        cache = Settings.Cache
+                    Else
+                        cache = New CacheKeeper(DownloadContentDefault_GetRootDir.CSFilePS)
+                    End If
                     ProgressPre.ChangeMax(_ContentList.Count)
-                    For i% = 0 To _ContentList.Count - 1
+                    For i = 0 To _ContentList.Count - 1
                         ProgressPre.Perform()
                         If _ContentList(i).State = UStates.Missing Then
                             m = _ContentList(i)
-                            If Not m.Post.ID.IsEmptyString Then
+                            If Not m.Post.ID.IsEmptyString Or (IsSingleObjectDownload And Not m.URL_BASE.IsEmptyString) Then
                                 ThrowAny(Token)
-                                URL = String.Format(SinglePostUrl, m.Post.ID)
-                                r = Responser.GetResponse(URL,, EDP.ReturnValue)
-                                If Not r.IsEmptyString Then
-                                    j = JsonDocument.Parse(r)
-                                    If Not j Is Nothing Then
-                                        PostDate = String.Empty
-                                        If j.Contains("created_at") Then PostDate = j("created_at").Value Else PostDate = String.Empty
-                                        ObtainMedia(j, m.Post.ID, PostDate, UStates.Missing)
-                                        rList.Add(i)
+                                If IsSingleObjectDownload Then
+                                    URL = m.URL_BASE
+                                Else
+                                    URL = String.Format(SinglePostPattern, Name, m.Post.ID)
+                                End If
+                                f = GetDataFromGalleryDL(URL, cache, Favorite, Token)
+                                If Not f.IsEmptyString Then
+                                    files = SFile.GetFiles(f, "*.txt")
+                                    If files.ListExists Then
+                                        For ii = 0 To files.Count - 1
+                                            f = RenameGdlFile(files(ii), ii)
+                                            j = JsonDocument.Parse(f.GetText)
+                                            If Not j Is Nothing Then
+                                                With j.ItemF({"data", 0, "instructions", 0, "entries", 0,
+                                                             "content", "itemContent", "tweet_results", "result", "legacy"})
+                                                    If .ListExists Then
+                                                        PostDate = String.Empty
+                                                        If .Contains("created_at") Then PostDate = .Value("created_at") Else PostDate = String.Empty
+                                                        ObtainMedia(.Self, m.Post.ID, PostDate, UStates.Missing)
+                                                        rList.Add(i)
+                                                    End If
+                                                End With
+                                                j.Dispose()
+                                            End If
+                                        Next
+                                        files.Clear()
                                     End If
                                 End If
                             End If
@@ -362,6 +628,7 @@ Namespace API.Twitter
             Catch ex As Exception
                 ProcessException(ex, Token, $"ReparseMissing error [{URL}]")
             Finally
+                If Not cache Is Nothing And Not IsSingleObjectDownload Then cache.Dispose()
                 If rList.Count > 0 Then
                     For i% = rList.Count - 1 To 0 Step -1 : _ContentList.RemoveAt(i) : Next
                     rList.Clear()
@@ -371,15 +638,8 @@ Namespace API.Twitter
 #End Region
 #Region "DownloadSingleObject"
         Protected Overrides Sub DownloadSingleObject_GetPosts(ByVal Data As IYouTubeMediaContainer, ByVal Token As CancellationToken)
-            Dim PostID$ = RegexReplace(Data.URL, RParams.DM("(?<=/)\d+", 0))
-            If Not PostID.IsEmptyString Then
-                Dim r$ = Responser.GetResponse(String.Format(SinglePostUrl, PostID),, EDP.ReturnValue)
-                If Not r.IsEmptyString Then
-                    Using j As EContainer = JsonDocument.Parse(r)
-                        If j.ListExists Then ObtainMedia(j, j.Value("id"), j.Value("created_at"))
-                    End Using
-                End If
-            End If
+            _ContentList.Add(New UserMedia(Data.URL) With {.State = UStates.Missing})
+            ReparseMissing(Token)
         End Sub
 #End Region
 #Region "Picture options"
@@ -459,26 +719,7 @@ Namespace API.Twitter
 #Region "Exception"
         Protected Overrides Function DownloadingException(ByVal ex As Exception, ByVal Message As String, Optional ByVal FromPE As Boolean = False,
                                                           Optional ByVal EObj As Object = Nothing) As Integer
-            If AEquals(EObj, VALIDATE_MD5_ERROR) Then
-                If Not FromPE Then LogError(ex, Message)
-                Return 0
-            Else
-                With Responser
-                    If .StatusCode = HttpStatusCode.NotFound Then
-                        UserExists = False
-                    ElseIf .StatusCode = HttpStatusCode.Unauthorized Then
-                        UserSuspended = True
-                    ElseIf .StatusCode = HttpStatusCode.BadRequest Then
-                        MyMainLOG = "Twitter has invalid credentials"
-                    ElseIf .StatusCode = HttpStatusCode.ServiceUnavailable Or .StatusCode = HttpStatusCode.InternalServerError Then
-                        MyMainLOG = $"[{CInt(.StatusCode)}] Twitter is currently unavailable ({ToString()})"
-                    Else
-                        If Not FromPE Then LogError(ex, Message) : HasError = True
-                        Return 0
-                    End If
-                End With
-            End If
-            Return 1
+            Return 0
         End Function
 #End Region
 #Region "IDisposable support"

SCrawler/API/Xhamster/UserData.vb

@@ -10,6 +10,7 @@ Imports System.Threading
 Imports SCrawler.API.Base
 Imports SCrawler.API.YouTube.Objects
 Imports PersonalUtilities.Functions.XML
+Imports PersonalUtilities.Functions.XML.Base
 Imports PersonalUtilities.Functions.RegularExpressions
 Imports PersonalUtilities.Tools.Web.Clients
 Imports PersonalUtilities.Tools.Web.Documents.JSON
@@ -287,8 +288,11 @@ Namespace API.Xhamster
             End Try
         End Function
         Private Overloads Function GetM3U8(ByRef m As UserMedia, ByVal j As EContainer) As Boolean
-            Dim url$ = j.Value({"xplayerSettings", "sources", "hls"}, "url")
-            If Not url.IsEmptyString Then m.URL = url : m.Type = UTypes.m3u8 : Return True
+            Dim node As EContainer = j({"xplayerSettings", "sources", "hls"})
+            If node.ListExists Then
+                Dim url$ = node.GetNode({New NodeParams("url", True, True, True, True, 2)})
+                If Not url.IsEmptyString Then m.URL = url : m.Type = UTypes.m3u8 : Return True
+            End If
             Return False
         End Function
 #End Region

SCrawler/Download/ActiveDownloadingProgress.vb

@@ -62,8 +62,7 @@ Namespace DownloadObjects
                                                   .RowStyles.Add(New RowStyle(SizeType.Absolute, RowHeight))
                                                   .RowCount += 1
                                                   JobsList.Add(New DownloadProgress(j))
-                                                  AddHandler JobsList.Last.ProgressMaximumChanged, AddressOf Jobs_ProgressMaximumChanged
-                                                  AddHandler JobsList.Last.ProgressMaximum0Changed, AddressOf Jobs_ProgressMaximum0Changed
+                                                  AddHandler JobsList.Last.ProgressChanged, AddressOf Jobs_ProgressChanged
                                                   .Controls.Add(JobsList.Last.Get, 0, .RowStyles.Count - 1)
                                               End With
                                           Next
@@ -84,16 +83,18 @@ Namespace DownloadObjects
                               End Sub
             If TP_MAIN.InvokeRequired Then TP_MAIN.Invoke(a) Else a.Invoke
         End Sub
-        Private Sub Jobs_ProgressMaximumChanged()
+        Private Sub Jobs_ProgressChanged(ByVal Main As Boolean, ByVal IsMaxValue As Boolean, ByVal IsDone As Boolean)
             If JobsList.Count > 0 And Not DisableProgressChange Then
-                MainProgress.Maximum = JobsList.Sum(Function(j) CLng(j.Job.Progress.Maximum))
-                MainProgress.Value = Math.Max(JobsList.Sum(Function(j) CLng(j.Job.Progress.Value)) - 1, 0)
-                If MainProgress.Value > 0 Then MainProgress.Perform()
+                If Main Then
+                    MainProgress.Maximum = JobsList.Sum(Function(j) CLng(j.Job.Progress.Maximum))
+                    MainProgress.Value = Math.Max(JobsList.Sum(Function(j) CLng(j.Job.Progress.Value)) - 1, 0)
+                    If MainProgress.Value > 0 Then MainProgress.Perform()
+                Else
+                    MainProgress.Maximum0 = JobsList.Sum(Function(j) CLng(DirectCast(j.Job.Progress, MyProgressExt).Maximum0))
+                    MainProgress.Value0 = Math.Max(JobsList.Sum(Function(j) CLng(DirectCast(j.Job.Progress, MyProgressExt).Value0)) - 1, 0)
+                    If MainProgress.Value0 > 0 Then MainProgress.Perform0()
+                End If
             End If
         End Sub
-        Private Sub Jobs_ProgressMaximum0Changed()
-            If JobsList.Count > 0 And Not DisableProgressChange Then _
-               MainProgress.Maximum0 = JobsList.Sum(Function(j) CLng(DirectCast(j.Job.Progress, MyProgressExt).Maximum0))
-        End Sub
     End Class
 End Namespace

SCrawler/Download/DownloadProgress.vb

@@ -13,8 +13,7 @@ Namespace DownloadObjects
     Friend Class DownloadProgress : Implements IDisposable
 #Region "Events"
         Friend Event DownloadDone As NotificationEventHandler
-        Friend Event ProgressMaximumChanged()
-        Friend Event ProgressMaximum0Changed()
+        Friend Event ProgressChanged(ByVal Main As Boolean, ByVal IsMaxValue As Boolean, ByVal IsDone As Boolean)
 #End Region
 #Region "Declarations"
 #Region "Controls"
@@ -24,6 +23,7 @@ Namespace DownloadObjects
         Private WithEvents BTT_STOP As Button
         Private WithEvents BTT_OPEN As Button
         Private ReadOnly PR_MAIN As ProgressBar
+        Private ReadOnly PR_PRE As ProgressBar
         Private ReadOnly LBL_INFO As Label
         Private ReadOnly Icon As PictureBox
 #End Region
@@ -39,6 +39,7 @@ Namespace DownloadObjects
             TP_MAIN.ColumnCount = 1
             TP_CONTROLS = New TableLayoutPanel With {.Margin = New Padding(0), .Dock = DockStyle.Fill}
             PR_MAIN = New ProgressBar With {.Dock = DockStyle.Fill}
+            PR_PRE = New ProgressBar With {.Dock = DockStyle.Fill}
             LBL_INFO = New Label With {.Text = String.Empty, .Dock = DockStyle.Fill}
             Icon = New PictureBox With {
                 .SizeMode = PictureBoxSizeMode.Zoom,
@@ -66,7 +67,8 @@ Namespace DownloadObjects
                 With TP_CONTROLS
                     .ColumnStyles.Add(New ColumnStyle(SizeType.Absolute, 30))
                     .ColumnStyles.Add(New ColumnStyle(SizeType.Absolute, 30))
-                    .ColumnStyles.Add(New ColumnStyle(SizeType.Absolute, 150))
+                    .ColumnStyles.Add(New ColumnStyle(SizeType.Absolute, 75))
+                    .ColumnStyles.Add(New ColumnStyle(SizeType.Absolute, 75)) '150
                     .ColumnStyles.Add(New ColumnStyle(SizeType.Percent, 100))
                     .ColumnCount = .ColumnStyles.Count
                     .RowStyles.Add(New RowStyle(SizeType.Percent, 100))
@@ -74,8 +76,9 @@ Namespace DownloadObjects
                     With .Controls
                         If Not img Is Nothing Then .Add(Icon, 0, 0)
                         .Add(BTT_STOP, 1, 0)
-                        .Add(PR_MAIN, 2, 0)
-                        .Add(LBL_INFO, 3, 0)
+                        .Add(PR_PRE, 2, 0)
+                        .Add(PR_MAIN, 3, 0)
+                        .Add(LBL_INFO, 4, 0)
                     End With
                 End With
                 TP_MAIN.Controls.Add(TP_CONTROLS, 0, 0)
@@ -90,7 +93,8 @@ Namespace DownloadObjects
                         .Add(New ColumnStyle(SizeType.Absolute, 30))
                         .Add(New ColumnStyle(SizeType.Absolute, 30))
                         .Add(New ColumnStyle(SizeType.Absolute, 30))
-                        .Add(New ColumnStyle(SizeType.Percent, 100))
+                        .Add(New ColumnStyle(SizeType.Percent, 50))
+                        .Add(New ColumnStyle(SizeType.Percent, 50)) '100
                     End With
                     .ColumnCount = .ColumnStyles.Count
                     .RowStyles.Add(New RowStyle(SizeType.Percent, 50))
@@ -100,7 +104,8 @@ Namespace DownloadObjects
                         .Add(BTT_START, 1, 0)
                         .Add(BTT_STOP, 2, 0)
                         .Add(BTT_OPEN, 3, 0)
-                        .Add(PR_MAIN, 4, 0)
+                        .Add(PR_PRE, 4, 0)
+                        .Add(PR_MAIN, 5, 0)
                     End With
                 End With
                 With TP_MAIN
@@ -115,12 +120,14 @@ Namespace DownloadObjects
             End If
 
             With Job
-                .Progress = New MyProgressExt(PR_MAIN, LBL_INFO) With {.ResetProgressOnMaximumChanges = False}
+                .Progress = New MyProgressExt(PR_MAIN, PR_PRE, LBL_INFO) With {.ResetProgressOnMaximumChanges = False}
                 With DirectCast(.Progress, MyProgressExt)
                     AddHandler .ProgressChanged, AddressOf JobProgress_ProgressChanged
                     AddHandler .MaximumChanged, AddressOf JobProgress_MaximumChanged
                     AddHandler .Maximum0Changed, AddressOf JobProgress_Maximum0Changed
                     AddHandler .Progress0Changed, AddressOf JobProgress_Progress0Changed
+                    AddHandler .ProgressCompleted, AddressOf JobProgress_Done
+                    AddHandler .Progress0Completed, AddressOf JobProgress_Done0
                 End With
             End With
 
@@ -184,20 +191,22 @@ Namespace DownloadObjects
 #End Region
 #Region "Progress, Jobs count"
         Private Sub JobProgress_MaximumChanged(ByVal Sender As Object, ByVal e As ProgressEventArgs)
-            RaiseEvent ProgressMaximumChanged()
+            If Not Job.Type = Download.SavedPosts Then RaiseEvent ProgressChanged(True, True, False)
         End Sub
         Private Sub JobProgress_Maximum0Changed(ByVal Sender As Object, ByVal e As ProgressEventArgs)
-            RaiseEvent ProgressMaximum0Changed()
+            If Not Job.Type = Download.SavedPosts Then RaiseEvent ProgressChanged(False, True, False)
         End Sub
         Private Sub JobProgress_ProgressChanged(ByVal Sender As Object, ByVal e As ProgressEventArgs)
-            If Not Job.Type = Download.SavedPosts Then
-                MainProgress.Value = DirectCast(Sender, MyProgressExt).Value
-                MainProgress.Perform(0)
-            End If
+            If Not Job.Type = Download.SavedPosts Then MainProgress.Perform()
         End Sub
         Private Sub JobProgress_Progress0Changed(ByVal Sender As Object, ByVal e As ProgressEventArgs)
-            MainProgress.Value0 = DirectCast(Sender, MyProgressExt).Value0
-            MainProgress.Perform0(0)
+            If Not Job.Type = Download.SavedPosts Then MainProgress.Perform0()
+        End Sub
+        Private Sub JobProgress_Done(ByVal Sender As Object, ByVal e As ProgressEventArgs)
+            If Not Job.Type = Download.SavedPosts Then RaiseEvent ProgressChanged(True, False, True)
+        End Sub
+        Private Sub JobProgress_Done0(ByVal Sender As Object, ByVal e As ProgressEventArgs)
+            If Not Job.Type = Download.SavedPosts Then RaiseEvent ProgressChanged(False, False, True)
         End Sub
 #End Region
 #Region "IDisposable Support"

SCrawler/Download/STDownloader/VideoDownloaderForm.vb

@@ -43,7 +43,7 @@ Namespace DownloadObjects.STDownloader
                 Return ErrorsDescriber.Execute(EDP.SendToLog, ex, "VideoListForm.LoadData_GetFiles", New List(Of IYouTubeMediaContainer))
             End Try
         End Function
-        Protected Overrides Sub BTT_ADD_KeyClick(ByVal Sender As ToolStripMenuItemKeyClick, ByVal e As KeyClickEventArgs)
+        Protected Overrides Sub BTT_ADD_KeyClick(ByVal Sender As ToolStripMenuItemKeyClick, ByVal e As KeyClickEventArgs) Handles BTT_ADD_URLS_ARR.KeyClick
             Dim __tag$ = UniversalFunctions.IfNullOrEmpty(Of Object)(Sender.Tag, String.Empty)
             If Not __tag = "a" And Not __tag = UrlsArrTag Then
                 MyBase.BTT_ADD_KeyClick(Sender, e)
@@ -51,6 +51,7 @@ Namespace DownloadObjects.STDownloader
                 Dim url$ = String.Empty
                 Try
                     url = BufferText
+                    Dim disableDown As Boolean = e.Shift
                     Dim output As SFile = Settings.LatestSavingPath
                     Dim isArr As Boolean = __tag = UrlsArrTag
                     Dim formOpened As Boolean = False
@@ -152,7 +153,7 @@ Namespace DownloadObjects.STDownloader
                         If media Is Nothing Then
                             MsgBoxE({$"The URL you entered is not recognized by existing plugins.{vbCr}{url}", "Download video"}, vbCritical)
                         Else
-                            ControlCreateAndAdd(media)
+                            ControlCreateAndAdd(media, disableDown)
                         End If
                     End If
                 Catch ex As Exception

SCrawler/Editors/GlobalSettingsForm.Designer.vb

@@ -122,6 +122,8 @@ Namespace Editors
             Me.CH_NAME_SITE_FRIENDLY = New System.Windows.Forms.CheckBox()
             Me.CH_STD = New System.Windows.Forms.CheckBox()
             Me.CH_STD_EVERY = New System.Windows.Forms.CheckBox()
+            Me.CH_STD_YT_LOAD = New System.Windows.Forms.CheckBox()
+            Me.CH_STD_YT_REMOVE = New System.Windows.Forms.CheckBox()
             Me.TXT_CHANNELS_ROWS = New PersonalUtilities.Forms.Controls.TextBoxExtended()
             Me.TXT_CHANNELS_COLUMNS = New PersonalUtilities.Forms.Controls.TextBoxExtended()
             Me.CH_DOWN_IMAGES_NATIVE = New System.Windows.Forms.CheckBox()
@@ -157,8 +159,7 @@ Namespace Editors
             Me.TAB_MAIN = New System.Windows.Forms.TabControl()
             Me.TAB_ENVIR = New System.Windows.Forms.TabPage()
             Me.CONTAINER_MAIN = New System.Windows.Forms.ToolStripContainer()
-            Me.CH_STD_YT_LOAD = New System.Windows.Forms.CheckBox()
-            Me.CH_STD_YT_REMOVE = New System.Windows.Forms.CheckBox()
+            Me.CH_UICON_UP = New System.Windows.Forms.CheckBox()
             TP_BASIS = New System.Windows.Forms.TableLayoutPanel()
             TP_IMAGES = New System.Windows.Forms.TableLayoutPanel()
             TP_FILE_NAME = New System.Windows.Forms.TableLayoutPanel()
@@ -508,13 +509,13 @@ Namespace Editors
             TP_FILE_NAME.Controls.Add(Me.OPT_FILE_NAME_ADD_DATE, 2, 0)
             TP_FILE_NAME.Controls.Add(Me.CH_FILE_NAME_CHANGE, 0, 0)
             TP_FILE_NAME.Dock = System.Windows.Forms.DockStyle.Fill
-            TP_FILE_NAME.Location = New System.Drawing.Point(1, 53)
+            TP_FILE_NAME.Location = New System.Drawing.Point(1, 79)
             TP_FILE_NAME.Margin = New System.Windows.Forms.Padding(0)
             TP_FILE_NAME.Name = "TP_FILE_NAME"
             TP_FILE_NAME.RowCount = 1
             TP_FILE_NAME.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100.0!))
             TP_FILE_NAME.Size = New System.Drawing.Size(574, 30)
-            TP_FILE_NAME.TabIndex = 2
+            TP_FILE_NAME.TabIndex = 3
             '
             'OPT_FILE_NAME_REPLACE
             '
@@ -566,14 +567,14 @@ Namespace Editors
             TP_FILE_PATTERNS.Controls.Add(Me.OPT_FILE_DATE_START, 3, 0)
             TP_FILE_PATTERNS.Controls.Add(Me.OPT_FILE_DATE_END, 4, 0)
             TP_FILE_PATTERNS.Dock = System.Windows.Forms.DockStyle.Fill
-            TP_FILE_PATTERNS.Location = New System.Drawing.Point(1, 84)
+            TP_FILE_PATTERNS.Location = New System.Drawing.Point(1, 110)
             TP_FILE_PATTERNS.Margin = New System.Windows.Forms.Padding(0)
             TP_FILE_PATTERNS.Name = "TP_FILE_PATTERNS"
             TP_FILE_PATTERNS.RowCount = 1
             TP_FILE_PATTERNS.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100.0!))
             TP_FILE_PATTERNS.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 29.0!))
             TP_FILE_PATTERNS.Size = New System.Drawing.Size(574, 30)
-            TP_FILE_PATTERNS.TabIndex = 3
+            TP_FILE_PATTERNS.TabIndex = 4
             '
             'CH_FILE_DATE
             '
@@ -880,10 +881,10 @@ Namespace Editors
             '
             Me.CH_DOWN_REPARSE_MISSING.AutoSize = True
             Me.CH_DOWN_REPARSE_MISSING.Dock = System.Windows.Forms.DockStyle.Fill
-            Me.CH_DOWN_REPARSE_MISSING.Location = New System.Drawing.Point(4, 202)
+            Me.CH_DOWN_REPARSE_MISSING.Location = New System.Drawing.Point(4, 228)
             Me.CH_DOWN_REPARSE_MISSING.Name = "CH_DOWN_REPARSE_MISSING"
             Me.CH_DOWN_REPARSE_MISSING.Size = New System.Drawing.Size(568, 19)
-            Me.CH_DOWN_REPARSE_MISSING.TabIndex = 7
+            Me.CH_DOWN_REPARSE_MISSING.TabIndex = 8
             Me.CH_DOWN_REPARSE_MISSING.Text = "Trying to download missing posts using regular download"
             TT_MAIN.SetToolTip(Me.CH_DOWN_REPARSE_MISSING, "If missing posts exist, the missing posts will attempt to be downloaded via user " &
         "download")
@@ -925,6 +926,34 @@ Namespace Editors
             TT_MAIN.SetToolTip(Me.CH_STD_EVERY, "Show notifications when download in standalone downloader is complete")
             Me.CH_STD_EVERY.UseVisualStyleBackColor = True
             '
+            'CH_STD_YT_LOAD
+            '
+            Me.CH_STD_YT_LOAD.AutoSize = True
+            Me.CH_STD_YT_LOAD.Dock = System.Windows.Forms.DockStyle.Fill
+            Me.CH_STD_YT_LOAD.Location = New System.Drawing.Point(4, 166)
+            Me.CH_STD_YT_LOAD.Name = "CH_STD_YT_LOAD"
+            Me.CH_STD_YT_LOAD.Padding = New System.Windows.Forms.Padding(100, 0, 0, 0)
+            Me.CH_STD_YT_LOAD.Size = New System.Drawing.Size(568, 19)
+            Me.CH_STD_YT_LOAD.TabIndex = 6
+            Me.CH_STD_YT_LOAD.Text = "Load downloaded YouTube videos to the form"
+            TT_MAIN.SetToolTip(Me.CH_STD_YT_LOAD, "If checked, downloaded YouTube videos will be loaded to the form. Otherwise, all " &
+        "downloaded data will be loaded to the form except YouTube data.")
+            Me.CH_STD_YT_LOAD.UseVisualStyleBackColor = True
+            '
+            'CH_STD_YT_REMOVE
+            '
+            Me.CH_STD_YT_REMOVE.AutoSize = True
+            Me.CH_STD_YT_REMOVE.Dock = System.Windows.Forms.DockStyle.Fill
+            Me.CH_STD_YT_REMOVE.Location = New System.Drawing.Point(4, 192)
+            Me.CH_STD_YT_REMOVE.Name = "CH_STD_YT_REMOVE"
+            Me.CH_STD_YT_REMOVE.Padding = New System.Windows.Forms.Padding(100, 0, 0, 0)
+            Me.CH_STD_YT_REMOVE.Size = New System.Drawing.Size(568, 19)
+            Me.CH_STD_YT_REMOVE.TabIndex = 7
+            Me.CH_STD_YT_REMOVE.Text = "Clear YouTube videos when clearing the list"
+            TT_MAIN.SetToolTip(Me.CH_STD_YT_REMOVE, "If checked, YouTube videos will also be removed from the list. This action will a" &
+        "lso affect the standalone 'YouTubeDownloader' app.")
+            Me.CH_STD_YT_REMOVE.UseVisualStyleBackColor = True
+            '
             'TP_CHANNELS_IMGS
             '
             TP_CHANNELS_IMGS.ColumnCount = 2
@@ -1265,18 +1294,20 @@ Namespace Editors
             TP_DOWNLOADING.CellBorderStyle = System.Windows.Forms.TableLayoutPanelCellBorderStyle.[Single]
             TP_DOWNLOADING.ColumnCount = 1
             TP_DOWNLOADING.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100.0!))
-            TP_DOWNLOADING.Controls.Add(TP_FILE_NAME, 0, 2)
-            TP_DOWNLOADING.Controls.Add(TP_FILE_PATTERNS, 0, 3)
-            TP_DOWNLOADING.Controls.Add(Me.TXT_SCRIPT, 0, 4)
+            TP_DOWNLOADING.Controls.Add(TP_FILE_NAME, 0, 3)
+            TP_DOWNLOADING.Controls.Add(TP_FILE_PATTERNS, 0, 4)
+            TP_DOWNLOADING.Controls.Add(Me.TXT_SCRIPT, 0, 5)
             TP_DOWNLOADING.Controls.Add(Me.CH_UDESCR_UP, 0, 0)
-            TP_DOWNLOADING.Controls.Add(Me.TXT_DOWN_COMPLETE_SCRIPT, 0, 5)
-            TP_DOWNLOADING.Controls.Add(TP_MISSING_DATA, 0, 6)
-            TP_DOWNLOADING.Controls.Add(Me.CH_DOWN_REPARSE_MISSING, 0, 7)
+            TP_DOWNLOADING.Controls.Add(Me.TXT_DOWN_COMPLETE_SCRIPT, 0, 6)
+            TP_DOWNLOADING.Controls.Add(TP_MISSING_DATA, 0, 7)
+            TP_DOWNLOADING.Controls.Add(Me.CH_DOWN_REPARSE_MISSING, 0, 8)
             TP_DOWNLOADING.Controls.Add(Me.CH_UNAME_UP, 0, 1)
+            TP_DOWNLOADING.Controls.Add(Me.CH_UICON_UP, 0, 2)
             TP_DOWNLOADING.Dock = System.Windows.Forms.DockStyle.Fill
             TP_DOWNLOADING.Location = New System.Drawing.Point(0, 0)
             TP_DOWNLOADING.Name = "TP_DOWNLOADING"
-            TP_DOWNLOADING.RowCount = 9
+            TP_DOWNLOADING.RowCount = 10
+            TP_DOWNLOADING.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25.0!))
             TP_DOWNLOADING.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25.0!))
             TP_DOWNLOADING.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25.0!))
             TP_DOWNLOADING.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30.0!))
@@ -1305,12 +1336,12 @@ Namespace Editors
             Me.TXT_SCRIPT.CaptionWidth = 120.0R
             Me.TXT_SCRIPT.ChangeControlsEnableOnCheckedChange = False
             Me.TXT_SCRIPT.Dock = System.Windows.Forms.DockStyle.Fill
-            Me.TXT_SCRIPT.Location = New System.Drawing.Point(4, 118)
+            Me.TXT_SCRIPT.Location = New System.Drawing.Point(4, 144)
             Me.TXT_SCRIPT.Name = "TXT_SCRIPT"
             Me.TXT_SCRIPT.PlaceholderEnabled = True
             Me.TXT_SCRIPT.PlaceholderText = "Enter script path here..."
             Me.TXT_SCRIPT.Size = New System.Drawing.Size(568, 22)
-            Me.TXT_SCRIPT.TabIndex = 4
+            Me.TXT_SCRIPT.TabIndex = 5
             '
             'TXT_DOWN_COMPLETE_SCRIPT
             '
@@ -1320,12 +1351,12 @@ Namespace Editors
             Me.TXT_DOWN_COMPLETE_SCRIPT.CaptionToolTipText = "This command will be executed after all downloads are completed"
             Me.TXT_DOWN_COMPLETE_SCRIPT.CaptionWidth = 120.0R
             Me.TXT_DOWN_COMPLETE_SCRIPT.Dock = System.Windows.Forms.DockStyle.Fill
-            Me.TXT_DOWN_COMPLETE_SCRIPT.Location = New System.Drawing.Point(4, 147)
+            Me.TXT_DOWN_COMPLETE_SCRIPT.Location = New System.Drawing.Point(4, 173)
             Me.TXT_DOWN_COMPLETE_SCRIPT.Name = "TXT_DOWN_COMPLETE_SCRIPT"
             Me.TXT_DOWN_COMPLETE_SCRIPT.PlaceholderEnabled = True
             Me.TXT_DOWN_COMPLETE_SCRIPT.PlaceholderText = "Enter command here..."
             Me.TXT_DOWN_COMPLETE_SCRIPT.Size = New System.Drawing.Size(568, 22)
-            Me.TXT_DOWN_COMPLETE_SCRIPT.TabIndex = 5
+            Me.TXT_DOWN_COMPLETE_SCRIPT.TabIndex = 6
             '
             'TP_MISSING_DATA
             '
@@ -1336,14 +1367,14 @@ Namespace Editors
             TP_MISSING_DATA.Controls.Add(Me.CH_ADD_MISSING_TO_LOG, 0, 0)
             TP_MISSING_DATA.Controls.Add(Me.CH_ADD_MISSING_ERROS_TO_LOG, 1, 0)
             TP_MISSING_DATA.Dock = System.Windows.Forms.DockStyle.Fill
-            TP_MISSING_DATA.Location = New System.Drawing.Point(1, 173)
+            TP_MISSING_DATA.Location = New System.Drawing.Point(1, 199)
             TP_MISSING_DATA.Margin = New System.Windows.Forms.Padding(0)
             TP_MISSING_DATA.Name = "TP_MISSING_DATA"
             TP_MISSING_DATA.RowCount = 1
             TP_MISSING_DATA.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100.0!))
             TP_MISSING_DATA.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 24.0!))
             TP_MISSING_DATA.Size = New System.Drawing.Size(574, 25)
-            TP_MISSING_DATA.TabIndex = 6
+            TP_MISSING_DATA.TabIndex = 7
             '
             'CH_UNAME_UP
             '
@@ -1352,7 +1383,7 @@ Namespace Editors
             Me.CH_UNAME_UP.Location = New System.Drawing.Point(4, 30)
             Me.CH_UNAME_UP.Name = "CH_UNAME_UP"
             Me.CH_UNAME_UP.Size = New System.Drawing.Size(568, 19)
-            Me.CH_UNAME_UP.TabIndex = 7
+            Me.CH_UNAME_UP.TabIndex = 1
             Me.CH_UNAME_UP.Text = "Update user site name every time"
             Me.CH_UNAME_UP.UseVisualStyleBackColor = True
             '
@@ -1843,33 +1874,16 @@ Namespace Editors
             Me.CONTAINER_MAIN.TabIndex = 0
             Me.CONTAINER_MAIN.TopToolStripPanelVisible = False
             '
-            'CH_STD_YT_LOAD
+            'CH_UICON_UP
             '
-            Me.CH_STD_YT_LOAD.AutoSize = True
-            Me.CH_STD_YT_LOAD.Dock = System.Windows.Forms.DockStyle.Fill
-            Me.CH_STD_YT_LOAD.Location = New System.Drawing.Point(4, 166)
-            Me.CH_STD_YT_LOAD.Name = "CH_STD_YT_LOAD"
-            Me.CH_STD_YT_LOAD.Padding = New System.Windows.Forms.Padding(100, 0, 0, 0)
-            Me.CH_STD_YT_LOAD.Size = New System.Drawing.Size(568, 19)
-            Me.CH_STD_YT_LOAD.TabIndex = 6
-            Me.CH_STD_YT_LOAD.Text = "Load downloaded YouTube videos to the form"
-            TT_MAIN.SetToolTip(Me.CH_STD_YT_LOAD, "If checked, downloaded YouTube videos will be loaded to the form. Otherwise, all " &
-        "downloaded data will be loaded to the form except YouTube data.")
-            Me.CH_STD_YT_LOAD.UseVisualStyleBackColor = True
-            '
-            'CH_STD_YT_REMOVE
-            '
-            Me.CH_STD_YT_REMOVE.AutoSize = True
-            Me.CH_STD_YT_REMOVE.Dock = System.Windows.Forms.DockStyle.Fill
-            Me.CH_STD_YT_REMOVE.Location = New System.Drawing.Point(4, 192)
-            Me.CH_STD_YT_REMOVE.Name = "CH_STD_YT_REMOVE"
-            Me.CH_STD_YT_REMOVE.Padding = New System.Windows.Forms.Padding(100, 0, 0, 0)
-            Me.CH_STD_YT_REMOVE.Size = New System.Drawing.Size(568, 19)
-            Me.CH_STD_YT_REMOVE.TabIndex = 7
-            Me.CH_STD_YT_REMOVE.Text = "Clear YouTube videos when clearing the list"
-            TT_MAIN.SetToolTip(Me.CH_STD_YT_REMOVE, "If checked, YouTube videos will also be removed from the list. This action will a" &
-        "lso affect the standalone 'YouTubeDownloader' app.")
-            Me.CH_STD_YT_REMOVE.UseVisualStyleBackColor = True
+            Me.CH_UICON_UP.AutoSize = True
+            Me.CH_UICON_UP.Dock = System.Windows.Forms.DockStyle.Fill
+            Me.CH_UICON_UP.Location = New System.Drawing.Point(4, 56)
+            Me.CH_UICON_UP.Name = "CH_UICON_UP"
+            Me.CH_UICON_UP.Size = New System.Drawing.Size(568, 19)
+            Me.CH_UICON_UP.TabIndex = 2
+            Me.CH_UICON_UP.Text = "Update user icon and banner every time (where supported)"
+            Me.CH_UICON_UP.UseVisualStyleBackColor = True
             '
             'GlobalSettingsForm
             '
@@ -2041,5 +2055,6 @@ Namespace Editors
         Private WithEvents CH_STD_UPDATE_YT_PATH As CheckBox
         Private WithEvents CH_STD_YT_LOAD As CheckBox
         Private WithEvents CH_STD_YT_REMOVE As CheckBox
+        Private WithEvents CH_UICON_UP As CheckBox
     End Class
 End Namespace

SCrawler/Editors/GlobalSettingsForm.vb

@@ -89,6 +89,7 @@ Namespace Editors
                         'Downloading
                         CH_UDESCR_UP.Checked = .UpdateUserDescriptionEveryTime
                         CH_UNAME_UP.Checked = .UserSiteNameUpdateEveryTime
+                        CH_UICON_UP.Checked = .UpdateUserIconBannerEveryTime
                         TXT_SCRIPT.Checked = .ScriptData.Attribute
                         TXT_SCRIPT.Text = .ScriptData.Value
                         TXT_DOWN_COMPLETE_SCRIPT.Text = .DownloadsCompleteCommand
@@ -244,6 +245,7 @@ Namespace Editors
                     'Downloading
                     .UpdateUserDescriptionEveryTime.Value = CH_UDESCR_UP.Checked
                     .UserSiteNameUpdateEveryTime.Value = CH_UNAME_UP.Checked
+                    .UpdateUserIconBannerEveryTime.Value = CH_UICON_UP.Checked
                     .ScriptData.Value = TXT_SCRIPT.Text
                     .ScriptData.Attribute.Value = TXT_SCRIPT.Checked
                     .DownloadsCompleteCommand.Value = TXT_DOWN_COMPLETE_SCRIPT.Text

SCrawler/Editors/SiteEditorForm.Designer.vb

@@ -54,7 +54,7 @@ Namespace Editors
             'CONTAINER_MAIN.ContentPanel
             '
             CONTAINER_MAIN.ContentPanel.Controls.Add(Me.TP_MAIN)
-            CONTAINER_MAIN.ContentPanel.Size = New System.Drawing.Size(544, 218)
+            CONTAINER_MAIN.ContentPanel.Size = New System.Drawing.Size(544, 243)
             CONTAINER_MAIN.Dock = System.Windows.Forms.DockStyle.Fill
             CONTAINER_MAIN.LeftToolStripPanelVisible = False
             CONTAINER_MAIN.Location = New System.Drawing.Point(0, 0)
@@ -84,7 +84,7 @@ Namespace Editors
             Me.TP_MAIN.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25.0!))
             Me.TP_MAIN.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25.0!))
             Me.TP_MAIN.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100.0!))
-            Me.TP_MAIN.Size = New System.Drawing.Size(544, 218)
+            Me.TP_MAIN.Size = New System.Drawing.Size(544, 243)
             Me.TP_MAIN.TabIndex = 0
             '
             'TXT_PATH
@@ -135,7 +135,7 @@ Namespace Editors
             Me.TP_SITE_PROPS.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25.0!))
             Me.TP_SITE_PROPS.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25.0!))
             Me.TP_SITE_PROPS.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100.0!))
-            Me.TP_SITE_PROPS.Size = New System.Drawing.Size(538, 78)
+            Me.TP_SITE_PROPS.Size = New System.Drawing.Size(538, 103)
             Me.TP_SITE_PROPS.TabIndex = 5
             '
             'TXT_PATH_SAVED_POSTS

SCrawler/Editors/SiteEditorForm.vb

@@ -90,6 +90,11 @@ Namespace Editors
                         End If
 
                         If .PropList.Count > 0 Then
+                            With TP_SITE_PROPS
+                                With .RowStyles : .RemoveAt(.Count - 1) : End With
+                                .RowCount -= 1
+                            End With
+
                             Dim laAdded As Boolean = False
                             Dim loAdded As Boolean = False
                             Dim pArr() As Boolean
@@ -134,6 +139,19 @@ Namespace Editors
                         CH_GET_USER_MEDIA_ONLY.Padding = New PaddingE(CH_GET_USER_MEDIA_ONLY.Padding) With {.Left = offset}
                         If c > 0 Or h <> 0 Then
                             Dim ss As New Size(Size.Width, Size.Height + h + c)
+                            Dim minScrh% = Screen.AllScreens.Min(Function(scr) scr.WorkingArea.Height)
+
+                            If ss.Height >= minScrh - 20 Then
+                                ss.Height = minScrh - 40
+                                With TP_SITE_PROPS
+                                    .AutoScroll = True
+                                    Dim p As Padding = .Padding
+                                    p.Right = 3
+                                    .Padding = p
+                                    .PerformLayout()
+                                End With
+                            End If
+
                             MinimumSize = ss
                             Size = ss
                             MaximumSize = ss

SCrawler/Editors/UsersInfoForm.vb

@@ -492,13 +492,23 @@ Namespace Editors
             If Not info.IsEmptyString Then MsgBoxE({info, "User information"})
         End Sub
         Private Sub CONTEXT_BTT_OPEN_FOLDER_Click(sender As Object, e As EventArgs) Handles CONTEXT_BTT_OPEN_FOLDER.Click
-            Dim u As UserOpt = GetUserFromList()
-            If Not u Is Nothing Then u.User.OpenFolder()
+            OpenUserFolder()
         End Sub
         Private Sub CONTEXT_BTT_OPEN_SITE_Click(sender As Object, e As EventArgs) Handles CONTEXT_BTT_OPEN_SITE.Click
             Dim u As UserOpt = GetUserFromList()
             If Not u Is Nothing Then u.User.OpenSite()
         End Sub
+#End Region
+#Region "List handlers"
+        Private Sub LIST_DATA_MouseDoubleClick(sender As Object, e As MouseEventArgs) Handles LIST_DATA.MouseDoubleClick
+            OpenUserFolder()
+        End Sub
+#End Region
+#Region "Functions"
+        Private Sub OpenUserFolder()
+            Dim u As UserOpt = GetUserFromList()
+            If Not u Is Nothing Then u.User.OpenFolder()
+        End Sub
 #End Region
     End Class
 End Namespace

SCrawler/ListImagesLoader.vb

@@ -122,6 +122,8 @@ Friend Class ListImagesLoader
                                     UserDataList.Clear()
                                     UpdateInProgress = False
                                 End If
+                            Else
+                                UpdateInProgress = False
                             End If
                         Else
                             Dim t As New List(Of Task)

SCrawler/MainFrame.Designer.vb

@@ -92,6 +92,7 @@ Partial Public Class MainFrame : Inherits System.Windows.Forms.Form
         Me.BTT_DONATE = New System.Windows.Forms.ToolStripButton()
         Me.Toolbar_BOTTOM = New System.Windows.Forms.StatusStrip()
         Me.BTT_PR_INFO = New System.Windows.Forms.ToolStripStatusLabel()
+        Me.PR_PRE = New System.Windows.Forms.ToolStripProgressBar()
         Me.PR_MAIN = New System.Windows.Forms.ToolStripProgressBar()
         Me.LBL_JOBS_COUNT = New System.Windows.Forms.ToolStripStatusLabel()
         Me.LBL_STATUS = New System.Windows.Forms.ToolStripStatusLabel()
@@ -122,6 +123,7 @@ Partial Public Class MainFrame : Inherits System.Windows.Forms.Form
         Me.BTT_TRAY_SILENT_MODE = New System.Windows.Forms.ToolStripMenuItem()
         Me.BTT_TRAY_FEED_SHOW = New System.Windows.Forms.ToolStripMenuItem()
         Me.BTT_TRAY_CHANNELS = New System.Windows.Forms.ToolStripMenuItem()
+        Me.BTT_TRAY_DOWNLOADER = New System.Windows.Forms.ToolStripMenuItem()
         Me.BTT_TRAY_SHOW_HIDE = New System.Windows.Forms.ToolStripMenuItem()
         Me.BTT_TRAY_CLOSE = New System.Windows.Forms.ToolStripMenuItem()
         Me.BTT_TRAY_CLOSE_NO_SCRIPT = New System.Windows.Forms.ToolStripMenuItem()
@@ -632,7 +634,7 @@ Partial Public Class MainFrame : Inherits System.Windows.Forms.Form
         '
         'Toolbar_BOTTOM
         '
-        Me.Toolbar_BOTTOM.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.BTT_PR_INFO, Me.PR_MAIN, Me.LBL_JOBS_COUNT, Me.LBL_STATUS})
+        Me.Toolbar_BOTTOM.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.BTT_PR_INFO, Me.PR_PRE, Me.PR_MAIN, Me.LBL_JOBS_COUNT, Me.LBL_STATUS})
         Me.Toolbar_BOTTOM.Location = New System.Drawing.Point(0, 439)
         Me.Toolbar_BOTTOM.Name = "Toolbar_BOTTOM"
         Me.Toolbar_BOTTOM.Size = New System.Drawing.Size(934, 22)
@@ -646,6 +648,12 @@ Partial Public Class MainFrame : Inherits System.Windows.Forms.Form
         Me.BTT_PR_INFO.Padding = New System.Windows.Forms.Padding(0, 0, 3, 0)
         Me.BTT_PR_INFO.Size = New System.Drawing.Size(19, 17)
         '
+        'PR_PRE
+        '
+        Me.PR_PRE.Name = "PR_PRE"
+        Me.PR_PRE.Size = New System.Drawing.Size(100, 16)
+        Me.PR_PRE.Visible = False
+        '
         'PR_MAIN
         '
         Me.PR_MAIN.Name = "PR_MAIN"
@@ -826,9 +834,9 @@ Partial Public Class MainFrame : Inherits System.Windows.Forms.Form
         '
         'TRAY_CONTEXT
         '
-        Me.TRAY_CONTEXT.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.BTT_TRAY_PAUSE_AUTOMATION, Me.BTT_TRAY_SILENT_MODE, Me.BTT_TRAY_FEED_SHOW, Me.BTT_TRAY_CHANNELS, TRAY_SEP_1, Me.BTT_TRAY_SHOW_HIDE, TRAY_SEP_2, Me.BTT_TRAY_CLOSE, Me.BTT_TRAY_CLOSE_NO_SCRIPT})
+        Me.TRAY_CONTEXT.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.BTT_TRAY_PAUSE_AUTOMATION, Me.BTT_TRAY_SILENT_MODE, Me.BTT_TRAY_FEED_SHOW, Me.BTT_TRAY_CHANNELS, Me.BTT_TRAY_DOWNLOADER, TRAY_SEP_1, Me.BTT_TRAY_SHOW_HIDE, TRAY_SEP_2, Me.BTT_TRAY_CLOSE, Me.BTT_TRAY_CLOSE_NO_SCRIPT})
         Me.TRAY_CONTEXT.Name = "TRAY_CONTEXT"
-        Me.TRAY_CONTEXT.Size = New System.Drawing.Size(171, 170)
+        Me.TRAY_CONTEXT.Size = New System.Drawing.Size(171, 192)
         '
         'BTT_TRAY_PAUSE_AUTOMATION
         '
@@ -864,6 +872,13 @@ Partial Public Class MainFrame : Inherits System.Windows.Forms.Form
         Me.BTT_TRAY_CHANNELS.Size = New System.Drawing.Size(170, 22)
         Me.BTT_TRAY_CHANNELS.Text = "Channels"
         '
+        'BTT_TRAY_DOWNLOADER
+        '
+        Me.BTT_TRAY_DOWNLOADER.Image = Global.SCrawler.My.Resources.Resources.ArrowDownPic_Blue_24
+        Me.BTT_TRAY_DOWNLOADER.Name = "BTT_TRAY_DOWNLOADER"
+        Me.BTT_TRAY_DOWNLOADER.Size = New System.Drawing.Size(170, 22)
+        Me.BTT_TRAY_DOWNLOADER.Text = "Downloader"
+        '
         'BTT_TRAY_SHOW_HIDE
         '
         Me.BTT_TRAY_SHOW_HIDE.Image = Global.SCrawler.My.Resources.Resources.ApplicationPic_16
@@ -996,4 +1011,6 @@ Partial Public Class MainFrame : Inherits System.Windows.Forms.Form
     Private WithEvents BTT_TRAY_FEED_SHOW As ToolStripMenuItem
     Friend WithEvents MENU_DOWN_ALL As ToolStripDropDownButton
     Private WithEvents BTT_TRAY_CHANNELS As ToolStripMenuItem
+    Private WithEvents BTT_TRAY_DOWNLOADER As ToolStripMenuItem
+    Private WithEvents PR_PRE As ToolStripProgressBar
 End Class

SCrawler/MainFrame.vb

@@ -58,7 +58,7 @@ Public Class MainFrame
         YouTube.MyCache = Settings.Cache
         YouTube.MyYouTubeSettings = New YouTube.YTSettings_Internal
         UpdateYouTubeSettings()
-        MainProgress = New MyProgressExt(Toolbar_BOTTOM, PR_MAIN, LBL_STATUS, "Downloading profiles' data") With {
+        MainProgress = New MyProgressExt(Toolbar_BOTTOM, PR_MAIN, PR_PRE, LBL_STATUS, "Downloading profiles' data") With {
             .ResetProgressOnMaximumChanges = False, .Visible = False}
         Downloader = New TDownloader
         InfoForm = New DownloadedInfoForm
@@ -452,9 +452,9 @@ CloseResume:
         Downloader.AddRange(Settings.GetUsers(UserExistsPredicate), e.IncludeInTheFeed)
     End Sub
     Private Sub BTT_DOWN_SITE_FULL_KeyClick(sender As Object, e As MyKeyEventArgs) Handles BTT_DOWN_SITE_FULL.KeyClick
-        DownloadSiteFull(False, e.IncludeInTheFeed)
+        DownloadSiteFull(False, e.IncludeInTheFeed, e.Shift)
     End Sub
-    Private Sub DownloadSiteFull(ByVal ReadyForDownloadOnly As Boolean, ByVal IncludeInTheFeed As Boolean)
+    Private Sub DownloadSiteFull(ByVal ReadyForDownloadOnly As Boolean, ByVal IncludeInTheFeed As Boolean, Optional ByVal IgnoreExists As Boolean = False)
         Using f As New SiteSelectionForm(Settings.LatestDownloadedSites.ValuesList)
             f.ShowDialog()
             If f.DialogResult = DialogResult.OK Then
@@ -462,7 +462,7 @@ CloseResume:
                 Settings.LatestDownloadedSites.AddRange(f.SelectedSites)
                 Settings.LatestDownloadedSites.Update()
                 If f.SelectedSites.Count > 0 Then
-                    Downloader.AddRange(Settings.GetUsers(Function(u) f.SelectedSites.Contains(u.Site) And u.Exists And
+                    Downloader.AddRange(Settings.GetUsers(Function(u) f.SelectedSites.Contains(u.Site) And (u.Exists Or IgnoreExists) And
                                                                       (Not ReadyForDownloadOnly Or u.ReadyForDownload)), IncludeInTheFeed)
                 End If
             End If
@@ -513,7 +513,7 @@ CloseResume:
         TrayIcon.ContextMenuStrip.Hide()
         MainFrameObj.PauseButtons.UpdatePauseButtons()
     End Sub
-    Private Sub BTT_DOWN_VIDEO_Click(sender As Object, e As EventArgs) Handles BTT_DOWN_VIDEO.Click
+    Private Sub BTT_DOWN_VIDEO_Click(sender As Object, e As EventArgs) Handles BTT_DOWN_VIDEO.Click, BTT_TRAY_DOWNLOADER.Click
         VideoDownloader.FormShow()
     End Sub
     Private Sub BTT_DOWN_STOP_Click(sender As Object, e As EventArgs) Handles BTT_DOWN_STOP.Click

SCrawler/My Project/AssemblyInfo.vb

@@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("2023.5.12.0")>
-<Assembly: AssemblyFileVersion("2023.5.12.0")>
+<Assembly: AssemblyVersion("2023.6.19.0")>
+<Assembly: AssemblyFileVersion("2023.6.19.0")>
 <Assembly: NeutralResourcesLanguage("en")>

SCrawler/MyProgressExt.vb

@@ -21,41 +21,23 @@ Friend Class PreProgress : Implements IDisposable
             ProgressExists = True
         End If
     End Sub
-    Private _Maximum As Integer = 0
     Friend Sub ChangeMax(ByVal Value As Integer, Optional ByVal Add As Boolean = True)
         If Ready Then
             If Add Then
-                _Maximum += Value
                 If Value > 0 Then Progress.Maximum0 += Value
             Else
-                _Maximum = Value
                 Progress.Maximum0 = Value
             End If
         End If
     End Sub
-    Private CumulVal As Integer = 0
     Friend Sub Perform(Optional ByVal Value As Integer = 1)
-        If Ready Then
-            CumulVal += Value
-            Progress.Perform0(Value)
-        End If
+        If Ready Then Progress.Perform0(Value)
     End Sub
     Friend Sub Reset()
-        _Maximum = 0
-        CumulVal = 0
+        If Ready Then Progress.Reset0()
     End Sub
     Friend Sub Done()
-        If Ready Then
-            Dim v# = _Maximum - CumulVal
-            If v > 0 Then
-                With Progress
-                    If v + .Value0 > .Maximum0 Then v = .Maximum0 - .Value0
-                    If v < 0 Then v = 0
-                    .Perform0(v)
-                    Reset()
-                End With
-            End If
-        End If
+        If Ready Then Progress.Done0()
     End Sub
 #Region "IDisposable Support"
     Private disposedValue As Boolean = False
@@ -85,14 +67,7 @@ Friend Class MyProgressExt : Inherits MyProgress
             _Progress0ChangedEventHandlers.Remove(h)
         End RemoveHandler
         RaiseEvent(ByVal Sender As Object, ByVal e As ProgressEventArgs)
-            If _Progress0ChangedEventHandlers.Count > 0 Then
-                Try
-                    For i% = 0 To _Progress0ChangedEventHandlers.Count - 1
-                        Try : _Progress0ChangedEventHandlers(i).Invoke(Sender, e) : Catch : End Try
-                    Next
-                Catch
-                End Try
-            End If
+            InvokeHandlers(_Progress0ChangedEventHandlers, Sender, e)
         End RaiseEvent
     End Event
     Private ReadOnly _Maximum0ChangedEventHandlers As List(Of EventHandler(Of ProgressEventArgs))
@@ -104,72 +79,99 @@ Friend Class MyProgressExt : Inherits MyProgress
             _Maximum0ChangedEventHandlers.Remove(h)
         End RemoveHandler
         RaiseEvent(ByVal Sender As Object, ByVal e As ProgressEventArgs)
-            If _Maximum0ChangedEventHandlers.Count > 0 Then
-                Try
-                    For i% = 0 To _Maximum0ChangedEventHandlers.Count - 1
-                        Try : _Maximum0ChangedEventHandlers(i).Invoke(Sender, e) : Catch : End Try
-                    Next
-                Catch
-                End Try
-            End If
+            InvokeHandlers(_Maximum0ChangedEventHandlers, Sender, e)
         End RaiseEvent
     End Event
+    Private ReadOnly _Progress0CompletedEventHandlers As List(Of EventHandler(Of ProgressEventArgs))
+    Friend Custom Event Progress0Completed As EventHandler(Of ProgressEventArgs)
+        AddHandler(ByVal h As EventHandler(Of ProgressEventArgs))
+            If Not _Progress0CompletedEventHandlers.Contains(h) Then _Progress0CompletedEventHandlers.Add(h)
+        End AddHandler
+        RemoveHandler(ByVal h As EventHandler(Of ProgressEventArgs))
+            _Progress0CompletedEventHandlers.Remove(h)
+        End RemoveHandler
+        RaiseEvent(ByVal Sender As Object, ByVal e As ProgressEventArgs)
+            InvokeHandlers(_Progress0CompletedEventHandlers, Sender, e)
+        End RaiseEvent
+    End Event
+    Private WithEvents PR_PRE As MyProgress
+    Private Sub PR_PRE_ProgressChanged(ByVal Sender As Object, ByVal e As ProgressEventArgs) Handles PR_PRE.ProgressChanged
+        RaiseEvent Progress0Changed(Sender, e)
+    End Sub
+    Private Sub PR_PRE_MaximumChanged(ByVal Sender As Object, ByVal e As ProgressEventArgs) Handles PR_PRE.MaximumChanged
+        RaiseEvent Maximum0Changed(Sender, e)
+    End Sub
+    Private Sub PR_PRE_ProgressCompleted(ByVal Sender As Object, ByVal e As ProgressEventArgs) Handles PR_PRE.ProgressCompleted
+        RaiseEvent Progress0Completed(Sender, e)
+    End Sub
     Friend Sub New()
         _Progress0ChangedEventHandlers = New List(Of EventHandler(Of ProgressEventArgs))
         _Maximum0ChangedEventHandlers = New List(Of EventHandler(Of ProgressEventArgs))
+        _Progress0CompletedEventHandlers = New List(Of EventHandler(Of ProgressEventArgs))
     End Sub
-    Friend Sub New(ByRef StatusStrip As StatusStrip, ByRef ProgressBar As ToolStripProgressBar, ByRef Label As ToolStripStatusLabel,
+    Friend Sub New(ByRef StatusStrip As StatusStrip, ByRef ProgressBar As ToolStripProgressBar, ByRef ProgressBarPre As ToolStripProgressBar, ByRef Label As ToolStripStatusLabel,
                    Optional ByVal Information As String = Nothing)
         MyBase.New(StatusStrip, ProgressBar, Label, Information)
+        PR_PRE = New MyProgress(StatusStrip, ProgressBarPre, Nothing) With {.PerformMod = 10, .ResetProgressOnMaximumChanges = False}
         _Progress0ChangedEventHandlers = New List(Of EventHandler(Of ProgressEventArgs))
         _Maximum0ChangedEventHandlers = New List(Of EventHandler(Of ProgressEventArgs))
+        _Progress0CompletedEventHandlers = New List(Of EventHandler(Of ProgressEventArgs))
     End Sub
-    Friend Sub New(ByRef ProgressBar As ProgressBar, ByRef Label As Label, Optional ByVal Information As String = Nothing)
+    Friend Sub New(ByRef ProgressBar As ProgressBar, ByRef ProgressBarPre As ProgressBar, ByRef Label As Label, Optional ByVal Information As String = Nothing)
         MyBase.New(ProgressBar, Label, Information)
+        PR_PRE = New MyProgress(ProgressBarPre, Nothing) With {.PerformMod = 10, .ResetProgressOnMaximumChanges = False}
         _Progress0ChangedEventHandlers = New List(Of EventHandler(Of ProgressEventArgs))
         _Maximum0ChangedEventHandlers = New List(Of EventHandler(Of ProgressEventArgs))
+        _Progress0CompletedEventHandlers = New List(Of EventHandler(Of ProgressEventArgs))
     End Sub
-    Private _Maximum0 As Double = 0
     Friend Property Maximum0 As Double
         Get
-            Return _Maximum0
+            Return PR_PRE.Maximum
         End Get
         Set(ByVal v As Double)
-            Dim b As Boolean = Not _Maximum0 = v
-            _Maximum0 = v
-            If ResetProgressOnMaximumChanges Then Value0 = 0
-            If b Then RaiseEvent Maximum0Changed(Me, Nothing)
+            PR_PRE.Maximum = v
+        End Set
+    End Property
+    Friend Property Value0 As Double
+        Get
+            Return PR_PRE.Value
+        End Get
+        Set(ByVal v As Double)
+            PR_PRE.Value = v
         End Set
     End Property
-    Friend Property Value0 As Double = 0
     Friend Sub Perform0(Optional ByVal Value As Double = 1)
-        Value0 += Value
-        If Perform(0, 10, False, False) Then RaiseEvent Progress0Changed(Me, Nothing)
+        PR_PRE.Perform(Value)
     End Sub
-    Public Overloads Overrides Sub Perform(Optional ByVal Value As Double = 1)
-        If Perform(Value, PerformMod, True, True) Then OnProgressChanged()
-    End Sub
-    Public Overloads Function Perform(ByVal Value As Double, ByVal pm As Integer, ByVal SetText As Boolean, ByVal InvokeProgressChangeHandler As Boolean) As Boolean
-        Me.Value += Value
-        If Me.Value < 0 Then Me.Value = 0
-        Dim v# = Me.Value + Value0
-        Dim m# = Maximum + Maximum0
-        If pm = 0 OrElse (v Mod pm) = 0 OrElse v = m Then PerformImpl(GetPercentage(v, m), SetText, InvokeProgressChangeHandler) : Return True
-        Return False
-    End Function
     Public Overrides Sub Done()
-        Value0 = Maximum0
+        PR_PRE.Done()
         MyBase.Done()
     End Sub
-    Public Overrides Sub Reset()
-        MyBase.Reset()
-        Value0 = 0
-        Maximum0 = 0
+    Friend Sub Done0()
+        PR_PRE.Done()
     End Sub
+    Public Overrides Sub Reset()
+        PR_PRE.Reset()
+        MyBase.Reset()
+    End Sub
+    Friend Sub Reset0()
+        PR_PRE.Reset()
+    End Sub
+    Public Overrides Property Visible(Optional ByVal ProgressBar As Boolean = True, Optional ByVal Label As Boolean = True) As Boolean
+        Get
+            Return MyBase.Visible(ProgressBar, Label)
+        End Get
+        Set(ByVal _Visible As Boolean)
+            MyBase.Visible(ProgressBar, Label) = _Visible
+            PR_PRE.Visible(ProgressBar, Label) = _Visible
+        End Set
+    End Property
     Protected Overrides Sub Dispose(ByVal disposing As Boolean)
         If Not disposedValue And disposing Then
             _Progress0ChangedEventHandlers.Clear()
             _Maximum0ChangedEventHandlers.Clear()
+            _Progress0CompletedEventHandlers.Clear()
+            PR_PRE.Dispose()
         End If
         MyBase.Dispose(disposing)
     End Sub

SCrawler/PluginsEnvironment/Attributes/Attributes.vb

@@ -8,7 +8,7 @@
 ' but WITHOUT ANY WARRANTY
 Imports System.Runtime.CompilerServices
 Namespace Plugin.Attributes
-    Public Enum SettingAddress : Both : Settings : User : End Enum
+    Public Enum SettingAddress : Both : Settings : User : None : End Enum
     Public Class PSettingAttribute : Inherits Attribute
         Public Number As Integer = 0
         Friend ReadOnly Name As String

SCrawler/PluginsEnvironment/Hosts/DownloadableMediaHost.vb

@@ -23,6 +23,15 @@ Namespace Plugin.Hosts
         End Property
         Friend Property Instance As UserDataBase
         Friend ReadOnly Property ExternalSource As IDownloadableMedia = Nothing
+        Public Overrides ReadOnly Property Exists As Boolean
+            Get
+                If SiteKey = API.YouTube.YouTubeSiteKey Then
+                    Return MyBase.Exists
+                Else
+                    Return _Exists
+                End If
+            End Get
+        End Property
         Public Overrides Property File As SFile
             Get
                 Return _File
@@ -128,7 +137,7 @@ Namespace Plugin.Hosts
         End Sub
         Public Overrides Sub Load(ByVal f As SFile)
             MyBase.Load(f)
-            If _Exists Then _Exists = File.Exists
+            If _Exists Then _Exists = Not MediaState = UserMediaStates.Downloaded OrElse File.Exists
         End Sub
         Public Overrides Sub Save()
             If FileSettings.IsEmptyString Then
@@ -142,6 +151,9 @@ Namespace Plugin.Hosts
                 x.Save(FileSettings)
             End Using
         End Sub
+        Public Overrides Function GetHashCode() As Integer
+            Return URL.GetHashCode
+        End Function
         Protected Overrides Sub Dispose(ByVal disposing As Boolean)
             If Not disposedValue And disposing Then Instance.DisposeIfReady() : ExternalSource.DisposeIfReady(False)
             MyBase.Dispose(disposing)

SCrawler/PluginsEnvironment/Hosts/PluginHost.vb

@@ -88,7 +88,8 @@ Namespace Plugin.Hosts
                     New PluginHost(New API.Xhamster.SiteSettings, _XML, GlobalPath, _Temp, _Imgs, _Vids),
                     New PluginHost(New API.XVIDEOS.SiteSettings, _XML, GlobalPath, _Temp, _Imgs, _Vids),
                     New PluginHost(New API.ThisVid.SiteSettings, _XML, GlobalPath, _Temp, _Imgs, _Vids),
-                    New PluginHost(New API.PathPlugin.SiteSettings, _XML, GlobalPath, _Temp, _Imgs, _Vids)}
+                    New PluginHost(New API.PathPlugin.SiteSettings, _XML, GlobalPath, _Temp, _Imgs, _Vids),
+                    New PluginHost(New API.OnlyFans.SiteSettings, _XML, GlobalPath, _Temp, _Imgs, _Vids)}
         End Function
         Friend Shared Function GetPluginsHosts(ByRef _XML As XmlFile, ByVal GlobalPath As SFile,
                                                ByRef _Temp As XMLValue(Of Boolean), ByRef _Imgs As XMLValue(Of Boolean),

SCrawler/SCrawler.vbproj

@@ -178,6 +178,7 @@
     <Compile Include="API\LPSG\UserData.vb" />
     <Compile Include="API\Mastodon\Credentials.vb" />
     <Compile Include="API\Mastodon\Declarations.vb" />
+    <Compile Include="API\Mastodon\EditorExchangeOptions.vb" />
     <Compile Include="API\Mastodon\MastodonDomains.vb" />
     <Compile Include="API\Mastodon\SettingsForm.Designer.vb">
       <DependentUpon>SettingsForm.vb</DependentUpon>
@@ -187,6 +188,9 @@
     </Compile>
     <Compile Include="API\Mastodon\SiteSettings.vb" />
     <Compile Include="API\Mastodon\UserData.vb" />
+    <Compile Include="API\OnlyFans\Declarations.vb" />
+    <Compile Include="API\OnlyFans\SiteSettings.vb" />
+    <Compile Include="API\OnlyFans\UserData.vb" />
     <Compile Include="API\PathPlugin\Declarations.vb" />
     <Compile Include="API\PathPlugin\SiteSettings.vb" />
     <Compile Include="API\PathPlugin\UserData.vb" />
@@ -660,6 +664,12 @@
   <ItemGroup>
     <None Include="Content\Icons\SiteIcons\MastodonIcon_48.ico" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="Content\Pictures\SitePictures\OnlyFansPic_32.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Content\Icons\SiteIcons\OnlyFansIcon_32.ico" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <Import Project="..\packages\VideoLAN.LibVLC.Windows.3.0.17.4\build\VideoLAN.LibVLC.Windows.targets" Condition="Exists('..\packages\VideoLAN.LibVLC.Windows.3.0.17.4\build\VideoLAN.LibVLC.Windows.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">

SCrawler/SettingsCLS.vb

@@ -238,6 +238,7 @@ Friend Class SettingsCLS : Implements IDownloaderSettings, IDisposable
         FromChannelDownloadTopUse = New XMLValue(Of Boolean)("FromChannelDownloadTopUse", False, MyXML, n)
         FromChannelCopyImageToUser = New XMLValue(Of Boolean)("FromChannelCopyImageToUser", True, MyXML, n)
         UpdateUserDescriptionEveryTime = New XMLValue(Of Boolean)("UpdateUserDescriptionEveryTime", True, MyXML, n)
+        UpdateUserIconBannerEveryTime = New XMLValue(Of Boolean)("UpdateUserIconBannerEveryTime", True, MyXML, n)
         ScriptData = New XMLValueAttribute(Of String, Boolean)("ScriptData", "Use",,, MyXML, n)
 
         n = {"Users", "FileName"}
@@ -720,6 +721,7 @@ Friend Class SettingsCLS : Implements IDownloaderSettings, IDisposable
     Friend ReadOnly Property FromChannelDownloadTopUse As XMLValue(Of Boolean)
     Friend ReadOnly Property FromChannelCopyImageToUser As XMLValue(Of Boolean)
     Friend ReadOnly Property UpdateUserDescriptionEveryTime As XMLValue(Of Boolean)
+    Friend ReadOnly Property UpdateUserIconBannerEveryTime As XMLValue(Of Boolean)
 #Region "File naming"
     Friend ReadOnly Property FileAddDateToFileName As XMLValue(Of Boolean)
     Friend ReadOnly Property FileAddTimeToFileName As XMLValue(Of Boolean)

SCrawler/SiteResources.Designer.vb

@@ -124,6 +124,26 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
+        '''</summary>
+        Friend Shared ReadOnly Property OnlyFansIcon_32() As System.Drawing.Icon
+            Get
+                Dim obj As Object = ResourceManager.GetObject("OnlyFansIcon_32", resourceCulture)
+                Return CType(obj,System.Drawing.Icon)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized resource of type System.Drawing.Bitmap.
+        '''</summary>
+        Friend Shared ReadOnly Property OnlyFansPic_32() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("OnlyFansPic_32", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
         '''</summary>

SCrawler/SiteResources.resx

@@ -136,6 +136,12 @@
   <data name="MastodonPic_48" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>Content\Pictures\SitePictures\MastodonPic_48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="OnlyFansIcon_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>Content\Icons\SiteIcons\OnlyFansIcon_32.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="OnlyFansPic_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>Content\Pictures\SitePictures\OnlyFansPic_32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="PinterestIcon_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>Content\Icons\SiteIcons\PinterestIcon_32.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>