Skip to content

Commit 7d169ac

Browse files
committed
2022.10.23.0
PluginProvider: added 'DoNotUse' attribute. Channels: copying a channel to the 'ChannelsDeleted' folder before deleting. Twitter: updated status codes. AutoDownloader: removed base parameters initialization; updated 'ToEContainer' function; 'StartupDelay' default value = 1; added IIndexable; fixed NextExecutionDate; added task delay based on index and tasks count; updated user selections algorithms. MainFrame: coloring the button 'Download All' depending on the pause; updated user selections algorithms. DownloadGroups: added LabelsExcluded, Sites and SitesExcluded; updated initialization; updated ToEContainer function; updated user selections algorithms IGroup, GroupParameters: added LabelsExcluded, Sites and SitesExcluded; added Import and Export functions Removed TrayIcon notifications. All notifications are now ToastNotifications. SettingsHost: 'DoNotUse' attribute Settings: added 'GetUsers' predicate function
1 parent f5c156b commit 7d169ac

40 files changed

+601
-264
lines changed

Changelog.md

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,22 @@
1+
# 2022.10.23.0
2+
3+
*2022-10-23*
4+
5+
- Added
6+
- RedGifs token Auto-Renewal
7+
- Download groups: ability to select sites
8+
- Download groups: ability to exclude labels and sites
9+
- AutoDownloader: ability to exclude labels and sites in ```All```, ```Default``` and ```Specified``` modes
10+
- The ```Download All``` button turns blue when pause is enabled
11+
- Updated Twitter status codes
12+
- Minor improvements
13+
- Fixed
14+
- Updated Twitter status codes
15+
- AutoDownloader: incorrect next run date in scheduler task information
16+
- AutoDownloader: minor bugs
17+
- (Issue #69) **RedGifs data is not downloading**. Requires token.
18+
- Minor bugs
19+
120
# 2022.10.18.0
221

322
*2022-10-18*
1.73 KB
Loading
1.74 KB
Loading
-26 Bytes
Loading

SCrawler.PluginProvider/Attributes/Attributes.vb

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,9 @@ Namespace Plugin.Attributes
5353
ElementName = XMLElementName
5454
End Sub
5555
End Class
56+
''' <summary>Attribute to disable some properties for host use</summary>
57+
<AttributeUsage(AttributeTargets.Property, AllowMultiple:=False, Inherited:=False)> Public NotInheritable Class DoNotUse : Inherits Attribute
58+
End Class
5659
''' <summary>Special property updater</summary>
5760
<AttributeUsage(AttributeTargets.Method, AllowMultiple:=True, Inherited:=False)> Public NotInheritable Class PropertyUpdater : Inherits Attribute
5861
Public ReadOnly Name As String

SCrawler.PluginProvider/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("2022.10.18.0")>
36-
<Assembly: AssemblyFileVersion("2022.10.18.0")>
35+
<Assembly: AssemblyVersion("2022.10.23.0")>
36+
<Assembly: AssemblyFileVersion("2022.10.23.0")>
3737
<Assembly: NeutralResourcesLanguage("en")>

SCrawler/API/Base/UserDataBase.vb

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -817,6 +817,9 @@ BlockNullPicture:
817817
If Not Responser Is Nothing Then Responser.Dispose()
818818
Responser = New Response
819819
If Not HOST.Responser Is Nothing Then Responser.Copy(HOST.Responser)
820+
'TODO: remove
821+
Responser.DecodersError = New ErrorsDescriber(EDP.SendInLog + EDP.ReturnValue) With {
822+
.DeclaredMessage = New MMessage($"SymbolsConverter error: [{ToStringForLog()}]", ToStringForLog())}
820823

821824
Dim UpPic As Boolean = Settings.ViewModeIsPicture AndAlso GetPicture(Of Image)(False) Is Nothing
822825
Dim sEnvir() As Boolean = {UserExists, UserSuspended}
@@ -976,7 +979,7 @@ BlockNullPicture:
976979
Dim v As UserMedia
977980

978981
Using w As New OptionalWebClient(Me)
979-
If vsf Then SFileShares.SFileExists($"{MyDir}\Video\", SFO.Path)
982+
If vsf Then CSFileP($"{MyDir}\Video\").Exists(SFO.Path)
980983
Progress.Maximum += _ContentNew.Count
981984
For i = 0 To _ContentNew.Count - 1
982985
ThrowAny(Token)

SCrawler/API/Instagram/UserData.vb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -702,7 +702,7 @@ Namespace API.Instagram
702702
UserExists = False
703703
ElseIf Responser.StatusCode = HttpStatusCode.BadRequest Then
704704
HasError = True
705-
MyMainLOG = $"Instagram credentials have expired [{CInt(Responser.StatusCode)}]: {ToString()} [{s}]"
705+
MyMainLOG = $"Instagram credentials have expired [{CInt(Responser.StatusCode)}]: {ToStringForLog()} [{s}]"
706706
DisableSection(s)
707707
ElseIf Responser.StatusCode = HttpStatusCode.Forbidden And s = Sections.Tagged Then
708708
Return 3

SCrawler/API/Reddit/Channel.vb

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -236,8 +236,19 @@ Namespace API.Reddit
236236
Return If(Name.IsEmptyString, ID, Name)
237237
End Function
238238
Friend Sub Delete()
239-
File.Delete(, SFODelete.DeleteToRecycleBin)
240-
FilePosts.Delete(, SFODelete.DeleteToRecycleBin)
239+
Dim f As SFile = ChannelsCollection.ChannelsDeletedPath
240+
With File
241+
f.Name = .Name
242+
f.Extension = .Extension
243+
.Copy(f,, True, SFODelete.DeleteToRecycleBin)
244+
.Delete(, SFODelete.DeleteToRecycleBin)
245+
End With
246+
With FilePosts
247+
f.Name = .Name
248+
f.Extension = .Extension
249+
.Copy(f,, True, SFODelete.DeleteToRecycleBin)
250+
.Delete(, SFODelete.DeleteToRecycleBin)
251+
End With
241252
End Sub
242253
Friend Sub DownloadData(ByVal Token As CancellationToken, Optional ByVal SkipExists As Boolean = True,
243254
Optional ByVal p As MyProgress = Nothing)

SCrawler/API/Reddit/ChannelsCollection.vb

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,11 @@ Namespace API.Reddit
1717
Return $"{SettingsFolderName}\Channels\"
1818
End Get
1919
End Property
20+
Friend Shared ReadOnly Property ChannelsDeletedPath As SFile
21+
Get
22+
Return $"{SettingsFolderName}\ChannelsDeleted\"
23+
End Get
24+
End Property
2025
Friend Shared ReadOnly Property ChannelsPathCache As SFile
2126
Get
2227
Return $"{Settings.GlobalPath.Value.PathWithSeparator}_CachedData\"

0 commit comments

Comments
 (0)