2023.3.5.0

Fixed SavedPosts new file naming method Fixed Twitter MD5 comparison error Fixed ffmpeg file parts concatenation algorithm
AAndyProgram · Mar 5, 2023 · db9e2cf · db9e2cf
1 parent 85d8df9
commit db9e2cf
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 17 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -1,3 +1,12 @@
+# 2023.3.5.0
+
+*2023-03-05*
+
+- Fixed
+  - A bug in the new way of naming `SavedPosts` data files.
+  - An error that could occur during Twitter MD5 comparison.
+  - A bug in the ffmpeg file parts concatenation algorithm that could occur in some cases.
+
 # 2023.3.1.0
 
 *2023-03-01*

diff --git a/SCrawler/API/Base/UserDataBase.vb b/SCrawler/API/Base/UserDataBase.vb
@@ -1046,6 +1046,7 @@ BlockNullPicture:
                     u.UpdateUserFile()
                     Dim mfp As SFile = u.File
                     mfp.Name &= "_Posts"
+                    mfp.Extension = "txt"
                     If (ValidateContetnt AndAlso mfp.Exists) Or (Not ValidateContetnt AndAlso u.File.Exists) Or ForceSaved Then MyFileSettings = u.File
                 End If
                 If MyFileSettings.IsEmptyString Then MyFileSettings = User.File

diff --git a/SCrawler/API/BaseObjects/DomainEnvir.vb b/SCrawler/API/BaseObjects/DomainEnvir.vb
@@ -58,9 +58,9 @@ Namespace API.BaseObjects
             s.DomainsChanged = False
         End Sub
         Friend Shared Sub OpenSettingsForm(ByVal s As IDomainContainer)
-            Dim __add As EventHandler(Of SimpleListFormEventArgs) = Sub(sender, e) e.ValueNew = InputBoxE($"Enter a new domain using the pattern [{s.Site}.com]:", "New domain").IfNullOrEmptyE(Nothing)
+            Dim __add As EventHandler(Of SimpleListFormEventArgs) = Sub(sender, e) e.Item = InputBoxE($"Enter a new domain using the pattern [{s.Site}.com]:", "New domain").IfNullOrEmptyE(Nothing)
             Dim __delete As EventHandler(Of SimpleListFormEventArgs) = Sub(sender, e)
-                                                                           Dim n$ = AConvert(Of String)(e.ValueCurrent, AModes.Var, String.Empty)
+                                                                           Dim n$ = AConvert(Of String)(e.Item, AModes.Var, String.Empty)
                                                                            e.Result = MsgBoxE({$"Are you sure you want to delete the [{n}] domain?",
                                                                                               "Removing domains"}, vbYesNo) = vbYes
                                                                        End Sub

diff --git a/SCrawler/API/Twitter/UserData.vb b/SCrawler/API/Twitter/UserData.vb
@@ -394,7 +394,7 @@ Namespace API.Twitter
                                         h = __getMD5(New UserMedia With {.File = existingFiles(i)}, False)
                                         If Not h.IsEmptyString Then
                                             If hashList.ContainsKey(h) Then
-                                                MyMainLOG = $"[{ToStringForLog()}]: Removed image [{existingFiles(i).File}] (duplicate of [{hashList(h).File}])"
+                                                MyMainLOG = $"{ToStringForLog()}: Removed image [{existingFiles(i).File}] (duplicate of [{hashList(h).File}])"
                                                 existingFiles(i).Delete(SFO.File, SFODelete.DeleteToRecycleBin, ErrMD5)
                                                 existingFiles.RemoveAt(i)
                                             Else
@@ -437,7 +437,8 @@ Namespace API.Twitter
 
                     If _ContentList.Count > 0 Then
                         With _ContentList.Select(Function(d) d.MD5)
-                            If .ListExists Then .ToList.ForEach(Sub(md5value) If Not hashList.ContainsKey(md5value) Then hashList.Add(md5value, New SFile))
+                            If .ListExists Then .ToList.ForEach(Sub(md5value) _
+                               If Not md5value.IsEmptyString AndAlso Not hashList.ContainsKey(md5value) Then hashList.Add(md5value, New SFile))
                         End With
                     End If
 

diff --git a/SCrawler/Download/Groups/GroupDefaults.vb b/SCrawler/Download/Groups/GroupDefaults.vb
@@ -117,7 +117,7 @@ Namespace DownloadObjects.Groups
             Select Case Sender.DefaultButton
                 Case ADB.Edit, ADB.Delete
                     With If(Sender.DefaultButton = ADB.Edit, Labels, LabelsExcluded)
-                        Using f As New LabelsForm(.ListSelf, True)
+                        Using f As New LabelsForm(.Self, True)
                             If Sender.DefaultButton = ADB.Delete Then f.Text &= " excluded"
                             f.ShowDialog()
                             If f.DialogResult = DialogResult.OK Then
@@ -133,11 +133,11 @@ Namespace DownloadObjects.Groups
             Select Case Sender.DefaultButton
                 Case ADB.Edit, ADB.Delete
                     With If(Sender.DefaultButton = ADB.Edit, Sites, SitesExcluded)
-                        Using f As New Editors.SiteSelectionForm(.ListSelf)
+                        Using f As New Editors.SiteSelectionForm(.Self)
                             If Sender.DefaultButton = ADB.Delete Then f.Text &= " excluded"
                             f.ShowDialog()
                             If f.DialogResult = DialogResult.OK Then
-                                .AsList.ListAddList(f.SelectedSites, LAP.NotContainsOnly, LAP.ClearBeforeAdd)
+                                .Self.ListAddList(f.SelectedSites, LAP.NotContainsOnly, LAP.ClearBeforeAdd)
                                 UpdateSitesText()
                             End If
                         End Using

diff --git a/SCrawler/ListImagesLoader.vb b/SCrawler/ListImagesLoader.vb
@@ -197,7 +197,7 @@ Friend Class ListImagesLoader
             ElseIf CheckUserCollection(User) Then
                 .BackColor = Color.LightSkyBlue
                 .ForeColor = Color.MidnightBlue
-            Else 'If Not IsInit Then
+            Else
                 .BackColor = Settings.UserListBackColorF
                 .ForeColor = Settings.UserListForeColorF
             End If

diff --git a/SCrawler/My Project/AssemblyInfo.vb b/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.3.1.0")>
-<Assembly: AssemblyFileVersion("2023.3.1.0")>
+<Assembly: AssemblyVersion("2023.3.5.0")>
+<Assembly: AssemblyFileVersion("2023.3.5.0")>
 <Assembly: NeutralResourcesLanguage("en")>
diff --git a/SCrawler/SettingsCLS.vb b/SCrawler/SettingsCLS.vb
@@ -81,12 +81,9 @@ Friend Class SettingsCLS : Implements IDisposable
 
         FFMPEGNotification = New XMLValue(Of Boolean)("FFMPEGNotification", True, MyXML)
         If Not FfmpegExists Then
-            If FFMPEGNotification.Value AndAlso MsgBoxE(New MMessage("[ffmpeg.exe] is missing", "ffmpeg.exe",
-                                                        {"OK", New MsgBoxButton("Disable notification") With {
-                                                        .IsDialogResultButton = False, .ToolTip = "Disable ffmpeg missing notification"}}, vbExclamation) With {
-                                                        .DefaultButton = 0, .CancelButton = 0}) = 1 Then
-                FFMPEGNotification.Value = False
-            End If
+            If FFMPEGNotification.Value AndAlso
+               MsgBoxE({"[ffmpeg.exe] is missing", "ffmpeg.exe"}, vbExclamation,,,
+                       {"OK", New MsgBoxButton("Disable notification", "Disable ffmpeg missing notification")}) = 1 Then FFMPEGNotification.Value = False
         Else
             FFMPEGNotification.Value = True
         End If

diff --git a/SCrawler/UserFinder.vb b/SCrawler/UserFinder.vb
@@ -283,7 +283,7 @@ Friend Class UserFinder : Implements IDisposable
     Private Function GetLabels() As List(Of String)
         Const DesignNode$ = "ImportUserSelectorLabels"
         Try
-            Dim __add As EventHandler(Of SimpleListFormEventArgs) = Sub(sender, e) e.ValueNew = InputBoxE("Enter a new label name", "New label").IfNullOrEmptyE(Nothing)
+            Dim __add As EventHandler(Of SimpleListFormEventArgs) = Sub(sender, e) e.Item = InputBoxE("Enter a new label name", "New label").IfNullOrEmptyE(Nothing)
             Dim l As List(Of String) = ListAddList(Nothing, Settings.Labels, LAP.NotContainsOnly).ListAddValue(LabelImported, LAP.NotContainsOnly)
             If l.Count > 0 Then l.Sort()
             If Not Settings.Design.Contains(DesignNode) Then Settings.Design.Add(DesignNode, String.Empty)