2022.8.22.0

Cleaned up the code Replace some old functions with new ones Adapted to the new library environment Enable/Disable display user/downloaded image Autodownloader option 'Show notification' not saved Separate thread for standalone video downloader Expanded the description of some errors with additional information Fixed date/time renaming issue Fixed internal library bugs Fixed minor bugs
2026-03-16 00:32:18 +00:00 · 2022-08-22 02:42:36 +03:00
parent e0dc66e0da
commit 54ffe10f71
88 changed files with 1155 additions and 1066 deletions
--- a/SCrawler/API/Reddit/Channel.vb
+++ b/SCrawler/API/Reddit/Channel.vb
@@ -9,9 +9,9 @@
 Imports PersonalUtilities.Tools
 Imports PersonalUtilities.Forms.Toolbars
 Imports PersonalUtilities.Functions.XML
+Imports System.Threading
 Imports SCrawler.API.Base
 Imports SCrawler.Plugin.Hosts
-Imports System.Threading
 Imports SCrawler.API.Reddit.RedditViewExchange
 Imports View = SCrawler.API.Reddit.IRedditView.View
 Imports Period = SCrawler.API.Reddit.IRedditView.Period
@@ -112,7 +112,7 @@ Namespace API.Reddit
                ChannelExistentUserNames.ListAddList((From p As UserPost In PostsAll
                                                      Where Not p.UserID.IsEmptyString AndAlso
                                                            Settings.UsersList.Exists(Function(u) u.Site = Site And u.Name = p.UserID)
-                                                      Select p.UserID), LAP.NotContainsOnly)
+                                                      Select p.UserID), LNC)
                ChannelExistentUserNames.RemoveAll(Function(u) Not Settings.UsersList.Exists(Function(uu) uu.Site = Site And uu.Name = u))
            End If
        End Sub
@@ -165,7 +165,7 @@ Namespace API.Reddit
                If Not ViewMode = View.New And AutoGetLimits Then
                    Return _DownloadLimitPost
                Else
-                    Dim PID$ = ListAddList(Nothing, Posts, LAP.NotContainsOnly).ListAddList(PostsLatest, LAP.NotContainsOnly).ListSort.FirstOrDefault.ID
+                    Dim PID$ = ListAddList(Nothing, Posts, LNC).ListAddList(PostsLatest, LNC).ListSort.FirstOrDefault.ID
                    If AutoGetLimits And Not PID.IsEmptyString Then
                        Return PID
                    Else
@@ -233,11 +233,7 @@ Namespace API.Reddit
            Return New Channel(f)
        End Operator
        Public Overrides Function ToString() As String
-            If Not Name.IsEmptyString Then
-                Return Name
-            Else
-                Return ID
-            End If
+            Return If(Name.IsEmptyString, ID, Name)
        End Function
        Friend Sub Delete()
            File.Delete(, SFODelete.DeleteToRecycleBin)
@@ -261,7 +257,7 @@ Namespace API.Reddit
                        .DownloadData(Token)
                    End With
                    Dim b% = Posts.Count
-                    Posts.ListAddList(d.GetNewChannelPosts(), LAP.NotContainsOnly)
+                    Posts.ListAddList(d.GetNewChannelPosts(), LNC)
                    If Posts.Count - b > 0 Then CountOfLoadedPostsPerSession.Add(Posts.Count - b)
                    Posts.Sort()
                    LatestParsedDate = If(Posts.FirstOrDefault(Function(pp) pp.Date.HasValue).Date, LatestParsedDate)
@@ -364,8 +360,8 @@ Namespace API.Reddit
            UpdateUsersStats()
            If Not ViewMode = View.New Then
                Dim l As New List(Of String)
-                If Posts.Count > 0 Or PostsLatest.Count > 0 Then l.ListAddList((From p In PostsAll Where Not p.ID.IsEmptyString Select p.ID), LAP.NotContainsOnly)
-                l.ListAddList(PostsNames, LAP.NotContainsOnly)
+                If Posts.Count > 0 Or PostsLatest.Count > 0 Then l.ListAddList((From p In PostsAll Where Not p.ID.IsEmptyString Select p.ID), LNC)
+                l.ListAddList(PostsNames, LNC)
                If l.Count > 0 Then TextSaver.SaveTextToFile(l.ListToString("|"), FilePosts, True,, EDP.SendInLog)
            End If
            Using x As New XmlFile With {.AllowSameNames = True, .Name = "Channel"}
--- a/SCrawler/API/Reddit/ChannelsCollection.vb
+++ b/SCrawler/API/Reddit/ChannelsCollection.vb
@@ -12,8 +12,16 @@ Imports SCrawler.API.Base
 Imports System.Threading
 Namespace API.Reddit
    Friend Class ChannelsCollection : Implements ICollection(Of Channel), IMyEnumerator(Of Channel), IChannelLimits, IDisposable
-        Friend Shared ReadOnly Property ChannelsPath As SFile = $"{SettingsFolderName}\Channels\"
-        Friend Shared ReadOnly Property ChannelsPathCache As SFile = $"{Settings.GlobalPath.Value.PathWithSeparator}_CachedData\"
+        Friend Shared ReadOnly Property ChannelsPath As SFile
+            Get
+                Return $"{SettingsFolderName}\Channels\"
+            End Get
+        End Property
+        Friend Shared ReadOnly Property ChannelsPathCache As SFile
+            Get
+                Return $"{Settings.GlobalPath.Value.PathWithSeparator}_CachedData\"
+            End Get
+        End Property
        Private ReadOnly Channels As List(Of Channel)
        Friend Structure ChannelImage : Implements IEquatable(Of ChannelImage)
            Friend File As SFile
@@ -42,7 +50,7 @@ Namespace API.Reddit
                    Return Nothing
                End If
            Catch ex As Exception
-                Return ErrorsDescriber.Execute(EDP.SendInLog + EDP.ReturnValue, ex)
+                Return ErrorsDescriber.Execute(EDP.SendInLog + EDP.ReturnValue, ex, "[API.Reddit.ChannelsCollection.GetUserFiles]")
            End Try
        End Function
        Friend Sub UpdateUsersStats()
@@ -97,7 +105,7 @@ Namespace API.Reddit
                        If Item(i).ID = ChannelID Then Return Item(i)
                    Next
                End If
-                Throw New ArgumentException($"Channel ID [{ChannelID}] does not found in channels collection", "ChannelID") With {.HelpLink = 1}
+                Throw New ArgumentException($"Channel ID [{ChannelID}] not found in channel collection", "ChannelID") With {.HelpLink = 1}
            End Get
        End Property
        Friend Sub DownloadData(ByVal Token As CancellationToken, Optional ByVal SkipExists As Boolean = True,
--- a/SCrawler/API/Reddit/Declarations.vb
+++ b/SCrawler/API/Reddit/Declarations.vb
@@ -17,26 +17,8 @@ Namespace API.Reddit
                                                            New NodeParams("children", True, True, True)}
        Friend ReadOnly UrlBasePattern As RParams = RParams.DM("(?<=/)([^/]+?\.[\w]{3,4})(?=(\?|\Z))", 0)
        Friend ReadOnly VideoRegEx As RParams = RParams.DM("http.{0,1}://[^" & Chr(34) & "]+?mp4", 0)
-        Friend ReadOnly DateProvider As New JsonDate
-        Friend ReadOnly DateProviderChannel As New JsonDateChannel
        Private ReadOnly EUR_PROVIDER As New ANumbers(ANumbers.Cultures.EUR)
-        Friend Class JsonDate : Implements ICustomProvider
-            Friend Function Convert(ByVal Value As Object, ByVal DestinationType As Type, ByVal Provider As IFormatProvider,
-                                    Optional ByVal NothingArg As Object = Nothing, Optional ByVal e As ErrorsDescriber = Nothing) As Object Implements ICustomProvider.Convert
-                Return ADateTime.ParseUnicodeJS(Value, NothingArg, e)
-            End Function
-            Private Function GetFormat(ByVal FormatType As Type) As Object Implements IFormatProvider.GetFormat
-                Throw New NotImplementedException("GetFormat is not available in this context")
-            End Function
-        End Class
-        Friend Class JsonDateChannel : Implements ICustomProvider
-            Friend Function Convert(ByVal Value As Object, ByVal DestinationType As Type, ByVal Provider As IFormatProvider,
-                                    Optional ByVal NothingArg As Object = Nothing, Optional ByVal e As ErrorsDescriber = Nothing) As Object Implements ICustomProvider.Convert
-                Return ADateTime.ParseUnicode(AConvert(Of Integer)(Value, EUR_PROVIDER, Value), NothingArg, e)
-            End Function
-            Private Function GetFormat(ByVal FormatType As Type) As Object Implements IFormatProvider.GetFormat
-                Throw New NotImplementedException("GetFormat is not available in this context")
-            End Function
-        End Class
+        Friend ReadOnly DateProvider As New CustomProvider(Function(v, d, p, n, e) ADateTime.ParseUnicodeJS(v, n, e))
+        Friend ReadOnly DateProviderChannel As New CustomProvider(Function(v, d, p, n, e) ADateTime.ParseUnicode(AConvert(Of Integer)(v, EUR_PROVIDER, v), n, e))
    End Module
 End Namespace
--- a/SCrawler/API/Reddit/M3U8.vb
+++ b/SCrawler/API/Reddit/M3U8.vb
@@ -15,12 +15,10 @@ Namespace API.Reddit
        Friend Module M3U8_Declarations
            Friend ReadOnly BaseUrlPattern As RParams = RParams.DM("([htps:/]{7,8}.+?/.+?)(?=/)", 0, EDP.ReturnValue)
            ''' <summary>Video</summary>
-            Friend ReadOnly PlayListRegEx_1 As RParams = RParams.DM("(#EXT-X-STREAM-INF)(.+)(RESOLUTION=)(\d+)(.+?[\r\n]{1,2})(.+?)([\r\n]{1,2})", 0,
-                                                                    RegexReturn.List, EDP.SendInLog, EDP.ReturnValue)
+            Friend ReadOnly PlayListRegEx_1 As RParams = RParams.DM("(#EXT-X-STREAM-INF)(.+)(RESOLUTION=)(\d+)(.+?[\r\n]{1,2})(.+?)([\r\n]{1,2})", 0, RegexReturn.List)
            ''' <summary>Audio, Video</summary>
-            Friend ReadOnly PlayListRegEx_2 As RParams = RParams.DM("(?<=#EXT-X-BYTERANGE.+?[\r\n]{1,2})(.+)(?=[\r\n]{0,2})", 0,
-                                                                    RegexReturn.List, EDP.SendInLog, EDP.ReturnValue)
-            Friend ReadOnly PlayListAudioRegEx As RParams = RParams.DM("(HLS_AUDIO_(\d+)[^""]+)", 0, RegexReturn.List, EDP.SendInLog, EDP.ReturnValue)
+            Friend ReadOnly PlayListRegEx_2 As RParams = RParams.DM("(?<=#EXT-X-BYTERANGE.+?[\r\n]{1,2})(.+)(?=[\r\n]{0,2})", 0, RegexReturn.List)
+            Friend ReadOnly PlayListAudioRegEx As RParams = RParams.DM("(HLS_AUDIO_(\d+)[^""]+)", 0, RegexReturn.List)
            Friend ReadOnly DPED As New ErrorsDescriber(EDP.SendInLog + EDP.ReturnValue)
        End Module
    End Namespace
@@ -80,11 +78,11 @@ Namespace API.Reddit
                        If Not r.IsEmptyString Then
                            Dim l As New List(Of Resolution)
                            If Type = Types.Video Then
-                                l = FNF.RegexFields(Of Resolution)(r, {PlayListRegEx_1}, {6, 4})
+                                l = RegexFields(Of Resolution)(r, {PlayListRegEx_1}, {6, 4})
                            Else
                                Try
-                                    l = FNF.RegexFields(Of Resolution)(r, {PlayListAudioRegEx}, {1, 2})
-                                Catch anull As FNF.RegexFieldsTextBecameNullException
+                                    l = RegexFields(Of Resolution)(r, {PlayListAudioRegEx}, {1, 2})
+                                Catch anull As RegexFieldsTextBecameNullException
                                    l.Clear()
                                End Try
                            End If
--- a/SCrawler/API/Reddit/RedditViewSettingsForm.vb
+++ b/SCrawler/API/Reddit/RedditViewSettingsForm.vb
@@ -7,17 +7,16 @@
 ' This program is distributed in the hope that it will be useful,
 ' but WITHOUT ANY WARRANTY
 Imports PersonalUtilities.Forms
-Imports PersonalUtilities.Forms.Toolbars
 Imports CView = SCrawler.API.Reddit.IRedditView.View
 Imports CPeriod = SCrawler.API.Reddit.IRedditView.Period
 Namespace API.Reddit
-    Friend Class RedditViewSettingsForm : Implements IOkCancelToolbar
-        Private ReadOnly MyDefs As DefaultFormOptions
+    Friend Class RedditViewSettingsForm
+        Private WithEvents MyDefs As DefaultFormOptions
        Private ReadOnly Property MyOptions As IRedditView
        Friend Sub New(ByRef opt As IRedditView)
            InitializeComponent()
            MyOptions = opt
-            MyDefs = New DefaultFormOptions
+            MyDefs = New DefaultFormOptions(Me, Settings.Design)
        End Sub
        Private Sub ChannelSettingsForm_Load(sender As Object, e As EventArgs) Handles Me.Load
            Try
@@ -29,7 +28,7 @@ Namespace API.Reddit
                End If
                If Not n.IsEmptyString Then Text = n
                With MyDefs
-                    .MyViewInitialize(Me, Settings.Design, True)
+                    .MyViewInitialize(True)
                    .AddOkCancelToolbar()
                    Select Case MyOptions.ViewMode
                        Case CView.Hot : OPT_VIEW_MODE_HOT.Checked = True
@@ -51,7 +50,7 @@ Namespace API.Reddit
                MyDefs.InvokeLoaderError(ex)
            End Try
        End Sub
-        Private Sub OK() Implements IOkCancelToolbar.OK
+        Private Sub MyDefs_ButtonOkClick(ByVal Sender As Object, ByVal e As KeyHandleEventArgs) Handles MyDefs.ButtonOkClick
            With MyOptions
                Select Case True
                    Case OPT_VIEW_MODE_HOT.Checked : .ViewMode = CView.Hot
@@ -69,9 +68,6 @@ Namespace API.Reddit
            End With
            MyDefs.CloseForm()
        End Sub
-        Private Sub Cancel() Implements IOkCancelToolbar.Cancel
-            MyDefs.CloseForm(DialogResult.Cancel)
-        End Sub
        Private Sub OPT_VIEW_MODE_NEW_CheckedChanged(sender As Object, e As EventArgs) Handles OPT_VIEW_MODE_NEW.CheckedChanged
            ChangePeriodEnabled()
        End Sub
--- a/SCrawler/API/Reddit/SiteSettings.vb
+++ b/SCrawler/API/Reddit/SiteSettings.vb
@@ -9,7 +9,7 @@
 Imports SCrawler.API.Base
 Imports SCrawler.Plugin
 Imports SCrawler.Plugin.Attributes
-Imports PersonalUtilities.Tools
+Imports PersonalUtilities.Tools.WEB
 Imports PersonalUtilities.Functions.RegularExpressions
 Imports DownDetector = SCrawler.API.Base.DownDetector
 Imports Download = SCrawler.Plugin.ISiteSettings.Download
@@ -30,16 +30,17 @@ Namespace API.Reddit
        Friend ReadOnly Property SavedPostsUserName As PropertyValue
        <PropertyOption(ControlText:="Use M3U8", ControlToolTip:="Use M3U8 or mp4 for Reddit videos"), PXML>
        Friend ReadOnly Property UseM3U8 As PropertyValue
-        Friend Overrides ReadOnly Property Responser As WEB.Response
+        Friend Overrides ReadOnly Property Responser As Response
        Friend Sub New()
            MyBase.New(RedditSite)
-            Responser = New WEB.Response($"{SettingsFolderName}\Responser_{Site}.xml")
+            Responser = New Response($"{SettingsFolderName}\Responser_{Site}.xml")

            With Responser
                If .File.Exists Then
                    .LoadSettings()
                Else
                    .CookiesDomain = "reddit.com"
+                    .Cookies = New CookieKeeper(.CookiesDomain)
                    .Decoders.Add(SymbolsConverter.Converters.Unicode)
                    .SaveSettings()
                End If
--- a/SCrawler/API/Reddit/UserData.vb
+++ b/SCrawler/API/Reddit/UserData.vb
@@ -58,7 +58,7 @@ Namespace API.Reddit
        Friend Property AutoGetLimits As Boolean = True Implements IChannelLimits.AutoGetLimits
 #End Region
        Friend Property ChannelInfo As Channel
-        Private ReadOnly ChannelPostsNames As New List(Of String)
+        Private ReadOnly ChannelPostsNames As List(Of String)
        Friend Property SkipExistsUsers As Boolean = True Implements IChannelData.SkipExistsUsers
        Private ReadOnly _ExistsUsersNames As List(Of String)
        Friend Property SaveToCache As Boolean = False Implements IChannelData.SaveToCache