Skip to content

Commit db9e2cf

Browse files
committed
2023.3.5.0
Fixed SavedPosts new file naming method Fixed Twitter MD5 comparison error Fixed ffmpeg file parts concatenation algorithm
1 parent 85d8df9 commit db9e2cf

File tree

9 files changed

+25
-17
lines changed

9 files changed

+25
-17
lines changed

Changelog.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
# 2023.3.5.0
2+
3+
*2023-03-05*
4+
5+
- Fixed
6+
- A bug in the new way of naming `SavedPosts` data files.
7+
- An error that could occur during Twitter MD5 comparison.
8+
- A bug in the ffmpeg file parts concatenation algorithm that could occur in some cases.
9+
110
# 2023.3.1.0
211

312
*2023-03-01*

SCrawler/API/Base/UserDataBase.vb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1046,6 +1046,7 @@ BlockNullPicture:
10461046
u.UpdateUserFile()
10471047
Dim mfp As SFile = u.File
10481048
mfp.Name &= "_Posts"
1049+
mfp.Extension = "txt"
10491050
If (ValidateContetnt AndAlso mfp.Exists) Or (Not ValidateContetnt AndAlso u.File.Exists) Or ForceSaved Then MyFileSettings = u.File
10501051
End If
10511052
If MyFileSettings.IsEmptyString Then MyFileSettings = User.File

SCrawler/API/BaseObjects/DomainEnvir.vb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@ Namespace API.BaseObjects
5858
s.DomainsChanged = False
5959
End Sub
6060
Friend Shared Sub OpenSettingsForm(ByVal s As IDomainContainer)
61-
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)
61+
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)
6262
Dim __delete As EventHandler(Of SimpleListFormEventArgs) = Sub(sender, e)
63-
Dim n$ = AConvert(Of String)(e.ValueCurrent, AModes.Var, String.Empty)
63+
Dim n$ = AConvert(Of String)(e.Item, AModes.Var, String.Empty)
6464
e.Result = MsgBoxE({$"Are you sure you want to delete the [{n}] domain?",
6565
"Removing domains"}, vbYesNo) = vbYes
6666
End Sub

SCrawler/API/Twitter/UserData.vb

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,7 @@ Namespace API.Twitter
394394
h = __getMD5(New UserMedia With {.File = existingFiles(i)}, False)
395395
If Not h.IsEmptyString Then
396396
If hashList.ContainsKey(h) Then
397-
MyMainLOG = $"[{ToStringForLog()}]: Removed image [{existingFiles(i).File}] (duplicate of [{hashList(h).File}])"
397+
MyMainLOG = $"{ToStringForLog()}: Removed image [{existingFiles(i).File}] (duplicate of [{hashList(h).File}])"
398398
existingFiles(i).Delete(SFO.File, SFODelete.DeleteToRecycleBin, ErrMD5)
399399
existingFiles.RemoveAt(i)
400400
Else
@@ -437,7 +437,8 @@ Namespace API.Twitter
437437

438438
If _ContentList.Count > 0 Then
439439
With _ContentList.Select(Function(d) d.MD5)
440-
If .ListExists Then .ToList.ForEach(Sub(md5value) If Not hashList.ContainsKey(md5value) Then hashList.Add(md5value, New SFile))
440+
If .ListExists Then .ToList.ForEach(Sub(md5value) _
441+
If Not md5value.IsEmptyString AndAlso Not hashList.ContainsKey(md5value) Then hashList.Add(md5value, New SFile))
441442
End With
442443
End If
443444

SCrawler/Download/Groups/GroupDefaults.vb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ Namespace DownloadObjects.Groups
117117
Select Case Sender.DefaultButton
118118
Case ADB.Edit, ADB.Delete
119119
With If(Sender.DefaultButton = ADB.Edit, Labels, LabelsExcluded)
120-
Using f As New LabelsForm(.ListSelf, True)
120+
Using f As New LabelsForm(.Self, True)
121121
If Sender.DefaultButton = ADB.Delete Then f.Text &= " excluded"
122122
f.ShowDialog()
123123
If f.DialogResult = DialogResult.OK Then
@@ -133,11 +133,11 @@ Namespace DownloadObjects.Groups
133133
Select Case Sender.DefaultButton
134134
Case ADB.Edit, ADB.Delete
135135
With If(Sender.DefaultButton = ADB.Edit, Sites, SitesExcluded)
136-
Using f As New Editors.SiteSelectionForm(.ListSelf)
136+
Using f As New Editors.SiteSelectionForm(.Self)
137137
If Sender.DefaultButton = ADB.Delete Then f.Text &= " excluded"
138138
f.ShowDialog()
139139
If f.DialogResult = DialogResult.OK Then
140-
.AsList.ListAddList(f.SelectedSites, LAP.NotContainsOnly, LAP.ClearBeforeAdd)
140+
.Self.ListAddList(f.SelectedSites, LAP.NotContainsOnly, LAP.ClearBeforeAdd)
141141
UpdateSitesText()
142142
End If
143143
End Using

SCrawler/ListImagesLoader.vb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ Friend Class ListImagesLoader
197197
ElseIf CheckUserCollection(User) Then
198198
.BackColor = Color.LightSkyBlue
199199
.ForeColor = Color.MidnightBlue
200-
Else 'If Not IsInit Then
200+
Else
201201
.BackColor = Settings.UserListBackColorF
202202
.ForeColor = Settings.UserListForeColorF
203203
End If

SCrawler/My Project/AssemblyInfo.vb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices
3232
' by using the '*' as shown below:
3333
' <Assembly: AssemblyVersion("1.0.*")>
3434

35-
<Assembly: AssemblyVersion("2023.3.1.0")>
36-
<Assembly: AssemblyFileVersion("2023.3.1.0")>
35+
<Assembly: AssemblyVersion("2023.3.5.0")>
36+
<Assembly: AssemblyFileVersion("2023.3.5.0")>
3737
<Assembly: NeutralResourcesLanguage("en")>

SCrawler/SettingsCLS.vb

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -81,12 +81,9 @@ Friend Class SettingsCLS : Implements IDisposable
8181

8282
FFMPEGNotification = New XMLValue(Of Boolean)("FFMPEGNotification", True, MyXML)
8383
If Not FfmpegExists Then
84-
If FFMPEGNotification.Value AndAlso MsgBoxE(New MMessage("[ffmpeg.exe] is missing", "ffmpeg.exe",
85-
{"OK", New MsgBoxButton("Disable notification") With {
86-
.IsDialogResultButton = False, .ToolTip = "Disable ffmpeg missing notification"}}, vbExclamation) With {
87-
.DefaultButton = 0, .CancelButton = 0}) = 1 Then
88-
FFMPEGNotification.Value = False
89-
End If
84+
If FFMPEGNotification.Value AndAlso
85+
MsgBoxE({"[ffmpeg.exe] is missing", "ffmpeg.exe"}, vbExclamation,,,
86+
{"OK", New MsgBoxButton("Disable notification", "Disable ffmpeg missing notification")}) = 1 Then FFMPEGNotification.Value = False
9087
Else
9188
FFMPEGNotification.Value = True
9289
End If

SCrawler/UserFinder.vb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ Friend Class UserFinder : Implements IDisposable
283283
Private Function GetLabels() As List(Of String)
284284
Const DesignNode$ = "ImportUserSelectorLabels"
285285
Try
286-
Dim __add As EventHandler(Of SimpleListFormEventArgs) = Sub(sender, e) e.ValueNew = InputBoxE("Enter a new label name", "New label").IfNullOrEmptyE(Nothing)
286+
Dim __add As EventHandler(Of SimpleListFormEventArgs) = Sub(sender, e) e.Item = InputBoxE("Enter a new label name", "New label").IfNullOrEmptyE(Nothing)
287287
Dim l As List(Of String) = ListAddList(Nothing, Settings.Labels, LAP.NotContainsOnly).ListAddValue(LabelImported, LAP.NotContainsOnly)
288288
If l.Count > 0 Then l.Sort()
289289
If Not Settings.Design.Contains(DesignNode) Then Settings.Design.Add(DesignNode, String.Empty)

0 commit comments

Comments
 (0)