From 54ffe10f71df4d953aa1881c4137a0ceae0078de Mon Sep 17 00:00:00 2001 From: Andy <88590076+AAndyProgram@users.noreply.github.com> Date: Mon, 22 Aug 2022 02:42:36 +0300 Subject: [PATCH] 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 --- CONTRIBUTING.md | 8 +- Changelog.md | 66 +++++ ProgramScreenshots/SettingsAutoDownloader.png | Bin 15744 -> 16327 bytes README.md | 5 +- SCrawler.Plugin.LPSG/Declarations.vb | 16 +- .../My Project/AssemblyInfo.vb | 6 +- SCrawler.Plugin.LPSG/SiteSettings.vb | 4 +- SCrawler.Plugin.LPSG/UserData.vb | 2 +- SCrawler.Plugin.XVIDEOS/M3U8.vb | 5 +- .../My Project/AssemblyInfo.vb | 6 +- SCrawler.Plugin.XVIDEOS/SettingsForm.vb | 27 +- SCrawler.Plugin.XVIDEOS/SiteSettings.vb | 2 +- SCrawler.Plugin.XVIDEOS/UserData.vb | 19 +- .../My Project/AssemblyInfo.vb | 6 +- .../Objects/ExchangeOptions.vb | 10 +- .../Objects/PropertyData.vb | 6 +- SCrawler/API/Base/DownDetector.vb | 2 +- SCrawler/API/Base/ProfileSaved.vb | 7 +- SCrawler/API/Base/SiteSettingsBase.vb | 2 +- SCrawler/API/Base/UserDataBase.vb | 55 ++-- SCrawler/API/Imgur/Envir.vb | 2 +- SCrawler/API/Instagram/Declarations.vb | 11 +- SCrawler/API/Instagram/OptionsForm.vb | 14 +- SCrawler/API/Instagram/SiteSettings.vb | 16 +- SCrawler/API/Instagram/UserData.vb | 12 +- SCrawler/API/Reddit/Channel.vb | 18 +- SCrawler/API/Reddit/ChannelsCollection.vb | 16 +- SCrawler/API/Reddit/Declarations.vb | 22 +- SCrawler/API/Reddit/M3U8.vb | 14 +- SCrawler/API/Reddit/RedditViewSettingsForm.vb | 14 +- SCrawler/API/Reddit/SiteSettings.vb | 7 +- SCrawler/API/Reddit/UserData.vb | 2 +- SCrawler/API/Redgifs/Declarations.vb | 11 +- SCrawler/API/Redgifs/UserData.vb | 2 +- SCrawler/API/Twitter/SiteSettings.vb | 11 +- SCrawler/API/Twitter/UserData.vb | 14 +- SCrawler/API/UserDataBind.vb | 16 +- SCrawler/Channels/ChannelViewForm.vb | 42 +-- SCrawler/Channels/ChannelsStatsForm.vb | 44 +--- .../Download/ActiveDownloadingProgress.vb | 1 - SCrawler/Download/AutoDownloader.vb | 103 +++++--- .../AutoDownloaderEditorForm.Designer.vb | 88 +++++-- .../Download/AutoDownloaderEditorForm.resx | 3 + SCrawler/Download/AutoDownloaderEditorForm.vb | 32 ++- SCrawler/Download/DownloadedInfoForm.vb | 6 +- SCrawler/Download/Groups/DownloadGroup.vb | 2 +- .../Groups/DownloadGroupCollection.vb | 5 +- SCrawler/Download/Groups/GroupDefaults.vb | 2 +- SCrawler/Download/Groups/GroupEditorForm.vb | 18 +- .../Download/SchedulerEditorForm.Designer.vb | 37 ++- SCrawler/Download/SchedulerEditorForm.resx | 3 + SCrawler/Download/SchedulerEditorForm.vb | 54 ++-- SCrawler/Download/TDownloader.vb | 77 +----- .../Download/VideosDownloaderForm.Designer.vb | 15 +- SCrawler/Download/VideosDownloaderForm.resx | 30 +++ SCrawler/Download/VideosDownloaderForm.vb | 135 ++++++---- .../Editors/CollectionEditorForm.Designer.vb | 59 +++-- SCrawler/Editors/CollectionEditorForm.resx | 7 +- SCrawler/Editors/CollectionEditorForm.vb | 18 +- .../Editors/GlobalSettingsForm.Designer.vb | 4 +- SCrawler/Editors/GlobalSettingsForm.vb | 45 ++-- SCrawler/Editors/LabelsForm.Designer.vb | 37 ++- SCrawler/Editors/LabelsForm.resx | 3 + SCrawler/Editors/LabelsForm.vb | 29 +-- SCrawler/Editors/SiteDefaults.vb | 7 - SCrawler/Editors/SiteEditorForm.Designer.vb | 37 ++- SCrawler/Editors/SiteEditorForm.resx | 3 + SCrawler/Editors/SiteEditorForm.vb | 71 +++--- SCrawler/Editors/SiteSelectionForm.vb | 46 ++-- SCrawler/Editors/UserCreatorForm.Designer.vb | 45 ++-- SCrawler/Editors/UserCreatorForm.resx | 3 + SCrawler/Editors/UserCreatorForm.vb | 31 ++- SCrawler/FDatePickerForm.vb | 20 +- SCrawler/LabelsKeeper.vb | 2 +- SCrawler/ListImagesLoader.vb | 12 +- SCrawler/MainFrame.Designer.vb | 18 +- SCrawler/MainFrame.vb | 17 +- SCrawler/MainFrameObjects.vb | 6 +- SCrawler/MainMod.vb | 240 +----------------- SCrawler/My Project/AssemblyInfo.vb | 6 +- .../PluginsEnvironment/Hosts/PluginHost.vb | 4 +- .../Hosts/PropertyValueHost.vb | 2 +- .../PluginsEnvironment/Hosts/UserDataHost.vb | 4 +- SCrawler/SCrawler.vbproj | 6 + SCrawler/SettingsCLS.vb | 23 +- SCrawler/UserBan.vb | 95 +++++++ SCrawler/UserImage.vb | 20 +- SCrawler/UserInfo.vb | 148 +++++++++++ 88 files changed, 1155 insertions(+), 1066 deletions(-) create mode 100644 SCrawler/UserBan.vb create mode 100644 SCrawler/UserInfo.vb diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 54fd6a6..bae6124 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -11,10 +11,14 @@ I welcome requests! Follow these steps to contribute: 1. Delete the "PersonalUtilities" project from the solution. 1. Delete the "PersonalUtilities.Notifications" project from the solution. -1. Add the latest versions of the ```PersonalUtilities.dll``` and ```PersonalUtilities.Notifications.dll``` libraries (from the [latest release](https://github.com/AAndyProgram/SCrawler/releases/latest)). +1. The following libraries must be added to project references with the '**Copy to output folder**' option: + - ```PersonalUtilities.dll``` + - ```PersonalUtilities.Notifications.dll``` + - ```Microsoft.Toolkit.Uwp.Notifications.dll``` + - ```System.ValueTuple.dll``` 1. Import PersonalUtilities.Functions for the whole project. -**Always use the correct "PersonalUtilities.dll" library. You must download this library from the release of the code you downloaded.** +**Always use the correct libraries. You must download libraries from the same release date as the code commit date.** # How to request a new site diff --git a/Changelog.md b/Changelog.md index f150012..03e6d29 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,5 +1,21 @@ +# 2022.8.22.0 + +*2022-08-22* + +- Added + - Ability to enable/disable the display of the downloaded image in toast notifications (AutoDownloader) + - Ability to enable/disable the display of the user icon in toast notifications (AutoDownloader) + - Downloading with standalone video downloader has been moved to a separate thread +- Fixed + - (Issue #35) The file name does not change only by date + - (Issue #62) Internal library error + - AutoDownloader option ```Show notifications``` not saved + - Minor bugs + # 2022.7.7.0 +*2022-07-07* + - Added - **Scheduler** (creating multiple automation tasks) - Automation startup delay @@ -16,6 +32,8 @@ # 2022.6.10.0 +*2022-06-10* + **Attention! From now on, Instagram requires Cookies, Hash and authorization headers!** - Fixed @@ -23,6 +41,8 @@ # 2022.6.6.0 +*2022-06-06* + - Added - Ability to pause automation - Fixed @@ -31,6 +51,8 @@ # 2022.6.3.0 +*2022-06-03* + Changed version numbering method. From now on, new versions will be numbered by release date (YYYY.M.D) **Attention! Starting with this release, SCrawler may not work on windows 7 and 8 or may not work correctly. All future releases will only be guaranteed to work on windows 10 and 11.** @@ -44,6 +66,8 @@ Changed version numbering method. From now on, new versions will be numbered by # 3.0.0.10 +*2022-05-23* + - Added - **Downloading groups** - **Download saved Twitter posts** (bookmarks) @@ -65,6 +89,8 @@ Changed version numbering method. From now on, new versions will be numbered by # 3.0.0.9 +*2022-04-24* + - Added - Excluded labels - Ability to disable user grouping @@ -75,6 +101,8 @@ Changed version numbering method. From now on, new versions will be numbered by # 3.0.0.8 +*2022-04-19* + - Added - Script mode ```command``` - Disabled Instagram error 403 (Forbidden) logging for downloading tagged data @@ -83,6 +111,8 @@ Changed version numbering method. From now on, new versions will be numbered by # 3.0.0.7 +*2022-04-14* + - Added - Ability to run a script after the user download is complete - Hotkey ```F2``` for additional options in the user creation form @@ -93,6 +123,8 @@ Changed version numbering method. From now on, new versions will be numbered by # 3.0.0.6 +*2022-04-04* + - Added - ```GoTo Start``` channels button - ```GoTo End``` channels button @@ -104,17 +136,23 @@ Changed version numbering method. From now on, new versions will be numbered by # 3.0.0.5 +*2022-04-02* + - Added - ```New```, ```Hot```, ```Top``` Reddit channel and user download modes # 3.0.0.4 +*2022-03-26* + - Fixed - External plugins do not save information about downloaded files - The user cannot be added to the collection if a special path has been specified. # 3.0.0.3 +*2022-03-24* + - Added - Download all by specific sites - Download all, ignoring the ```Ready for download``` option @@ -126,6 +164,8 @@ Changed version numbering method. From now on, new versions will be numbered by # 3.0.0.2 +*2022-03-22* + - Added - **LPSG** site plugin - **XVIDEOS** site plugin @@ -136,6 +176,8 @@ Changed version numbering method. From now on, new versions will be numbered by # 3.0.0.1 +*2022-03-20* + - Added - Download data up to a specific date - Update and Reset functions in the plugin (ISiteSettings) @@ -149,6 +191,8 @@ Changed version numbering method. From now on, new versions will be numbered by # 3.0.0.0 +*2022-03-17* + **Attention! This version of the program makes changes user data file (Users.xml). Once you start using this version, you will not be able to use previous versions of the program. Therefore, it is highly recommended to archive the program settings folder and archive the users' data files (you can use the [```ArchiveSCrawlerUsersDataFiles.bat```](Tools/ArchiveSCrawlerUsersDataFiles.bat) tool to archive the data files of all users).** - Added @@ -189,6 +233,8 @@ At the requests of some users, I added [screenshots](ProgramScreenshots) of the # 2.0.0.4 +*2022-02-07* + **Removed compatibility of program settings with version 1.0.0.4 and lower.** **If your program version is 1.0.0.4 and lower, it is strongly recommended that you upgrade to release 2.0.0.1 to update the program settings (and run the program). Then update to this release. Otherwise, you will have to configure the program settings again** @@ -203,6 +249,8 @@ At the requests of some users, I added [screenshots](ProgramScreenshots) of the # 2.0.0.3 +*2022-02-02* + **Removed compatibility of program settings with version 1.0.0.4 and lower.** **If your program version is 1.0.0.4 and lower, it is strongly recommended that you upgrade to release 2.0.0.1 to update the program settings (and run the program). Then update to this release. Otherwise, you will have to configure the program settings again** @@ -218,6 +266,8 @@ At the requests of some users, I added [screenshots](ProgramScreenshots) of the # 2.0.0.2 +*2022-01-23* + **This is the last release that supports program settings of version 1.0.0.4 and lower. Compatibility of program settings with version 1.0.0.4 and lower will be removed in future releases. It is strongly recommended that you upgrade to this release before future releases. Otherwise, you will have to configure the program settings again. If your program version is 1.0.1.0 or higher, you should not pay attention to this message.** - Added @@ -240,6 +290,8 @@ At the requests of some users, I added [screenshots](ProgramScreenshots) of the # 2.0.0.1 +*2021-12-29* + - Added - Download individual Imgur media files (use the "Download video" form). - Fixed @@ -248,6 +300,8 @@ At the requests of some users, I added [screenshots](ProgramScreenshots) of the # 2.0.0.0 +*2021-12-27* + - Added - **Instagram** - Filter by site @@ -265,6 +319,8 @@ At the requests of some users, I added [screenshots](ProgramScreenshots) of the # 1.0.1.0 +*2021-12-20* + - Added - Extended site settings - Non-existend users will be marked in red @@ -286,6 +342,8 @@ At the requests of some users, I added [screenshots](ProgramScreenshots) of the # 1.0.0.4 +*2021-12-12* + - Added - Full channels support (you can now add channel (subreddit) for standard download) - ```Ready for download``` now available for collections and can be changed for multiple user @@ -294,12 +352,16 @@ At the requests of some users, I added [screenshots](ProgramScreenshots) of the # 1.0.0.3 +*2021-12-11* + - Fixed - Custom "Download videos" option is not saved - The "Download all" button is not activated after changing modes # 1.0.0.2 +*2021-12-10* + - Added - Ability to choose what types of media you want to download (images only, videos only, both) - Ability to name files by date @@ -308,6 +370,8 @@ At the requests of some users, I added [screenshots](ProgramScreenshots) of the # 1.0.0.1 +*2021-12-09* + - Added - Limited download if user added from the channel - Forced limited download for any user @@ -330,4 +394,6 @@ At the requests of some users, I added [screenshots](ProgramScreenshots) of the # 1.0.0.0 +*2021-12-07* + Initial release \ No newline at end of file diff --git a/ProgramScreenshots/SettingsAutoDownloader.png b/ProgramScreenshots/SettingsAutoDownloader.png index 0ad48e70b3d1bde1579974436e2ecac7a263f4d9..f95d35c6b80c96827c22985edc94128b6ea4494e 100644 GIT binary patch literal 16327 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 Gy!u}(rxC#b literal 15744 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 Py`m(q{uJ@#`K$i{ri8F` diff --git a/README.md b/README.md index 5d5a42d..4dd95ab 100644 --- a/README.md +++ b/README.md @@ -100,10 +100,7 @@ Just download [latest](https://github.com/AAndyProgram/SCrawler/releases/latest) # How to build from source -1. Delete the "PersonalUtilities" project from the solution. -1. Delete the "PersonalUtilities.Notifications" project from the solution. -1. Add the latest versions of the ```PersonalUtilities.dll``` and ```PersonalUtilities.Notifications.dll``` libraries (from the [latest release](https://github.com/AAndyProgram/SCrawler/releases/latest)). -1. Import PersonalUtilities.Functions for the whole project. +Read about how to build from source [here](CONTRIBUTING.md#how-to-build-from-source) # How to make a plugin diff --git a/SCrawler.Plugin.LPSG/Declarations.vb b/SCrawler.Plugin.LPSG/Declarations.vb index 814f03b..bc26e55 100644 --- a/SCrawler.Plugin.LPSG/Declarations.vb +++ b/SCrawler.Plugin.LPSG/Declarations.vb @@ -30,19 +30,5 @@ Friend Module Declarations Friend ReadOnly Property FileRegExExt As New RParams(FileUrlRegexDefault, 0, Nothing, InputForbidRemover) Friend ReadOnly Property FileRegExExt2 As New RParams("([^/]+?)(?=(\Z|&))", 0, Nothing, InputForbidRemover) Friend ReadOnly Property FileExistsRegEx As RParams = RParams.DMS(FileUrlRegexDefault, 2) - Private Class PUMComparer : Implements IEqualityComparer, IEqualityComparer(Of PluginUserMedia) - Private Overloads Function Equals(ByVal x As PluginUserMedia, ByVal y As PluginUserMedia) As Boolean Implements IEqualityComparer(Of PluginUserMedia).Equals - Return x.URL = y.URL - End Function - Private Function IEqualityComparer_Equals(ByVal x As Object, ByVal y As Object) As Boolean Implements IEqualityComparer.Equals - Return DirectCast(x, PluginUserMedia).URL = DirectCast(y, PluginUserMedia).URL - End Function - Private Overloads Function GetHashCode(ByVal Obj As Object) As Integer Implements IEqualityComparer.GetHashCode - Throw New NotImplementedException() - End Function - Private Overloads Function GetHashCode(ByVal Obj As PluginUserMedia) As Integer Implements IEqualityComparer(Of PluginUserMedia).GetHashCode - Throw New NotImplementedException() - End Function - End Class - Friend ReadOnly TempListAddParams As New ListAddParams(LAP.NotContainsOnly) With {.Comparer = New PUMComparer} + Friend ReadOnly TempListAddParams As New ListAddParams(LAP.NotContainsOnly) With {.Comparer = New FComparer(Of PluginUserMedia)(Function(x, y) x.URL = y.URL)} End Module \ No newline at end of file diff --git a/SCrawler.Plugin.LPSG/My Project/AssemblyInfo.vb b/SCrawler.Plugin.LPSG/My Project/AssemblyInfo.vb index 74db492..6aa2f22 100644 --- a/SCrawler.Plugin.LPSG/My Project/AssemblyInfo.vb +++ b/SCrawler.Plugin.LPSG/My Project/AssemblyInfo.vb @@ -13,7 +13,7 @@ Imports System.Runtime.InteropServices - + @@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices ' by using the '*' as shown below: ' - - + + diff --git a/SCrawler.Plugin.LPSG/SiteSettings.vb b/SCrawler.Plugin.LPSG/SiteSettings.vb index 239d091..308f5db 100644 --- a/SCrawler.Plugin.LPSG/SiteSettings.vb +++ b/SCrawler.Plugin.LPSG/SiteSettings.vb @@ -30,7 +30,7 @@ Public Class SiteSettings : Implements ISiteSettings .LoadSettings() Else .CookiesDomain = "www.lpsg.com" - .Cookies = New CookieKeeper("www.lpsg.com") + .Cookies = New CookieKeeper(.CookiesDomain) End If End With End Sub @@ -81,7 +81,7 @@ Public Class SiteSettings : Implements ISiteSettings Else Return Nothing End If - Catch ex As Exception + Catch Return Nothing End Try End Function diff --git a/SCrawler.Plugin.LPSG/UserData.vb b/SCrawler.Plugin.LPSG/UserData.vb index c839d90..7c71a08 100644 --- a/SCrawler.Plugin.LPSG/UserData.vb +++ b/SCrawler.Plugin.LPSG/UserData.vb @@ -95,7 +95,7 @@ Public Class UserData : Implements IPluginContentProvider If Responser.StatusCode = Net.HttpStatusCode.ServiceUnavailable Then LogProvider.Add("LPSG not available") Else - LogProvider.Add(ex, "[LPSG.UserData.GetMedia]") + LogProvider.Add(ex, $"[LPSG.UserData.GetMedia({Name})]") End If End Try End Sub diff --git a/SCrawler.Plugin.XVIDEOS/M3U8.vb b/SCrawler.Plugin.XVIDEOS/M3U8.vb index 1514709..e5b58f5 100644 --- a/SCrawler.Plugin.XVIDEOS/M3U8.vb +++ b/SCrawler.Plugin.XVIDEOS/M3U8.vb @@ -47,8 +47,7 @@ Friend NotInheritable Class M3U8 CachePath.Delete(SFO.Path, SFODelete.None, EDP.None) End Try End Function - Friend Shared Function Download(ByVal URL As String, ByVal Appender As String, ByVal ffmpegFile As SFile, ByVal f As SFile, - ByRef Logger As ILogProvider) As SFile + Friend Shared Function Download(ByVal URL As String, ByVal Appender As String, ByVal ffmpegFile As SFile, ByVal f As SFile, ByRef Logger As ILogProvider) As SFile Try If Not URL.IsEmptyString Then Using w As New WebClient @@ -62,7 +61,7 @@ Friend NotInheritable Class M3U8 End If Return Nothing Catch ex As Exception - If Not ex.HelpLink = 1 Then Logger.Add(ex, "[M3U8.Download]") + If Not ex.HelpLink = 1 Then Logger.Add(ex, $"[M3U8.Download({URL}, {Appender}, {ffmpegFile}, {f})]") Throw ex End Try End Function diff --git a/SCrawler.Plugin.XVIDEOS/My Project/AssemblyInfo.vb b/SCrawler.Plugin.XVIDEOS/My Project/AssemblyInfo.vb index 905d15a..5757cfc 100644 --- a/SCrawler.Plugin.XVIDEOS/My Project/AssemblyInfo.vb +++ b/SCrawler.Plugin.XVIDEOS/My Project/AssemblyInfo.vb @@ -13,7 +13,7 @@ Imports System.Runtime.InteropServices - + @@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices ' by using the '*' as shown below: ' - - + + diff --git a/SCrawler.Plugin.XVIDEOS/SettingsForm.vb b/SCrawler.Plugin.XVIDEOS/SettingsForm.vb index 824f346..a434fbe 100644 --- a/SCrawler.Plugin.XVIDEOS/SettingsForm.vb +++ b/SCrawler.Plugin.XVIDEOS/SettingsForm.vb @@ -17,19 +17,15 @@ Public Class SettingsForm MyDefs = New DefaultFormOptions(Me, Design) End Sub Private Sub SettingsForm_Load(sender As Object, e As EventArgs) Handles Me.Load - Try - With MyDefs - .MyViewInitialize(True) - .AddEditToolbar({EditToolbar.ControlItem.Add, EditToolbar.ControlItem.Delete}) - .AddOkCancelToolbar() - If Settings.Domains.Count > 0 Then Settings.Domains.ForEach(Sub(d) LIST_DOMAINS.Items.Add(d)) - .EndLoaderOperations() - End With - Catch ex As Exception - MyDefs.InvokeLoaderError(ex) - End Try + With MyDefs + .MyViewInitialize(True) + .AddEditToolbar({EditToolbar.ControlItem.Add, EditToolbar.ControlItem.Delete}) + .AddOkCancelToolbar() + If Settings.Domains.Count > 0 Then Settings.Domains.ForEach(Sub(d) LIST_DOMAINS.Items.Add(d)) + .EndLoaderOperations() + End With End Sub - Private Sub MyDefs_ButtonOkClick() Handles MyDefs.ButtonOkClick + Private Sub MyDefs_ButtonOkClick(ByVal Sender As Object, ByVal e As KeyHandleEventArgs) Handles MyDefs.ButtonOkClick Settings.Domains.Clear() With LIST_DOMAINS If .Items.Count > 0 Then @@ -39,7 +35,7 @@ Public Class SettingsForm Settings.UpdateDomains() MyDefs.CloseForm() End Sub - Private Sub MyDefs_ButtonAddClick() Handles MyDefs.ButtonAddClick + Private Sub MyDefs_ButtonAddClick(ByVal Sender As Object, ByVal e As EditToolbar.EditToolbarEventArgs) Handles MyDefs.ButtonAddClick Dim nd$ = InputBoxE("Enter a new domain using the pattern [xvideos.com]:", "New domain") If Not nd.IsEmptyString Then If Not LIST_DOMAINS.Items.Contains(nd) Then @@ -49,11 +45,10 @@ Public Class SettingsForm End If End If End Sub - Private Sub MyDefs_ButtonDeleteClick() Handles MyDefs.ButtonDeleteClickE + Private Sub MyDefs_ButtonDeleteClickE(ByVal Sender As Object, ByVal e As EditToolbar.EditToolbarEventArgs) Handles MyDefs.ButtonDeleteClickE If _LatestSelected.ValueBetween(0, LIST_DOMAINS.Items.Count - 1) Then Dim n$ = LIST_DOMAINS.Items(_LatestSelected) - If MsgBoxE({$"Are you sure you want to delete the [{n}] domain?", - "Removing domains"}, MsgBoxStyle.YesNo) = MsgBoxResult.Yes Then + If MsgBoxE({$"Are you sure you want to delete the [{n}] domain?", "Removing domains"}, MsgBoxStyle.YesNo) = MsgBoxResult.Yes Then LIST_DOMAINS.Items.RemoveAt(_LatestSelected) MsgBoxE($"Domain [{n}] removed") Else diff --git a/SCrawler.Plugin.XVIDEOS/SiteSettings.vb b/SCrawler.Plugin.XVIDEOS/SiteSettings.vb index 3714131..37e6b87 100644 --- a/SCrawler.Plugin.XVIDEOS/SiteSettings.vb +++ b/SCrawler.Plugin.XVIDEOS/SiteSettings.vb @@ -26,7 +26,7 @@ Public Class SiteSettings : Implements ISiteSettings Public Property Logger As ILogProvider Implements ISiteSettings.Logger #Region "M3U8" Private ReadOnly OS64 As Boolean - Private ReadOnly FfmpegExists As Boolean + Friend ReadOnly FfmpegExists As Boolean Friend ReadOnly FfmpegFile As SFile Friend ReadOnly Property UseM3U8 As Boolean Get diff --git a/SCrawler.Plugin.XVIDEOS/UserData.vb b/SCrawler.Plugin.XVIDEOS/UserData.vb index 82523c2..3816f21 100644 --- a/SCrawler.Plugin.XVIDEOS/UserData.vb +++ b/SCrawler.Plugin.XVIDEOS/UserData.vb @@ -14,8 +14,8 @@ Imports UStates = SCrawler.Plugin.PluginUserMedia.States Imports UTypes = SCrawler.Plugin.PluginUserMedia.Types Public Class UserData : Implements IPluginContentProvider #Region "Interface declarations" - Public Event ProgressChanged(Count As Integer) Implements IPluginContentProvider.ProgressChanged - Public Event TotalCountChanged(Count As Integer) Implements IPluginContentProvider.TotalCountChanged + Public Event ProgressChanged(ByVal Count As Integer) Implements IPluginContentProvider.ProgressChanged + Public Event TotalCountChanged(ByVal Count As Integer) Implements IPluginContentProvider.TotalCountChanged Public Property Thrower As IThrower Implements IPluginContentProvider.Thrower Public Property LogProvider As ILogProvider Implements IPluginContentProvider.LogProvider Public Property ESettings As ISiteSettings Implements IPluginContentProvider.Settings @@ -56,7 +56,14 @@ Public Class UserData : Implements IPluginContentProvider Private Property Responser As Response Public Sub GetMedia() Implements IPluginContentProvider.GetMedia Try - If Not Settings.UseM3U8 Then LogProvider.Add("File [ffmpeg.exe] not found") : Exit Sub + If Not Settings.UseM3U8 Then + If Settings.FfmpegExists Then + LogProvider.Add($"XVIDEOS [{Name}]: The plugin only works with x64 OS.") + Else + LogProvider.Add($"XVIDEOS [{Name}]: File [ffmpeg.exe] not found") + End If + Exit Sub + End If If Not Responser Is Nothing Then Responser.Dispose() Responser = New Response Responser.Copy(Settings.Responser) @@ -105,9 +112,7 @@ Public Class UserData : Implements IPluginContentProvider If TempMediaList.Count > 0 Then For i% = 0 To TempMediaList.Count - 1 Thrower.ThrowAny() - With TempMediaList(i) - TempMediaList(i) = GetVideoData(.URL, Responser, Settings.DownloadUHD.Value, .PostID, LogProvider) - End With + With TempMediaList(i) : TempMediaList(i) = GetVideoData(.URL, Responser, Settings.DownloadUHD.Value, .PostID, LogProvider) : End With Next TempMediaList.RemoveAll(Function(m) m.URL.IsEmptyString) End If @@ -149,7 +154,7 @@ Public Class UserData : Implements IPluginContentProvider Dim t$ = RegexReplace(r, VideoTitleRegex) r = resp.GetResponse(m,, EDP.ThrowException) If Not r.IsEmptyString Then - Dim ls As List(Of VSize) = FNF.RegexFields(Of VSize)(r, {M3U8Reparse}, {1, 2}) + Dim ls As List(Of VSize) = RegexFields(Of VSize)(r, {M3U8Reparse}, {1, 2}) If ls.ListExists And Not DownloadUHD Then ls.RemoveAll(Function(v) v.Size > 1080) If ls.ListExists Then ls.Sort() diff --git a/SCrawler.PluginProvider/My Project/AssemblyInfo.vb b/SCrawler.PluginProvider/My Project/AssemblyInfo.vb index 237504a..da50e0b 100644 --- a/SCrawler.PluginProvider/My Project/AssemblyInfo.vb +++ b/SCrawler.PluginProvider/My Project/AssemblyInfo.vb @@ -13,7 +13,7 @@ Imports System.Runtime.InteropServices - + @@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices ' by using the '*' as shown below: ' - - + + diff --git a/SCrawler.PluginProvider/Objects/ExchangeOptions.vb b/SCrawler.PluginProvider/Objects/ExchangeOptions.vb index f548c07..03ec801 100644 --- a/SCrawler.PluginProvider/Objects/ExchangeOptions.vb +++ b/SCrawler.PluginProvider/Objects/ExchangeOptions.vb @@ -13,13 +13,13 @@ Namespace Plugin Public HostKey As String Public IsChannel As Boolean Public Exists As Boolean - Public Sub New(ByVal Site As String, ByVal _Name As String) - UserName = _Name + Public Sub New(ByVal Site As String, ByVal Name As String) + UserName = Name SiteName = Site End Sub - Public Sub New(ByVal Site As String, ByVal _Name As String, ByVal _IsChannel As Boolean) - Me.New(Site, _Name) - IsChannel = _IsChannel + Public Sub New(ByVal Site As String, ByVal Name As String, ByVal IsChannel As Boolean) + Me.New(Site, Name) + Me.IsChannel = IsChannel End Sub End Structure End Namespace \ No newline at end of file diff --git a/SCrawler.PluginProvider/Objects/PropertyData.vb b/SCrawler.PluginProvider/Objects/PropertyData.vb index 4e333f5..0ddc0e9 100644 --- a/SCrawler.PluginProvider/Objects/PropertyData.vb +++ b/SCrawler.PluginProvider/Objects/PropertyData.vb @@ -10,9 +10,9 @@ Namespace Plugin Public Structure PropertyData Public ReadOnly Name As String Public ReadOnly Value As Object - Public Sub New(ByVal _Name As String, ByVal _Value As Object) - Name = _Name - Value = _Value + Public Sub New(ByVal Name As String, ByVal Value As Object) + Me.Name = Name + Me.Value = Value End Sub End Structure End Namespace \ No newline at end of file diff --git a/SCrawler/API/Base/DownDetector.vb b/SCrawler/API/Base/DownDetector.vb index d8bb2e7..ec8dc11 100644 --- a/SCrawler/API/Base/DownDetector.vb +++ b/SCrawler/API/Base/DownDetector.vb @@ -37,7 +37,7 @@ Namespace API.Base Using w As New WebClient Dim r$ = w.DownloadString($"https://downdetector.co.uk/status/{Site}/") If Not r.IsEmptyString Then - l = FNF.RegexFields(Of Data)(r, {Params}, {1, 2}) + l = RegexFields(Of Data)(r, {Params}, {1, 2}) If l.ListExists(2) Then l.Sort() l2 = New List(Of Data) diff --git a/SCrawler/API/Base/ProfileSaved.vb b/SCrawler/API/Base/ProfileSaved.vb index 5929fd0..325a0aa 100644 --- a/SCrawler/API/Base/ProfileSaved.vb +++ b/SCrawler/API/Base/ProfileSaved.vb @@ -6,9 +6,9 @@ ' ' This program is distributed in the hope that it will be useful, ' but WITHOUT ANY WARRANTY -Imports SCrawler.Plugin.Hosts Imports System.Threading Imports PersonalUtilities.Forms.Toolbars +Imports SCrawler.Plugin.Hosts Imports PDownload = SCrawler.Plugin.ISiteSettings.Download Namespace API.Base Friend NotInheritable Class ProfileSaved @@ -27,11 +27,8 @@ Namespace API.Base Using user As IUserData = HOST.GetInstance(PDownload.SavedPosts, Nothing, False, False) If Not user Is Nothing AndAlso (Not user.Name.IsEmptyString Or Not HOST.IsMyClass) Then u.Name = user.Name - With DirectCast(user, UserDataBase).User - u.IsChannel = .IsChannel - u.UpdateUserFile() - End With With DirectCast(user, UserDataBase) + With .User : u.IsChannel = .IsChannel : u.UpdateUserFile() : End With .User = u .LoadUserInformation() .IsSavedPosts = True diff --git a/SCrawler/API/Base/SiteSettingsBase.vb b/SCrawler/API/Base/SiteSettingsBase.vb index 4263934..db9c73b 100644 --- a/SCrawler/API/Base/SiteSettingsBase.vb +++ b/SCrawler/API/Base/SiteSettingsBase.vb @@ -25,7 +25,7 @@ Namespace API.Base Site = SiteName Responser = New Response($"{SettingsFolderName}\Responser_{Site}.xml") With Responser - If .File.Exists Then .LoadSettings() Else .CookiesDomain = CookiesDomain : .SaveSettings() + If .File.Exists Then .LoadSettings() Else .CookiesDomain = CookiesDomain : .Cookies = New CookieKeeper(.CookiesDomain) : .SaveSettings() End With End Sub #Region "XML" diff --git a/SCrawler/API/Base/UserDataBase.vb b/SCrawler/API/Base/UserDataBase.vb index 243a9e0..be57d2a 100644 --- a/SCrawler/API/Base/UserDataBase.vb +++ b/SCrawler/API/Base/UserDataBase.vb @@ -83,11 +83,11 @@ Namespace API.Base Dim cb As Color = SystemColors.Control Dim cf As Color = SystemColors.ControlText If Not UserExists Then - cb = ColorBttDeleteBack - cf = ColorBttDeleteFore + cb = MyColor.DeleteBack + cf = MyColor.DeleteFore ElseIf UserSuspended Then - cb = ColorBttEditBack - cf = ColorBttEditFore + cb = MyColor.EditBack + cf = MyColor.EditFore End If For Each b As ToolStripMenuItem In {BTT_CONTEXT_DOWN, BTT_CONTEXT_EDIT, BTT_CONTEXT_DELETE, BTT_CONTEXT_OPEN_PATH, BTT_CONTEXT_OPEN_SITE} If Not b Is Nothing Then b.BackColor = cb : b.ForeColor = cf @@ -227,21 +227,21 @@ Namespace API.Base Return Nothing End If End Function - Friend Function GetUserPictureAddress() As SFile - Return GetPicture(Of SFile)(False) + Friend Function GetUserPictureToastAddress() As SFile + Return GetPicture(Of SFile)(False, True) End Function Friend Overridable Sub SetPicture(ByVal f As SFile) Implements IUserData.SetPicture Try - If Not f.IsEmptyString AndAlso f.Exists Then + If f.Exists Then Using p As New UserImage(f, User.File) : p.Save() : End Using End If - Catch ex As Exception + Catch End Try End Sub Protected Function GetNullPicture(ByVal MaxHeigh As XML.Base.XMLValue(Of Integer)) As Bitmap Return New Bitmap(CInt(DivideWithZeroChecking(MaxHeigh.Value, 100) * 75), MaxHeigh.Value) End Function - Protected Function GetPicture(Of T)(Optional ByVal ReturnNullImageOnNothing As Boolean = True) As T + Protected Function GetPicture(Of T)(Optional ByVal ReturnNullImageOnNothing As Boolean = True, Optional ByVal GetToast As Boolean = False) As T Dim rsfile As Boolean = GetType(T) Is GetType(SFile) Dim f As SFile = Nothing Dim p As UserImage = Nothing @@ -273,7 +273,7 @@ BlockPictureScan: New ErrorsDescriber(EDP.ReturnValue) With { .ReturnValue = New List(Of SFile), .ReturnValueExists = True}).FirstOrDefault - If Not NewPicFile.IsEmptyString AndAlso NewPicFile.Exists Then + If NewPicFile.Exists Then p = New UserImage(NewPicFile, MyFile) p.Save() GoTo BlockReturn @@ -288,8 +288,14 @@ BlockReturn: On Error GoTo BlockNullPicture If Not p Is Nothing Then Dim i As Image = Nothing - Dim a As SFile = p.Address - If Not rsfile Then + Dim a As SFile = Nothing + If rsfile Then + If GetToast Then + a = p.Large.Address + Else + a = p.Address + End If + Else Select Case Settings.ViewMode.Value Case View.LargeIcon : i = p.Large.OriginalImage.Clone Case View.SmallIcon : i = p.Small.OriginalImage.Clone @@ -301,8 +307,8 @@ BlockReturn: BlockNullPicture: If ReturnNullImageOnNothing Then Select Case Settings.ViewMode.Value - Case View.LargeIcon : Return CObj(GetNullPicture(Settings.MaxLargeImageHeigh)) - Case View.SmallIcon : Return CObj(GetNullPicture(Settings.MaxSmallImageHeigh)) + Case View.LargeIcon : Return CObj(GetNullPicture(Settings.MaxLargeImageHeight)) + Case View.SmallIcon : Return CObj(GetNullPicture(Settings.MaxSmallImageHeight)) End Select End If Return Nothing @@ -678,17 +684,8 @@ BlockNullPicture: x.LoadData() If x.Count > 0 Then Dim fs$ = MyFile.CutPath.PathWithSeparator - Dim gfn As Func(Of String, String) = Function(ByVal Input As String) As String - If Input.IsEmptyString Then - Return String.Empty - Else - If Input.Contains("\") Then - Return New SFile(Input).File - Else - Return Input - End If - End If - End Function + Dim gfn As Func(Of String, String) = Function(Input) If(Input.IsEmptyString, String.Empty, + If(Input.Contains("\"), Input.CSFile.File, Input)) For Each v As EContainer In x _ContentList.Add(New UserMedia With { .Type = AConvert(Of Integer)(v.Attribute(Name_MediaType).Value, 0), @@ -743,7 +740,7 @@ BlockNullPicture: If Not URL.IsEmptyString Then Process.Start(URL) Catch ex As Exception If Not e.Exists Then e = New ErrorsDescriber(EDP.ShowAllMsg) - MsgBoxE({$"Error on trying to open [{Site}] page of user [{Name}]", $"User [{ToString()}]"}, MsgBoxStyle.Critical, e, ex) + MsgBoxE({$"Error when trying to open [{Site}] page of user [{Name}]", $"User [{ToString()}]"}, MsgBoxStyle.Critical, e, ex) End Try End Sub Friend Overridable Sub OpenFolder() Implements IUserData.OpenFolder @@ -852,7 +849,7 @@ BlockNullPicture: MyFilePosts.Name &= "_Posts" MyFilePosts.Extension = "txt" Else - Throw New ArgumentNullException("User.File", "User file does not detected") + Throw New ArgumentNullException("User.File", "User file not detected") End If End Sub Protected MustOverride Sub DownloadDataF(ByVal Token As CancellationToken) @@ -962,8 +959,8 @@ BlockNullPicture: Protected Function ChangeFileNameByProvider(ByVal f As SFile, ByVal m As UserMedia) As SFile Dim ff As SFile = Nothing Try - If Not f.IsEmptyString AndAlso f.Exists Then - If Settings.FileReplaceNameByDate Or Settings.FileAddTimeToFileName Then + If f.Exists Then + If Not Settings.FileReplaceNameByDate.Value = FileNameReplaceMode.None Then ff = f ff.Name = String.Format(FileDateAppenderPattern, f.Name, CStr(AConvert(Of String)(If(m.Post.Date, Now), FileDateAppenderProvider, String.Empty))) ff = SFile.Indexed_IndexFile(ff,, New NumberedFile(ff)) diff --git a/SCrawler/API/Imgur/Envir.vb b/SCrawler/API/Imgur/Envir.vb index b9b99e7..08db1d8 100644 --- a/SCrawler/API/Imgur/Envir.vb +++ b/SCrawler/API/Imgur/Envir.vb @@ -79,7 +79,7 @@ Namespace API.Imgur End If Return Nothing Catch ex As Exception - Return ErrorsDescriber.Execute(EDP.ShowMainMsg + EDP.SendInLog, ex, "Imgur standalone downloader: fetch media error") + Return ErrorsDescriber.Execute(EDP.ShowMainMsg + EDP.SendInLog + EDP.ReturnValue, ex, "Imgur standalone downloader: fetch media error") End Try End Function Private Shared Function DownloadingException(ByVal ex As Exception, ByVal Message As String, diff --git a/SCrawler/API/Instagram/Declarations.vb b/SCrawler/API/Instagram/Declarations.vb index 62285aa..de2d2f1 100644 --- a/SCrawler/API/Instagram/Declarations.vb +++ b/SCrawler/API/Instagram/Declarations.vb @@ -11,15 +11,6 @@ Namespace API.Instagram Friend Module Declarations Friend Const InstagramSite As String = "Instagram" Friend ReadOnly FilesPattern As RParams = RParams.DMS(".+?([^/\?]+?\.[\w\d]{3,4})(?=(\?|\Z))", 1, EDP.ReturnValue) - Friend ReadOnly Property DateProvider As New JsonDate - Friend Class JsonDate : Implements ICustomProvider - Private 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(Value) - 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 Property DateProvider As New CustomProvider(Function(v, d, p, n, e) ADateTime.ParseUnicode(v)) End Module End Namespace \ No newline at end of file diff --git a/SCrawler/API/Instagram/OptionsForm.vb b/SCrawler/API/Instagram/OptionsForm.vb index d6b3058..22fe24d 100644 --- a/SCrawler/API/Instagram/OptionsForm.vb +++ b/SCrawler/API/Instagram/OptionsForm.vb @@ -7,19 +7,18 @@ ' This program is distributed in the hope that it will be useful, ' but WITHOUT ANY WARRANTY Imports PersonalUtilities.Forms -Imports PersonalUtilities.Forms.Toolbars Namespace API.Instagram - Friend Class OptionsForm : Implements IOkCancelToolbar - Private ReadOnly MyDefs As DefaultFormOptions + Friend Class OptionsForm + Private WithEvents MyDefs As DefaultFormOptions Private ReadOnly Property MyExchangeOptions As EditorExchangeOptions Friend Sub New(ByRef ExchangeOptions As EditorExchangeOptions) InitializeComponent() MyExchangeOptions = ExchangeOptions - MyDefs = New DefaultFormOptions + MyDefs = New DefaultFormOptions(Me, Settings.Design) End Sub Private Sub OptionsForm_Load(sender As Object, e As EventArgs) Handles Me.Load With MyDefs - .MyViewInitialize(Me, Settings.Design, True) + .MyViewInitialize(True) .AddOkCancelToolbar() With MyExchangeOptions CH_GET_STORIES.Checked = .GetStories @@ -28,15 +27,12 @@ Namespace API.Instagram .EndLoaderOperations() End With End Sub - Private Sub OK() Implements IOkCancelToolbar.OK + Private Sub MyDefs_ButtonOkClick(ByVal Sender As Object, ByVal e As KeyHandleEventArgs) Handles MyDefs.ButtonOkClick With MyExchangeOptions .GetStories = CH_GET_STORIES.Checked .GetTagged = CH_GET_TAGGED.Checked End With MyDefs.CloseForm() End Sub - Private Sub Cancel() Implements IOkCancelToolbar.Cancel - MyDefs.CloseForm(DialogResult.Cancel) - End Sub End Class End Namespace \ No newline at end of file diff --git a/SCrawler/API/Instagram/SiteSettings.vb b/SCrawler/API/Instagram/SiteSettings.vb index cbb67a2..27249f8 100644 --- a/SCrawler/API/Instagram/SiteSettings.vb +++ b/SCrawler/API/Instagram/SiteSettings.vb @@ -10,7 +10,7 @@ Imports SCrawler.API.Base Imports SCrawler.Plugin Imports SCrawler.Plugin.Attributes Imports PersonalUtilities.Forms -Imports PersonalUtilities.Tools +Imports PersonalUtilities.Tools.WEB Imports PersonalUtilities.Functions.XML Imports PersonalUtilities.Functions.XML.Base Imports PersonalUtilities.Functions.RegularExpressions @@ -55,7 +55,7 @@ Namespace API.Instagram Return Nothing End Function Private Function GetFormat(ByVal FormatType As Type) As Object Implements IFormatProvider.GetFormat - Throw New NotImplementedException() + Throw New NotImplementedException("[GetFormat] is not available in the context of [TimersChecker]") End Function End Class Private Class TaggedNotifyLimitChecker : Implements IFieldsCheckerProvider @@ -73,7 +73,7 @@ Namespace API.Instagram End If End Function Private Function GetFormat(ByVal FormatType As Type) As Object Implements IFormatProvider.GetFormat - Throw New NotImplementedException() + Throw New NotImplementedException("[GetFormat] is not available in the context of [TaggedNotifyLimitChecker]") End Function End Class #End Region @@ -186,13 +186,13 @@ Namespace API.Instagram End With End Sub #End Region - Friend Overrides ReadOnly Property Responser As WEB.Response + Friend Overrides ReadOnly Property Responser As Response Private Initialized As Boolean = False #End Region #Region "Initializer" Friend Sub New(ByRef _XML As XmlFile, ByVal GlobalPath As SFile) MyBase.New(InstagramSite) - Responser = New WEB.Response($"{SettingsFolderName}\Responser_{Site}.xml") + Responser = New Response($"{SettingsFolderName}\Responser_{Site}.xml") Dim app_id$ = String.Empty Dim www_claim$ = String.Empty @@ -208,6 +208,7 @@ Namespace API.Instagram End With Else .CookiesDomain = "instagram.com" + .Cookies = New CookieKeeper(.CookiesDomain) .SaveSettings() End If End With @@ -234,8 +235,7 @@ Namespace API.Instagram TaggedNotifyLimit = New PropertyValue(200) TaggedNotifyLimitProvider = New TaggedNotifyLimitChecker - DownloadingErrorDate = New XMLValue(Of Date) With { - .Provider = New XMLValueConversionProvider(Function(ss, vv) AConvert(Of String)(vv, AModes.Var, Nothing))} + DownloadingErrorDate = New XMLValue(Of Date) With {.Provider = New XMLValueConversionProvider(Function(ss, vv) AConvert(Of String)(vv, AModes.Var, Nothing))} DownloadingErrorDate.SetExtended("InstagramDownloadingErrorDate", Now.AddYears(-10), _XML, n) LastDownloadDate = New XMLValue(Of Date)("LastDownloadDate", Now.AddDays(-1), _XML, n) LastRequestsCount = New XMLValue(Of Integer)("LastRequestsCount", 0, _XML, n) @@ -288,7 +288,7 @@ Namespace API.Instagram Return True ElseIf v = -1 Then Return MsgBoxE({"You turn off notifications for tagged posts. This is highly undesirable. Do you still want to do it?", - "Disabling tagged notification limits "}, MsgBoxStyle.YesNo) = MsgBoxResult.Yes + "Disabling tagged notification limits"}, MsgBoxStyle.YesNo) = MsgBoxResult.Yes Else Return False End If diff --git a/SCrawler/API/Instagram/UserData.vb b/SCrawler/API/Instagram/UserData.vb index 52e632d..30f41cc 100644 --- a/SCrawler/API/Instagram/UserData.vb +++ b/SCrawler/API/Instagram/UserData.vb @@ -104,11 +104,7 @@ Namespace API.Instagram End Try End Sub Private _InstaHash As String = String.Empty - Friend Enum Sections - Timeline - Tagged - Stories - End Enum + Private Enum Sections : Timeline : Tagged : Stories : End Enum Private Const StoriesFolder As String = "Stories" Private Const TaggedFolder As String = "Tagged" #Region "429 bypass" @@ -187,7 +183,7 @@ Namespace API.Instagram Dim m As New MMessage("You have not entered a valid posts limit", "Tagged posts download limit", {tryBtt, selectBtt, cancelBtt}) Dim mh As New MMessage("", "Tagged posts download limit", {"Confirm", tryBtt, selectBtt, cancelBtt}) With {.ButtonsPerRow = 2} Do - v = AConvert(Of Integer)(InputBoxE(aStr, "Tagged posts download limit", CInt(MySiteSettings.TaggedNotifyLimit.Value)), Nothing) + v = AConvert(Of Integer)(InputBoxE(aStr, "Tagged posts download limit", CInt(MySiteSettings.TaggedNotifyLimit.Value)), AModes.Var, Nothing) If v.HasValue Then mh.Text = $"You have entered a limit of {v.Value.NumToString(p)} posts" Select Case MsgBoxE(mh).Index @@ -342,8 +338,7 @@ Namespace API.Instagram _TempPostsList.Add(PostID) ObtainMedia2(nn, PostID, SpecFolder) DownloadedTags += 1 - If DownloadTagsLimit.HasValue AndAlso DownloadedTags >= DownloadTagsLimit.Value Then _ - Throw New ExitException(_DownloadComplete) + If DownloadTagsLimit.HasValue AndAlso DownloadedTags >= DownloadTagsLimit.Value Then Throw New ExitException(_DownloadComplete) Next If TaggedLimitsNotifications Then TaggedCount = j.Value("total_count").FromXML(Of Integer)(0) @@ -444,7 +439,6 @@ Namespace API.Instagram End Sub Protected Overrides Sub ReparseVideo(ByVal Token As CancellationToken) End Sub - #End Region #Region "Obtain Media" Private Sub ObtainMedia(ByVal node As EContainer, ByVal PostID As String, ByVal PostDate As String, ByVal SpecFolder As String) diff --git a/SCrawler/API/Reddit/Channel.vb b/SCrawler/API/Reddit/Channel.vb index 968e111..168514e 100644 --- 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"} diff --git a/SCrawler/API/Reddit/ChannelsCollection.vb b/SCrawler/API/Reddit/ChannelsCollection.vb index 2b01e2d..c101266 100644 --- 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, diff --git a/SCrawler/API/Reddit/Declarations.vb b/SCrawler/API/Reddit/Declarations.vb index ab498b5..dc8c030 100644 --- 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 \ No newline at end of file diff --git a/SCrawler/API/Reddit/M3U8.vb b/SCrawler/API/Reddit/M3U8.vb index 265b86f..83cd0c6 100644 --- 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) ''' Video - 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) ''' Audio, Video - 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 diff --git a/SCrawler/API/Reddit/RedditViewSettingsForm.vb b/SCrawler/API/Reddit/RedditViewSettingsForm.vb index 48c7cb6..3a16cd1 100644 --- 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 diff --git a/SCrawler/API/Reddit/SiteSettings.vb b/SCrawler/API/Reddit/SiteSettings.vb index dde1512..b07ad5e 100644 --- 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 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 diff --git a/SCrawler/API/Reddit/UserData.vb b/SCrawler/API/Reddit/UserData.vb index 4ef07ba..f9632b7 100644 --- 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 diff --git a/SCrawler/API/Redgifs/Declarations.vb b/SCrawler/API/Redgifs/Declarations.vb index 0233d07..b36e97e 100644 --- a/SCrawler/API/Redgifs/Declarations.vb +++ b/SCrawler/API/Redgifs/Declarations.vb @@ -9,15 +9,6 @@ Namespace API.RedGifs Friend Module Declarations Friend Const RedGifsSite As String = "RedGifs" - Friend ReadOnly DateProvider As New JsonDate - 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.ParseUnicode(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.ParseUnicode(v, n, e)) End Module End Namespace \ No newline at end of file diff --git a/SCrawler/API/Redgifs/UserData.vb b/SCrawler/API/Redgifs/UserData.vb index 3288cfd..9a59d14 100644 --- a/SCrawler/API/Redgifs/UserData.vb +++ b/SCrawler/API/Redgifs/UserData.vb @@ -9,8 +9,8 @@ Imports PersonalUtilities.Functions.XML Imports PersonalUtilities.Functions.RegularExpressions Imports PersonalUtilities.Tools.WebDocuments.JSON -Imports System.Threading Imports System.Net +Imports System.Threading Imports SCrawler.API.Base Imports UTypes = SCrawler.API.Base.UserMedia.Types Namespace API.RedGifs diff --git a/SCrawler/API/Twitter/SiteSettings.vb b/SCrawler/API/Twitter/SiteSettings.vb index 427ea16..479171b 100644 --- a/SCrawler/API/Twitter/SiteSettings.vb +++ b/SCrawler/API/Twitter/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 Namespace API.Twitter @@ -33,10 +33,10 @@ Namespace API.Twitter Private ReadOnly Property Token As PropertyValue Friend ReadOnly Property SavedPostsUserName As PropertyValue - Friend Overrides ReadOnly Property Responser As WEB.Response + Friend Overrides ReadOnly Property Responser As Response Friend Sub New() MyBase.New(TwitterSite) - Responser = New WEB.Response($"{SettingsFolderName}\Responser_{Site}.xml") + Responser = New Response($"{SettingsFolderName}\Responser_{Site}.xml") Dim a$ = String.Empty Dim t$ = String.Empty @@ -52,11 +52,10 @@ Namespace API.Twitter .ContentType = "application/json" .Accept = "*/*" .CookiesDomain = "twitter.com" + .Cookies = New CookieKeeper(.CookiesDomain) .Decoders.Add(SymbolsConverter.Converters.Unicode) With .Headers - .Add("sec-ch-ua", " Not;A Brand" & Chr(34) & ";v=" & Chr(34) & "99" & Chr(34) & ", " & Chr(34) & - "Google Chrome" & Chr(34) & ";v=" & Chr(34) & "91" & Chr(34) & ", " & Chr(34) & "Chromium" & - Chr(34) & ";v=" & Chr(34) & "91" & Chr(34)) + .Add("sec-ch-ua", " Not;A Brand"";v=""99"", ""Google Chrome"";v=""91"", ""Chromium"";v=""91""") .Add("sec-ch-ua-mobile", "?0") .Add("sec-fetch-dest", "empty") .Add("sec-fetch-mode", "cors") diff --git a/SCrawler/API/Twitter/UserData.vb b/SCrawler/API/Twitter/UserData.vb index 8bc984d..7f2a9f8 100644 --- a/SCrawler/API/Twitter/UserData.vb +++ b/SCrawler/API/Twitter/UserData.vb @@ -63,7 +63,7 @@ Namespace API.Twitter Dim r$ = Responser.GetResponse(URL,, EDP.ThrowException) If Not r.IsEmptyString Then Using w As EContainer = JsonDocument.Parse(r) - If Not w Is Nothing AndAlso w.Count > 0 Then + If w.ListExists Then For Each nn In If(IsSavedPosts, w({"globalObjects", "tweets"}).XmlIfNothing, w) ThrowAny(Token) If nn.Count > 0 Then @@ -141,8 +141,7 @@ Namespace API.Twitter If URL.Contains("twitter") Then Dim PostID$ = RegexReplace(URL, RParams.DM("(?<=/)\d+", 0)) If Not PostID.IsEmptyString Then - Dim r$ = DirectCast(resp.Copy(), Response). - GetResponse($"https://api.twitter.com/1.1/statuses/show.json?id={PostID}",, EDP.ReturnValue) + Dim r$ = DirectCast(resp.Copy(), Response).GetResponse($"https://api.twitter.com/1.1/statuses/show.json?id={PostID}",, EDP.ReturnValue) If Not r.IsEmptyString Then Using j As EContainer = JsonDocument.Parse(r) If j.ListExists Then @@ -163,7 +162,7 @@ Namespace API.Twitter Const P4K As String = "4096x4096" Try Dim ww As EContainer = w("sizes") - If Not ww Is Nothing AndAlso ww.Count > 0 Then + If ww.ListExists Then Dim l As New List(Of Sizes) Dim Orig As Sizes? = New Sizes(w.Value({"original_info"}, "height").FromXML(Of Integer)(-1), P4K) If Orig.Value.Value = -1 Then Orig = Nothing @@ -177,7 +176,6 @@ Namespace API.Twitter Return P4K ElseIf l(0).Data.IsEmptyString Then Return P4K - 'If LargeContained Then Return "large" Else Return P4K Else Return l(0).Data End If @@ -222,8 +220,8 @@ Namespace API.Twitter Dim url$, ff$ Dim f As SFile Dim m As UserMedia - With w({"extended_entities", "media"}).XmlIfNothing - If .Count > 0 Then + 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"}).XmlIfNothing.ItemF({gifUrl}).XmlIfNothing @@ -251,7 +249,7 @@ Namespace API.Twitter End Function Private Shared Function GetVideoNodeURL(ByVal w As EContainer) As String Dim v As EContainer = w.GetNode(VideoNode) - If Not v Is Nothing AndAlso v.Count > 0 Then + If v.ListExists Then Dim l As New List(Of Sizes) Dim u$ Dim nn As EContainer diff --git a/SCrawler/API/UserDataBind.vb b/SCrawler/API/UserDataBind.vb index 7acfed4..bd717f5 100644 --- a/SCrawler/API/UserDataBind.vb +++ b/SCrawler/API/UserDataBind.vb @@ -79,7 +79,7 @@ Namespace API If Count > 0 Then Return Collections(0).GetPicture Else - Return GetNullPicture(Settings.MaxLargeImageHeigh) + Return GetNullPicture(Settings.MaxLargeImageHeight) End If End Function #End Region @@ -191,10 +191,10 @@ Namespace API Friend Overrides Property LastUpdated As Date? Get If Count > 0 Then - With If((From c As IUserData In Collections - Where DirectCast(c, UserDataBase).LastUpdated.HasValue - Select DirectCast(c, UserDataBase).LastUpdated.Value).ToList, New List(Of Date)) - If .Count > 0 Then Return .Max + With (From c As IUserData In Collections + Where DirectCast(c, UserDataBase).LastUpdated.HasValue + Select DirectCast(c, UserDataBase).LastUpdated.Value).ToList + If .ListExists Then Return .Max End With End If Return Nothing @@ -328,7 +328,7 @@ Namespace API Friend Overrides Sub OpenFolder() Try If Count > 0 Then GlobalOpenPath(Collections(0).File.CutPath(2)) - Catch ex As Exception + Catch End Try End Sub #End Region @@ -406,7 +406,7 @@ Namespace API If Count > 1 AndAlso ScriptUse Then Collections.ForEach(Sub(c) c.ScriptUse = True) End Sub Friend Sub AddRange(ByVal _Items As IEnumerable(Of IUserData)) - If Not _Items Is Nothing AndAlso _Items.Count > 0 Then + If _Items.ListExists Then For i% = 0 To _Items.Count - 1 : Add(_Items(i)) : Next End If End Sub @@ -441,7 +441,7 @@ Namespace API Collections.ListClearDispose End Sub Friend Function Contains(ByVal _Item As IUserData) As Boolean Implements ICollection(Of IUserData).Contains - Return Collections.Contains(_Item) + Return Count > 0 AndAlso Collections.Contains(_Item) End Function Private Sub CopyTo(ByVal _Array() As IUserData, ByVal _ArrayIndex As Integer) Implements ICollection(Of IUserData).CopyTo Throw New NotImplementedException("[CopyTo] method does not supported in collections context") diff --git a/SCrawler/Channels/ChannelViewForm.vb b/SCrawler/Channels/ChannelViewForm.vb index a59155e..df22778 100644 --- a/SCrawler/Channels/ChannelViewForm.vb +++ b/SCrawler/Channels/ChannelViewForm.vb @@ -216,7 +216,7 @@ Friend Class ChannelViewForm : Implements IChannelLimits RefillChannels(Settings.LatestSelectedChannel.Value) ChangeComboIndex(0) MyRange.LabelText = String.Empty - CMB_CHANNELS_ActionOnCheckedChange(CMB_CHANNELS.Checked) + CMB_CHANNELS_ActionOnCheckedChange(Nothing, Nothing, CMB_CHANNELS.Checked) With LIST_POSTS Dim s As Size = GetImageSize() .LargeImageList = New ImageList With {.ColorDepth = ColorDepth.Depth32Bit, .ImageSize = s} @@ -296,8 +296,8 @@ Friend Class ChannelViewForm : Implements IChannelLimits Const mhw% = 256 Dim s As Size = LIST_POSTS.Size With LIST_POSTS - s.Width -= (.Margin.Left + .Margin.Right) - s.Height -= (.Margin.Top + .Margin.Bottom) + s.Width -= .Margin.Horizontal + s.Height -= .Margin.Vertical s.Width = s.Width / ImagesInRow - .Padding.Left * ImagesInRow - .Padding.Right * ImagesInRow s.Height = s.Height / ImagesRows - .Padding.Top * ImagesRows - .Padding.Bottom * ImagesRows If s.Width = 0 Then s.Width = 50 @@ -400,7 +400,7 @@ Friend Class ChannelViewForm : Implements IChannelLimits CH_HIDE_EXISTS_USERS.Enabled = True CMB_CHANNELS.Enabled(True) = True BTT_SHOW_STATS.Enabled = True - CMB_CHANNELS_ActionOnCheckedChange(CMB_CHANNELS.Checked) + CMB_CHANNELS_ActionOnCheckedChange(Nothing, Nothing, CMB_CHANNELS.Checked) MyRange.Enabled = True MyRange.UpdateControls() End If @@ -549,7 +549,7 @@ Friend Class ChannelViewForm : Implements IChannelLimits If d.HasValue Then LBL_LIMIT_TEXT.Text = $"to date {AConvert(Of String)(d, ADateTime.Formats.BaseDateTime, String.Empty)}" Else - LBL_LIMIT_TEXT.Text = $"to post [{c.First(Function(p) Not p.ID.IsEmptyString).ID}]" + LBL_LIMIT_TEXT.Text = $"to post [{c.FirstOrDefault(Function(p) Not p.ID.IsEmptyString).ID}]" End If Else OPT_LIMITS_COUNT.Checked = True @@ -571,7 +571,7 @@ Friend Class ChannelViewForm : Implements IChannelLimits Dim c As Channel = GetCurrentChannel() If Not c Is Nothing Then MyRange.Source = c End Sub - Private Sub CMB_CHANNELS_ActionOnButtonClick(ByVal Sender As ActionButton) Handles CMB_CHANNELS.ActionOnButtonClick + Private Sub CMB_CHANNELS_ActionOnButtonClick(ByVal Sender As ActionButton, ByVal e As EventArgs) Handles CMB_CHANNELS.ActionOnButtonClick Dim c As Channel Select Case Sender.DefaultButton Case ADB.Refresh : RefillChannels() @@ -579,12 +579,12 @@ Friend Class ChannelViewForm : Implements IChannelLimits Case ADB.Delete Try c = GetCurrentChannel() - If Not c Is Nothing AndAlso MsgBoxE($"Do you really want to delete channel [{c}]?", MsgBoxStyle.Exclamation + MsgBoxStyle.YesNo) = 0 Then + If Not c Is Nothing AndAlso MsgBoxE($"Are you sure you want to delete the channel [{c}]?", vbExclamation + vbYesNo) = vbYes Then Settings.Channels.Remove(c) RefillChannels() End If - Catch ex As Exception - ErrorsDescriber.Execute(EDP.LogMessageValue, ex, "Error on trying to delete channel") + Catch del_ex As Exception + ErrorsDescriber.Execute(EDP.LogMessageValue, del_ex, "An error occurred while trying to delete a channel") End Try Case ADB.Up : ChangeComboIndex(-1) Case ADB.Down : ChangeComboIndex(1) @@ -597,19 +597,19 @@ Friend Class ChannelViewForm : Implements IChannelLimits If f.DialogResult = DialogResult.OK Then c.Save() End Using End If - Catch ex As Exception - ErrorsDescriber.Execute(EDP.LogMessageValue, ex, "Error on trying to edit channel") + Catch edit_ex As Exception + ErrorsDescriber.Execute(EDP.LogMessageValue, edit_ex, "An error occurred while trying to edit a channel") End Try Case ADB.Info Try c = GetCurrentChannel() If Not c Is Nothing Then MsgBoxE({c.GetChannelStats(True), "Channel statistics"}) Catch info_ex As Exception - ErrorsDescriber.Execute(EDP.LogMessageValue, info_ex, "Error on trying to show channel info") + ErrorsDescriber.Execute(EDP.LogMessageValue, info_ex, "An error occurred while trying to display channel information") End Try End Select End Sub - Private Sub CMB_CHANNELS_ActionOnCheckedChange(ByVal Mode As Boolean) Handles CMB_CHANNELS.ActionOnCheckedChange + Private Sub CMB_CHANNELS_ActionOnCheckedChange(ByVal Sender As Object, ByVal e As EventArgs, ByVal Checked As Boolean) Handles CMB_CHANNELS.ActionOnCheckedChange Dim OneChannel As Boolean = Not CMB_CHANNELS.Checked CMB_CHANNELS.Enabled(False) = OneChannel If OneChannel Then @@ -683,7 +683,7 @@ Friend Class ChannelViewForm : Implements IChannelLimits Try If Not p.UserID.IsEmptyString Then Process.Start($"https://www.reddit.com/user/{p.UserID}") Catch ex As Exception - ErrorsDescriber.Execute(EDP.LogMessageValue, ex, $"Error on opening user by [https://www.reddit.com/user/{p.UserID}]") + ErrorsDescriber.Execute(EDP.LogMessageValue, ex, $"Error opening user by [https://www.reddit.com/user/{p.UserID}]") End Try End Sub Private Sub BTT_C_OPEN_POST_Click(sender As Object, e As EventArgs) Handles BTT_C_OPEN_POST.Click @@ -693,7 +693,7 @@ Friend Class ChannelViewForm : Implements IChannelLimits URL = $"https://www.reddit.com/r/{CMB_CHANNELS.Value}/comments/{p.ID.Split("_").Last}" If Not p.ID.IsEmptyString Then Process.Start(URL) Catch ex As Exception - ErrorsDescriber.Execute(EDP.LogMessageValue, ex, $"Error on opening post by [{URL}]") + ErrorsDescriber.Execute(EDP.LogMessageValue, ex, $"Error opening post by [{URL}]") End Try End Sub Private Sub BTT_C_OPEN_PICTURE_Click(sender As Object, e As EventArgs) Handles BTT_C_OPEN_PICTURE.Click @@ -734,14 +734,14 @@ Friend Class ChannelViewForm : Implements IChannelLimits MsgBoxE("User does not selected", MsgBoxStyle.Exclamation) End If Catch ex As Exception - ErrorsDescriber.Execute(EDP.LogMessageValue, ex, "Error on removing user from selected") + ErrorsDescriber.Execute(EDP.LogMessageValue, ex, "Error removing user from selected") End Try End Sub Private Sub BTT_C_ADD_TO_BLACKLIST_Click(sender As Object, e As EventArgs) Handles BTT_C_ADD_TO_BLACKLIST.Click Try Dim u$ = GetPostBySelected().UserID If Not u.IsEmptyString Then - Dim result% = MsgBoxE(New MMessage($"Do you really want to add user [{u}] to the BlackList?", + Dim result% = MsgBoxE(New MMessage($"Are you sure you want to add user [{u}] to the BlackList?", "Adding user to the BlackList", {"Add", "Add and update ranges", "Add with the reason", "Add with the reason and update ranges", @@ -771,7 +771,7 @@ Friend Class ChannelViewForm : Implements IChannelLimits #End Region Private Sub OpenPostPicture() Dim f As SFile = GetPostBySelected().CachedFile - If f.Exists Then f.Open() Else MsgBoxE($"Picture file [{f}] does not found", MsgBoxStyle.Critical) + If f.Exists Then f.Open() Else MsgBoxE($"Picture file [{f}] not found", MsgBoxStyle.Critical) End Sub Private Function GetPostBySelected(Optional ByVal SpecificTag As String = Nothing) As UserPost Dim p As UserPost = Nothing @@ -798,7 +798,7 @@ Friend Class ChannelViewForm : Implements IChannelLimits MyRange.Limit = ImagesInRow * ImagesRows MyRange.GoTo(0) End Sub - Private Sub MyRange_IndexChanged(ByVal Sender As IRangeSwitcherProvider, ByVal Index As Integer) Handles MyRange.IndexChanged + Private Sub MyRange_IndexChanged(ByVal Sender As Object, ByVal e As EventArgs) Handles MyRange.IndexChanged Try If MyDefs.Initializing Then Exit Sub AppendPendingUsers() @@ -828,8 +828,8 @@ Friend Class ChannelViewForm : Implements IChannelLimits ErrorsDescriber.Execute(EDP.LogMessageValue, ex) End Try End Sub - Private Sub MyRange_RangesChanged(ByVal Sender As IRangeSwitcherProvider, ByVal Index As Integer) Handles MyRange.RangesChanged - If Sender.Count > 0 Then MyRange_IndexChanged(Nothing, 0) + Private Sub MyRange_RangesChanged(ByVal Sender As IRangeSwitcherProvider, ByVal e As EventArgs) Handles MyRange.RangesChanged + If Sender.Count > 0 Then Sender.CurrentIndex = 0 End Sub #End Region End Class \ No newline at end of file diff --git a/SCrawler/Channels/ChannelsStatsForm.vb b/SCrawler/Channels/ChannelsStatsForm.vb index 7126fb0..a6fd2b2 100644 --- a/SCrawler/Channels/ChannelsStatsForm.vb +++ b/SCrawler/Channels/ChannelsStatsForm.vb @@ -6,36 +6,22 @@ ' ' This program is distributed in the hope that it will be useful, ' but WITHOUT ANY WARRANTY -Imports System.ComponentModel Imports PersonalUtilities.Forms Imports PersonalUtilities.Forms.Controls.Base -Imports PersonalUtilities.Forms.Toolbars -Friend Class ChannelsStatsForm : Implements IOkCancelDeleteToolbar - Private ReadOnly MyDefs As DefaultFormOptions +Friend Class ChannelsStatsForm + Private WithEvents MyDefs As DefaultFormOptions Friend Property DeletedChannels As Integer = 0 Friend Sub New() InitializeComponent() - MyDefs = New DefaultFormOptions + MyDefs = New DefaultFormOptions(Me, Settings.Design) End Sub Private Sub ChannelsStatsForm_Load(sender As Object, e As EventArgs) Handles Me.Load - Try - With MyDefs - .MyViewInitialize(Me, Settings.Design) - .AddOkCancelToolbar() - .MyOkCancel.EnableDelete = False - If Settings.Channels.Count > 0 Then - RefillList() - Else - MsgBoxE("Channels not found", vbExclamation) - End If - .EndLoaderOperations() - End With - Catch ex As Exception - MyDefs.InvokeLoaderError(ex) - End Try - End Sub - Private Sub ChannelsStatsForm_Closing(sender As Object, e As CancelEventArgs) Handles Me.Closing - MyDefs.Dispose() + With MyDefs + .MyViewInitialize() + .AddOkCancelToolbar() + If Settings.Channels.Count > 0 Then RefillList() Else MsgBoxE("Channels not found", vbExclamation) + .EndLoaderOperations() + End With End Sub Private Sub RefillList() CMB_CHANNELS.Items.Clear() @@ -45,13 +31,7 @@ Friend Class ChannelsStatsForm : Implements IOkCancelDeleteToolbar CMB_CHANNELS.EndUpdate() End If End Sub - Private Sub OK() Implements IOkCancelToolbar.OK - MyDefs.CloseForm() - End Sub - Private Sub Cancel() Implements IOkCancelToolbar.Cancel - MyDefs.CloseForm(DialogResult.Cancel) - End Sub - Private Sub Delete() Implements IOkCancelDeleteToolbar.Delete + Private Sub MyDefs_ButtonDeleteClickOC(ByVal Sender As Object, ByVal e As KeyHandleEventArgs) Handles MyDefs.ButtonDeleteClickOC Try Dim c As List(Of String) = CMB_CHANNELS.Items.CheckedItems.Select(Function(cc) CStr(cc.Value(1))).ListIfNothing If c.ListExists Then @@ -76,7 +56,7 @@ Friend Class ChannelsStatsForm : Implements IOkCancelDeleteToolbar Private Sub CMB_CHANNELS_ActionOnChangeDetected(ByVal c As Boolean) Handles CMB_CHANNELS.ActionOnChangeDetected If Not MyDefs.Initializing Then MyDefs.MyOkCancel.EnableDelete = CMB_CHANNELS.ListCheckedIndexes.Count > 0 End Sub - Private Sub CMB_CHANNELS_ActionOnButtonClearClick() Handles CMB_CHANNELS.ActionOnButtonClearClick - CMB_CHANNELS.ListCheckedIndexes = Nothing + Private Sub CMB_CHANNELS_ActionOnButtonClick(ByVal Sender As ActionButton, ByVal e As EventArgs) Handles CMB_CHANNELS.ActionOnButtonClick + If Sender.DefaultButton = ActionButton.DefaultButtons.Clear Then CMB_CHANNELS.ListCheckedIndexes = Nothing End Sub End Class \ No newline at end of file diff --git a/SCrawler/Download/ActiveDownloadingProgress.vb b/SCrawler/Download/ActiveDownloadingProgress.vb index 8bad9bf..374f78d 100644 --- a/SCrawler/Download/ActiveDownloadingProgress.vb +++ b/SCrawler/Download/ActiveDownloadingProgress.vb @@ -44,7 +44,6 @@ Namespace DownloadObjects If .Controls.Count > 0 Then For Each c As Control In .Controls If Not c Is Nothing Then c.Dispose() - Next .Controls.Clear() End If diff --git a/SCrawler/Download/AutoDownloader.vb b/SCrawler/Download/AutoDownloader.vb index a21875b..38b08e7 100644 --- a/SCrawler/Download/AutoDownloader.vb +++ b/SCrawler/Download/AutoDownloader.vb @@ -9,6 +9,7 @@ Imports System.Threading Imports PersonalUtilities.Functions.XML Imports PersonalUtilities.Functions.XML.Base +Imports PersonalUtilities.Tools Imports PersonalUtilities.Tools.Notifications Imports SCrawler.DownloadObjects.Groups Imports SCrawler.API @@ -16,6 +17,11 @@ Imports SCrawler.API.Base Namespace DownloadObjects Friend Class AutoDownloader : Inherits GroupParameters : Implements IEContainerProvider Friend Event UserFind(ByVal Key As String, ByVal Activate As Boolean) + Friend Shared ReadOnly Property CachePath As SFile + Get + Return "_Cache\" + End Get + End Property Friend Enum Modes As Integer None = 0 [Default] = 1 @@ -38,56 +44,78 @@ Namespace DownloadObjects Private ReadOnly Property KeySite As String Private ReadOnly Property KeyDismiss As String Private ReadOnly Property Images As Dictionary(Of String, SFile) + Private ReadOnly Property AutoDownloaderSource As AutoDownloader Private Sub New() Images = New Dictionary(Of String, SFile) End Sub - Friend Sub New(ByVal _Key As String) + Private Sub New(ByVal _Key As String) Me.New Key = _Key KeyFolder = $"{Key}{KeyOpenFolder}" KeySite = $"{Key}{KeyOpenSite}" KeyDismiss = $"{Key}{KeyBttDismiss}" End Sub - Friend Sub New(ByVal _Key As String, ByRef _User As IUserData) + Friend Sub New(ByVal _Key As String, ByRef _User As IUserData, ByRef Source As AutoDownloader) Me.New(_Key) User = _User IUserDataKey = _User.Key + AutoDownloaderSource = Source + If _User.IncludedInCollection Then + Dim cn$ = _User.CollectionName + Dim i% = Settings.Users.FindIndex(Function(u) u.IsCollection And u.Name = cn) + If i >= 0 Then IUserDataKey = Settings.Users(i).Key + End If End Sub Public Shared Widening Operator CType(ByVal Key As String) As NotifiedUser Return New NotifiedUser(Key) End Operator Friend Sub ShowNotification() Try - If Not User Is Nothing Then - Dim Text$ = $"{User.Site} - {User.Name}{vbNewLine}" & - $"Downloaded: {User.DownloadedPictures(False)} images, {User.DownloadedVideos(False)} videos" - Dim Title$ - If Not User.CollectionName.IsEmptyString Then - Title = User.CollectionName - Else - Title = User.ToString - End If - Using Notify As New Notification(Text, Title) With {.Key = Key} - Dim uPic As SFile = DirectCast(User, UserDataBase).GetUserPictureAddress - Dim uif As SFile = Nothing - Dim uifKey$ = String.Empty - If uPic.Exists Then Notify.Images = {New ToastImage(uPic)} - If User.DownloadedPictures(False) > 0 Then - uif = DirectCast(User, UserDataBase).GetLastImageAddress - If uif.Exists Then - Notify.Images = {New ToastImage(uif, IImage.Modes.Inline)} - uifKey = $"{Key}_{Images.Keys.Count + 1}_{KeyBttPhoto}" - If Not Images.ContainsKey(uifKey) Then Images.Add(uifKey, uif) + If Not AutoDownloaderSource Is Nothing Then + If AutoDownloaderSource.ShowNotifications Then + If Not User Is Nothing Then + Dim Text$ = $"{User.Site} - {User.Name}{vbNewLine}" & + $"Downloaded: {User.DownloadedPictures(False)} images, {User.DownloadedVideos(False)} videos" + Dim Title$ + If Not User.CollectionName.IsEmptyString Then + Title = User.CollectionName + Else + Title = User.ToString End If + Using Notify As New Notification(Text, Title) With {.Key = Key} + Dim uPic As SFile = Nothing + Dim uif As SFile = Nothing + Dim uif_compressed As SFile = Nothing + Dim uifKey$ = String.Empty + If AutoDownloaderSource.ShowPictureUser Then uPic = DirectCast(User, UserDataBase).GetUserPictureToastAddress + If AutoDownloaderSource.ShowPictureUser AndAlso uPic.Exists Then Notify.Images = {New ToastImage(uPic)} + If AutoDownloaderSource.ShowPictureDownloaded And User.DownloadedPictures(False) > 0 Then + uif = DirectCast(User, UserDataBase).GetLastImageAddress + If uif.Exists Then + uif_compressed = uif + uif_compressed.Path = CachePath.Path + uif_compressed.Name = $"360_{uif.Name}" + Using imgR As New ImageRenderer(uif, EDP.SendInLog) + Try : imgR.FitToWidth(360).Save(uif_compressed) : Catch : End Try + End Using + If uif_compressed.Exists Then uif = uif_compressed + If uif.Exists Then + Notify.Images = {New ToastImage(uif, IImage.Modes.Inline)} + uifKey = $"{Key}_{Images.Keys.Count + 1}_{KeyBttPhoto}" + If Not Images.ContainsKey(uifKey) Then Images.Add(uifKey, uif) + End If + End If + End If + Notify.Buttons = { + New ToastButton(KeyFolder, "Folder"), + New ToastButton(KeySite, "Site") + } + If Not uifKey.IsEmptyString Then Notify.Buttons = {New ToastButton(uifKey, "Photo")} + Notify.Buttons = {New ToastButton(KeyDismiss, "Dismiss")} + Notify.Show() + End Using End If - Notify.Buttons = { - New ToastButton(KeyFolder, "Folder"), - New ToastButton(KeySite, "Site") - } - If Not uifKey.IsEmptyString Then Notify.Buttons = {New ToastButton(uifKey, "Photo")} - Notify.Buttons = {New ToastButton(KeyDismiss, "Dismiss")} - Notify.Show() - End Using + End If End If Catch ex As Exception ErrorsDescriber.Execute(EDP.SendInLog, ex, "[AutoDownloader.NotifiedUser.ShowNotification]") @@ -144,6 +172,8 @@ Namespace DownloadObjects Private Const Name_StartupDelay As String = "StartupDelay" Private Const Name_LastDownloadDate As String = "LastDownloadDate" Private Const Name_ShowNotifications As String = "Notify" + Private Const Name_ShowPictureDown As String = "ShowDownloadedPicture" + Private Const Name_ShowPictureUser As String = "ShowUserPicture" #End Region #Region "Declarations" Friend Property Source As Scheduler @@ -161,6 +191,8 @@ Namespace DownloadObjects Friend Property Timer As Integer = DefaultTimer Friend Property StartupDelay As Integer = 0 Friend Property ShowNotifications As Boolean = True + Friend Property ShowPictureDownloaded As Boolean = True + Friend Property ShowPictureUser As Boolean = True #Region "Date" Private ReadOnly LastDownloadDateXML As Date? = Nothing Private _LastDownloadDate As Date = Now.AddYears(-1) @@ -190,6 +222,7 @@ Namespace DownloadObjects End If End Function #End Region +#Region "Information" Friend ReadOnly Property Information As String Get Return $"Last download date: {GetLastDateString()} ({GetWorkingState()})" @@ -214,8 +247,7 @@ Namespace DownloadObjects Public Overrides Function ToString() As String Return $"{Name} ({GetWorkingState()}): last download date: {GetLastDateString()}; next run: {GetNextDateString()}" End Function - Private File As SFile = $"Settings\AutoDownload.xml" - Private AThread As Thread +#End Region #End Region #Region "Initializer" Private ReadOnly Initialization As Boolean = True @@ -245,6 +277,8 @@ Namespace DownloadObjects StartupDelay = x.Value(Name_StartupDelay).FromXML(Of Integer)(0) If StartupDelay < 0 Then StartupDelay = 0 ShowNotifications = x.Value(Name_ShowNotifications).FromXML(Of Boolean)(True) + ShowPictureDownloaded = x.Value(Name_ShowPictureDown).FromXML(Of Boolean)(True) + ShowPictureUser = x.Value(Name_ShowPictureUser).FromXML(Of Boolean)(True) LastDownloadDateXML = AConvert(Of Date)(x.Value(Name_LastDownloadDate), DateProvider, Nothing) If LastDownloadDateXML.HasValue Then LastDownloadDate = LastDownloadDateXML.Value @@ -285,12 +319,15 @@ Namespace DownloadObjects New EContainer(Name_Timer, Timer), New EContainer(Name_StartupDelay, StartupDelay), New EContainer(Name_ShowNotifications, ShowNotifications.BoolToInteger), + New EContainer(Name_ShowPictureDown, ShowPictureDownloaded.BoolToInteger), + New EContainer(Name_ShowPictureUser, ShowPictureUser.BoolToInteger), New EContainer(Name_LastDownloadDate, CStr(AConvert(Of String)(If(LastDownloadDateXML.HasValue Or _LastDownloadDateChanged, CObj(LastDownloadDate), Nothing), DateProvider, String.Empty))) } End Function #End Region #Region "Execution" + Private AThread As Thread Friend ReadOnly Property Working As Boolean Get Return If(AThread?.IsAlive, False) @@ -406,7 +443,7 @@ Namespace DownloadObjects If i >= 0 Then UserKeys(i).ShowNotification() Else - UserKeys.Add(New NotifiedUser(k, TDownloader.GetUserFromMainCollection(u))) + UserKeys.Add(New NotifiedUser(k, TDownloader.GetUserFromMainCollection(u), Me)) UserKeys.Last.ShowNotification() End If End Sub diff --git a/SCrawler/Download/AutoDownloaderEditorForm.Designer.vb b/SCrawler/Download/AutoDownloaderEditorForm.Designer.vb index 27fa31f..cf361ed 100644 --- a/SCrawler/Download/AutoDownloaderEditorForm.Designer.vb +++ b/SCrawler/Download/AutoDownloaderEditorForm.Designer.vb @@ -30,6 +30,7 @@ Namespace DownloadObjects Dim TP_MODE As System.Windows.Forms.TableLayoutPanel Dim ActionButton3 As PersonalUtilities.Forms.Controls.Base.ActionButton = New PersonalUtilities.Forms.Controls.Base.ActionButton() Dim ActionButton4 As PersonalUtilities.Forms.Controls.Base.ActionButton = New PersonalUtilities.Forms.Controls.Base.ActionButton() + Dim TP_NOTIFY As System.Windows.Forms.TableLayoutPanel Dim TT_MAIN As System.Windows.Forms.ToolTip Me.DEF_GROUP = New SCrawler.DownloadObjects.Groups.GroupDefaults() Me.TXT_GROUPS = New PersonalUtilities.Forms.Controls.TextBoxExtended() @@ -38,12 +39,15 @@ Namespace DownloadObjects Me.OPT_SPEC = New System.Windows.Forms.RadioButton() Me.OPT_DISABLED = New System.Windows.Forms.RadioButton() Me.OPT_GROUP = New System.Windows.Forms.RadioButton() - Me.CH_NOTIFY = New System.Windows.Forms.CheckBox() Me.TXT_TIMER = New PersonalUtilities.Forms.Controls.TextBoxExtended() Me.LBL_LAST_TIME_UP = New System.Windows.Forms.Label() Me.NUM_DELAY = New PersonalUtilities.Forms.Controls.TextBoxExtended() + Me.CH_NOTIFY = New System.Windows.Forms.CheckBox() + Me.CH_SHOW_PIC = New System.Windows.Forms.CheckBox() + Me.CH_SHOW_PIC_USER = New System.Windows.Forms.CheckBox() CONTAINER_MAIN = New System.Windows.Forms.ToolStripContainer() TP_MODE = New System.Windows.Forms.TableLayoutPanel() + TP_NOTIFY = New System.Windows.Forms.TableLayoutPanel() TT_MAIN = New System.Windows.Forms.ToolTip(Me.components) CONTAINER_MAIN.ContentPanel.SuspendLayout() CONTAINER_MAIN.SuspendLayout() @@ -52,6 +56,7 @@ Namespace DownloadObjects TP_MODE.SuspendLayout() CType(Me.TXT_TIMER, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.NUM_DELAY, System.ComponentModel.ISupportInitialize).BeginInit() + TP_NOTIFY.SuspendLayout() Me.SuspendLayout() ' 'CONTAINER_MAIN @@ -77,10 +82,10 @@ Namespace DownloadObjects Me.DEF_GROUP.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100.0!)) Me.DEF_GROUP.Controls.Add(Me.TXT_GROUPS, 0, 5) Me.DEF_GROUP.Controls.Add(TP_MODE, 0, 0) - Me.DEF_GROUP.Controls.Add(Me.CH_NOTIFY, 0, 6) Me.DEF_GROUP.Controls.Add(Me.TXT_TIMER, 0, 7) Me.DEF_GROUP.Controls.Add(Me.LBL_LAST_TIME_UP, 0, 9) Me.DEF_GROUP.Controls.Add(Me.NUM_DELAY, 0, 8) + Me.DEF_GROUP.Controls.Add(TP_NOTIFY, 0, 6) Me.DEF_GROUP.Dock = System.Windows.Forms.DockStyle.Fill Me.DEF_GROUP.Location = New System.Drawing.Point(0, 0) Me.DEF_GROUP.Name = "DEF_GROUP" @@ -96,6 +101,7 @@ Namespace DownloadObjects Me.DEF_GROUP.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 28.0!)) Me.DEF_GROUP.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25.0!)) Me.DEF_GROUP.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100.0!)) + Me.DEF_GROUP.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20.0!)) Me.DEF_GROUP.Size = New System.Drawing.Size(476, 301) Me.DEF_GROUP.TabIndex = 0 ' @@ -136,7 +142,7 @@ Namespace DownloadObjects TP_MODE.RowCount = 1 TP_MODE.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100.0!)) TP_MODE.Size = New System.Drawing.Size(474, 25) - TP_MODE.TabIndex = 1 + TP_MODE.TabIndex = 0 ' 'OPT_ALL ' @@ -203,17 +209,6 @@ Namespace DownloadObjects TT_MAIN.SetToolTip(Me.OPT_GROUP, "Download groups") Me.OPT_GROUP.UseVisualStyleBackColor = True ' - 'CH_NOTIFY - ' - Me.CH_NOTIFY.AutoSize = True - Me.CH_NOTIFY.Dock = System.Windows.Forms.DockStyle.Fill - Me.CH_NOTIFY.Location = New System.Drawing.Point(4, 169) - Me.CH_NOTIFY.Name = "CH_NOTIFY" - Me.CH_NOTIFY.Size = New System.Drawing.Size(468, 19) - Me.CH_NOTIFY.TabIndex = 3 - Me.CH_NOTIFY.Text = "Show notifications" - Me.CH_NOTIFY.UseVisualStyleBackColor = True - ' 'TXT_TIMER ' ActionButton3.BackgroundImage = CType(resources.GetObject("ActionButton3.BackgroundImage"), System.Drawing.Image) @@ -225,7 +220,7 @@ Namespace DownloadObjects Me.TXT_TIMER.Location = New System.Drawing.Point(4, 195) Me.TXT_TIMER.Name = "TXT_TIMER" Me.TXT_TIMER.Size = New System.Drawing.Size(468, 22) - Me.TXT_TIMER.TabIndex = 4 + Me.TXT_TIMER.TabIndex = 2 ' 'LBL_LAST_TIME_UP ' @@ -235,7 +230,7 @@ Namespace DownloadObjects Me.LBL_LAST_TIME_UP.Location = New System.Drawing.Point(4, 250) Me.LBL_LAST_TIME_UP.Name = "LBL_LAST_TIME_UP" Me.LBL_LAST_TIME_UP.Size = New System.Drawing.Size(468, 25) - Me.LBL_LAST_TIME_UP.TabIndex = 6 + Me.LBL_LAST_TIME_UP.TabIndex = 4 Me.LBL_LAST_TIME_UP.Text = "Last download date: " Me.LBL_LAST_TIME_UP.TextAlign = System.Drawing.ContentAlignment.TopCenter ' @@ -256,9 +251,64 @@ Namespace DownloadObjects Me.NUM_DELAY.NumberMaximum = New Decimal(New Integer() {1440, 0, 0, 0}) Me.NUM_DELAY.NumberUpDownAlign = System.Windows.Forms.LeftRightAlignment.Left Me.NUM_DELAY.Size = New System.Drawing.Size(468, 22) - Me.NUM_DELAY.TabIndex = 5 + Me.NUM_DELAY.TabIndex = 3 Me.NUM_DELAY.Text = "0" ' + 'TP_NOTIFY + ' + TP_NOTIFY.ColumnCount = 3 + TP_NOTIFY.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 33.33333!)) + TP_NOTIFY.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 33.33333!)) + TP_NOTIFY.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 33.33333!)) + TP_NOTIFY.Controls.Add(Me.CH_NOTIFY, 0, 0) + TP_NOTIFY.Controls.Add(Me.CH_SHOW_PIC, 1, 0) + TP_NOTIFY.Controls.Add(Me.CH_SHOW_PIC_USER, 2, 0) + TP_NOTIFY.Dock = System.Windows.Forms.DockStyle.Fill + TP_NOTIFY.Location = New System.Drawing.Point(1, 166) + TP_NOTIFY.Margin = New System.Windows.Forms.Padding(0) + TP_NOTIFY.Name = "TP_NOTIFY" + TP_NOTIFY.RowCount = 1 + TP_NOTIFY.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100.0!)) + TP_NOTIFY.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25.0!)) + TP_NOTIFY.Size = New System.Drawing.Size(474, 25) + TP_NOTIFY.TabIndex = 1 + ' + 'CH_NOTIFY + ' + Me.CH_NOTIFY.AutoSize = True + Me.CH_NOTIFY.Dock = System.Windows.Forms.DockStyle.Fill + Me.CH_NOTIFY.Location = New System.Drawing.Point(3, 3) + Me.CH_NOTIFY.Name = "CH_NOTIFY" + Me.CH_NOTIFY.Size = New System.Drawing.Size(152, 19) + Me.CH_NOTIFY.TabIndex = 0 + Me.CH_NOTIFY.Text = "Show notifications" + TT_MAIN.SetToolTip(Me.CH_NOTIFY, "Show notification when some data has been downloaded") + Me.CH_NOTIFY.UseVisualStyleBackColor = True + ' + 'CH_SHOW_PIC + ' + Me.CH_SHOW_PIC.AutoSize = True + Me.CH_SHOW_PIC.Dock = System.Windows.Forms.DockStyle.Fill + Me.CH_SHOW_PIC.Location = New System.Drawing.Point(161, 3) + Me.CH_SHOW_PIC.Name = "CH_SHOW_PIC" + Me.CH_SHOW_PIC.Size = New System.Drawing.Size(152, 19) + Me.CH_SHOW_PIC.TabIndex = 1 + Me.CH_SHOW_PIC.Text = "Show download picture" + TT_MAIN.SetToolTip(Me.CH_SHOW_PIC, "Show downloaded image in notification") + Me.CH_SHOW_PIC.UseVisualStyleBackColor = True + ' + 'CH_SHOW_PIC_USER + ' + Me.CH_SHOW_PIC_USER.AutoSize = True + Me.CH_SHOW_PIC_USER.Dock = System.Windows.Forms.DockStyle.Fill + Me.CH_SHOW_PIC_USER.Location = New System.Drawing.Point(319, 3) + Me.CH_SHOW_PIC_USER.Name = "CH_SHOW_PIC_USER" + Me.CH_SHOW_PIC_USER.Size = New System.Drawing.Size(152, 19) + Me.CH_SHOW_PIC_USER.TabIndex = 2 + Me.CH_SHOW_PIC_USER.Text = "Show user picture" + TT_MAIN.SetToolTip(Me.CH_SHOW_PIC_USER, "Show user image in notification") + Me.CH_SHOW_PIC_USER.UseVisualStyleBackColor = True + ' 'AutoDownloaderEditorForm ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -285,6 +335,8 @@ Namespace DownloadObjects TP_MODE.PerformLayout() CType(Me.TXT_TIMER, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.NUM_DELAY, System.ComponentModel.ISupportInitialize).EndInit() + TP_NOTIFY.ResumeLayout(False) + TP_NOTIFY.PerformLayout() Me.ResumeLayout(False) End Sub @@ -299,5 +351,7 @@ Namespace DownloadObjects Private WithEvents OPT_GROUP As RadioButton Private WithEvents LBL_LAST_TIME_UP As Label Private WithEvents NUM_DELAY As PersonalUtilities.Forms.Controls.TextBoxExtended + Private WithEvents CH_SHOW_PIC As CheckBox + Private WithEvents CH_SHOW_PIC_USER As CheckBox End Class End Namespace \ No newline at end of file diff --git a/SCrawler/Download/AutoDownloaderEditorForm.resx b/SCrawler/Download/AutoDownloaderEditorForm.resx index 2bd6ddd..f3a0988 100644 --- a/SCrawler/Download/AutoDownloaderEditorForm.resx +++ b/SCrawler/Download/AutoDownloaderEditorForm.resx @@ -228,6 +228,9 @@ VnR1MIwhwMTCyqEQ37qEmZVDFF0OE/9nAACtFF4Ey6OP+wAAAABJRU5ErkJggg== + + False + AAABAAwAMDAQAAEABABoBgAAxgAAACAgEAABAAQA6AIAAC4HAAAYGBAAAQAEAOgBAAAWCgAAEBAQAAEA diff --git a/SCrawler/Download/AutoDownloaderEditorForm.vb b/SCrawler/Download/AutoDownloaderEditorForm.vb index 2ab4c45..2b289a6 100644 --- a/SCrawler/Download/AutoDownloaderEditorForm.vb +++ b/SCrawler/Download/AutoDownloaderEditorForm.vb @@ -8,17 +8,16 @@ ' but WITHOUT ANY WARRANTY Imports PersonalUtilities.Forms Imports PersonalUtilities.Forms.Controls.Base -Imports PersonalUtilities.Forms.Toolbars Imports DModes = SCrawler.DownloadObjects.AutoDownloader.Modes Namespace DownloadObjects - Friend Class AutoDownloaderEditorForm : Implements IOkCancelToolbar - Private ReadOnly MyDefs As DefaultFormOptions + Friend Class AutoDownloaderEditorForm + Private WithEvents MyDefs As DefaultFormOptions Private ReadOnly MyGroups As List(Of String) Private ReadOnly Property Plan As AutoDownloader Friend Sub New(ByRef _Plan As AutoDownloader) InitializeComponent() Plan = _Plan - MyDefs = New DefaultFormOptions + MyDefs = New DefaultFormOptions(Me, Settings.Design) MyGroups.ListAddList(Plan.Groups, LAP.NotContainsOnly) End Sub Private Class AutomationTimerChecker : Implements IFieldsCheckerProvider @@ -39,7 +38,7 @@ Namespace DownloadObjects End Class Private Sub AutoDownloaderEditorForm_Load(sender As Object, e As EventArgs) Handles Me.Load With MyDefs - .MyViewInitialize(Me, Settings.Design, True) + .MyViewInitialize(True) .AddOkCancelToolbar() With Plan Select Case .Mode @@ -49,14 +48,16 @@ Namespace DownloadObjects Case DModes.Specified : OPT_SPEC.Checked = True Case DModes.Groups : OPT_GROUP.Checked = True End Select - ChangeEnabled() DEF_GROUP.Set(Plan) If MyGroups.Count > 0 Then TXT_GROUPS.Text = MyGroups.ListToString If Settings.Groups.Count = 0 Then TXT_GROUPS.Clear() : TXT_GROUPS.Enabled = False CH_NOTIFY.Checked = .ShowNotifications + CH_SHOW_PIC.Checked = .ShowPictureDownloaded + CH_SHOW_PIC_USER.Checked = .ShowPictureUser TXT_TIMER.Text = .Timer NUM_DELAY.Value = .StartupDelay LBL_LAST_TIME_UP.Text = .Information + ChangeEnabled() End With .MyFieldsChecker = New FieldsChecker With .MyFieldsCheckerE @@ -71,8 +72,8 @@ Namespace DownloadObjects Private Sub AutoDownloaderEditorForm_Disposed(sender As Object, e As EventArgs) Handles Me.Disposed MyGroups.Clear() End Sub - Private Sub OK() Implements IOkCancelToolbar.OK - If If(MyDefs.MyFieldsChecker?.AllParamsOK, True) Then + Private Sub MyDefs_ButtonOkClick(ByVal Sender As Object, ByVal e As KeyHandleEventArgs) Handles MyDefs.ButtonOkClick + If MyDefs.MyFieldsChecker.AllParamsOK Then With Plan Select Case True Case OPT_DISABLED.Checked : .Mode = DModes.None @@ -84,6 +85,9 @@ Namespace DownloadObjects DEF_GROUP.Get(Plan) .Groups.Clear() .Groups.ListAddList(MyGroups) + .ShowNotifications = CH_NOTIFY.Checked + .ShowPictureDownloaded = CH_SHOW_PIC.Checked + .ShowPictureUser = CH_SHOW_PIC_USER.Checked .Timer = AConvert(Of Integer)(TXT_TIMER.Text, AutoDownloader.DefaultTimer) .StartupDelay = NUM_DELAY.Value .Update() @@ -91,10 +95,7 @@ Namespace DownloadObjects MyDefs.CloseForm() End If End Sub - Private Sub Cancel() Implements IOkCancelToolbar.Cancel - MyDefs.CloseForm(DialogResult.Cancel) - End Sub - Private Sub TXT_GROUPS_ActionOnButtonClick(ByVal Sender As ActionButton) Handles TXT_GROUPS.ActionOnButtonClick + Private Sub TXT_GROUPS_ActionOnButtonClick(ByVal Sender As ActionButton, ByVal e As EventArgs) Handles TXT_GROUPS.ActionOnButtonClick Select Case Sender.DefaultButton Case ActionButton.DefaultButtons.Edit Using f As New LabelsForm(MyGroups, Settings.Groups.Select(Function(g) g.Name)) With {.Text = "Groups"} @@ -119,14 +120,19 @@ Namespace DownloadObjects Private Sub OPT_GROUP_CheckedChanged(sender As Object, e As EventArgs) Handles OPT_GROUP.CheckedChanged ChangeEnabled() End Sub + Private Sub CH_NOTIFY_CheckedChanged(sender As Object, e As EventArgs) Handles CH_NOTIFY.CheckedChanged + ChangeEnabled() + End Sub Private Sub ChangeEnabled() DEF_GROUP.Enabled = OPT_SPEC.Checked TXT_GROUPS.Enabled = OPT_GROUP.Checked TXT_TIMER.Enabled = Not OPT_DISABLED.Checked NUM_DELAY.Enabled = Not OPT_DISABLED.Checked CH_NOTIFY.Enabled = Not OPT_DISABLED.Checked + CH_SHOW_PIC.Enabled = CH_NOTIFY.Checked And Not OPT_DISABLED.Checked + CH_SHOW_PIC_USER.Enabled = CH_NOTIFY.Checked And Not OPT_DISABLED.Checked End Sub - Private Sub NUM_DELAY_ActionOnButtonClick(ByVal Sender As ActionButton) Handles NUM_DELAY.ActionOnButtonClick + Private Sub NUM_DELAY_ActionOnButtonClick(ByVal Sender As ActionButton, ByVal e As EventArgs) Handles NUM_DELAY.ActionOnButtonClick If Sender.DefaultButton = ActionButton.DefaultButtons.Clear Then NUM_DELAY.Value = 0 End Sub End Class diff --git a/SCrawler/Download/DownloadedInfoForm.vb b/SCrawler/Download/DownloadedInfoForm.vb index 4f85983..32021c6 100644 --- a/SCrawler/Download/DownloadedInfoForm.vb +++ b/SCrawler/Download/DownloadedInfoForm.vb @@ -55,7 +55,7 @@ Namespace DownloadObjects End If BTT_CLEAR.Visible = ViewMode = ViewModes.Session RefillList() - Catch ex As Exception + Catch Finally Opened = True End Try @@ -96,7 +96,7 @@ Namespace DownloadObjects _TempUsersList.ListAddList(Downloader.Downloaded, LParams) Else _TempUsersList.ListAddList(Settings.Users.SelectMany(Of IUserData) _ - (Function(u) If(u.IsCollection, DirectCast(u, API.UserDataBind).Collections, {u})), LParams) + (Function(u) If(u.IsCollection, DirectCast(u, API.UserDataBind).Collections, {u})), LParams) End If If _TempUsersList.Count > 0 Then _TempUsersList.Sort(New UsersDateOrder) @@ -163,7 +163,7 @@ Namespace DownloadObjects Try If _LatestSelected.ValueBetween(0, _TempUsersList.Count - 1) AndAlso Not DirectCast(_TempUsersList(_LatestSelected), UserDataBase).Disposed Then _TempUsersList(_LatestSelected).OpenFolder() - Catch ex As Exception + Catch End Try End Sub Friend Sub Downloader_OnDownloadCountChange() diff --git a/SCrawler/Download/Groups/DownloadGroup.vb b/SCrawler/Download/Groups/DownloadGroup.vb index 05eb3c9..fa176cd 100644 --- a/SCrawler/Download/Groups/DownloadGroup.vb +++ b/SCrawler/Download/Groups/DownloadGroup.vb @@ -87,7 +87,7 @@ Namespace DownloadObjects.Groups If Not e.Value.IsEmptyString Then Labels.ListAddList(e.Value.Split("|"), LAP.NotContainsOnly) End Sub Public Overrides Function ToString() As String - Return $"{IIf(Index >= 0 And Index <= 8, $"#{Index + 1}: ", String.Empty)}{Name}" + Return $"{IIf(Index.ValueBetween(0, 8), $"#{Index + 1}: ", String.Empty)}{Name}" End Function Private _ControlSent As Boolean = False Friend Function GetControl() As ToolStripMenuItem diff --git a/SCrawler/Download/Groups/DownloadGroupCollection.vb b/SCrawler/Download/Groups/DownloadGroupCollection.vb index 36e9803..d2fad0a 100644 --- a/SCrawler/Download/Groups/DownloadGroupCollection.vb +++ b/SCrawler/Download/Groups/DownloadGroupCollection.vb @@ -44,10 +44,7 @@ Namespace DownloadObjects.Groups End Property Friend Sub Update() If Count > 0 Then - Using x As New XmlFile With {.Name = "Groups", .AllowSameNames = True} - x.AddRange(GroupsList) - x.Save(GroupFile) - End Using + Using x As New XmlFile With {.Name = "Groups", .AllowSameNames = True} : x.AddRange(GroupsList) : x.Save(GroupFile) : End Using Else GroupFile.Delete() End If diff --git a/SCrawler/Download/Groups/GroupDefaults.vb b/SCrawler/Download/Groups/GroupDefaults.vb index 5717270..ac9747b 100644 --- a/SCrawler/Download/Groups/GroupDefaults.vb +++ b/SCrawler/Download/Groups/GroupDefaults.vb @@ -100,7 +100,7 @@ Namespace DownloadObjects.Groups Controls.Add(TP_2, 0, 3) Controls.Add(TXT_LABELS, 0, 4) End Sub - Private Sub TXT_LABELS_ActionOnButtonClick(ByVal Sender As ActionButton) Handles TXT_LABELS.ActionOnButtonClick + Private Sub TXT_LABELS_ActionOnButtonClick(ByVal Sender As ActionButton, ByVal e As EventArgs) Handles TXT_LABELS.ActionOnButtonClick Select Case Sender.DefaultButton Case ADB.Edit Using f As New LabelsForm(Labels) diff --git a/SCrawler/Download/Groups/GroupEditorForm.vb b/SCrawler/Download/Groups/GroupEditorForm.vb index 269623d..a2767a7 100644 --- a/SCrawler/Download/Groups/GroupEditorForm.vb +++ b/SCrawler/Download/Groups/GroupEditorForm.vb @@ -7,15 +7,14 @@ ' This program is distributed in the hope that it will be useful, ' but WITHOUT ANY WARRANTY Imports PersonalUtilities.Forms -Imports PersonalUtilities.Forms.Toolbars Namespace DownloadObjects.Groups - Friend Class GroupEditorForm : Implements IOkCancelToolbar - Private ReadOnly MyDefs As DefaultFormOptions + Friend Class GroupEditorForm + Private WithEvents MyDefs As DefaultFormOptions Friend Property MyGroup As DownloadGroup Friend Sub New(ByRef g As DownloadGroup) InitializeComponent() MyGroup = g - MyDefs = New DefaultFormOptions + MyDefs = New DefaultFormOptions(Me, Settings.Design) End Sub Friend Class NameChecker : Implements IFieldsCheckerProvider Private Property ErrorMessage As String Implements IFieldsCheckerProvider.ErrorMessage @@ -48,7 +47,7 @@ Namespace DownloadObjects.Groups End Class Private Sub GroupEditorForm_Load(sender As Object, e As EventArgs) Handles Me.Load With MyDefs - .MyViewInitialize(Me, Settings.Design, True) + .MyViewInitialize(True) .AddOkCancelToolbar() If Not MyGroup Is Nothing Then With MyGroup @@ -59,13 +58,13 @@ Namespace DownloadObjects.Groups Text = "New Group" End If .MyFieldsChecker = New FieldsChecker - DirectCast(.MyFieldsChecker, FieldsChecker).AddControl(Of String)(DEFS_GROUP.TXT_NAME, DEFS_GROUP.TXT_NAME.CaptionText,, - New NameChecker(If(MyGroup?.Name, String.Empty), Settings.Groups, "Group")) + .MyFieldsCheckerE.AddControl(Of String)(DEFS_GROUP.TXT_NAME, DEFS_GROUP.TXT_NAME.CaptionText,, + New NameChecker(If(MyGroup?.Name, String.Empty), Settings.Groups, "Group")) .MyFieldsChecker.EndLoaderOperations() .EndLoaderOperations() End With End Sub - Private Sub OK() Implements IOkCancelToolbar.OK + Private Sub MyDefs_ButtonOkClick(ByVal Sender As Object, ByVal e As KeyHandleEventArgs) Handles MyDefs.ButtonOkClick If MyDefs.MyFieldsChecker.AllParamsOK Then If MyGroup Is Nothing Then MyGroup = New DownloadGroup With MyGroup @@ -75,8 +74,5 @@ Namespace DownloadObjects.Groups MyDefs.CloseForm() End If End Sub - Private Sub Cancel() Implements IOkCancelToolbar.Cancel - MyDefs.CloseForm(DialogResult.Cancel) - End Sub End Class End Namespace \ No newline at end of file diff --git a/SCrawler/Download/SchedulerEditorForm.Designer.vb b/SCrawler/Download/SchedulerEditorForm.Designer.vb index ce94c6d..42e1c2c 100644 --- a/SCrawler/Download/SchedulerEditorForm.Designer.vb +++ b/SCrawler/Download/SchedulerEditorForm.Designer.vb @@ -22,27 +22,28 @@ Namespace DownloadObjects Private components As System.ComponentModel.IContainer Private Sub InitializeComponent() - Me.CONTAINER_MAIN = New System.Windows.Forms.ToolStripContainer() + Dim CONTAINER_MAIN As System.Windows.Forms.ToolStripContainer Me.LIST_PLANS = New System.Windows.Forms.ListBox() - Me.CONTAINER_MAIN.ContentPanel.SuspendLayout() - Me.CONTAINER_MAIN.SuspendLayout() + CONTAINER_MAIN = New System.Windows.Forms.ToolStripContainer() + CONTAINER_MAIN.ContentPanel.SuspendLayout() + CONTAINER_MAIN.SuspendLayout() Me.SuspendLayout() ' 'CONTAINER_MAIN ' - Me.CONTAINER_MAIN.BottomToolStripPanelVisible = False + CONTAINER_MAIN.BottomToolStripPanelVisible = False ' 'CONTAINER_MAIN.ContentPanel ' - Me.CONTAINER_MAIN.ContentPanel.Controls.Add(Me.LIST_PLANS) - Me.CONTAINER_MAIN.ContentPanel.Size = New System.Drawing.Size(414, 316) - Me.CONTAINER_MAIN.Dock = System.Windows.Forms.DockStyle.Fill - Me.CONTAINER_MAIN.LeftToolStripPanelVisible = False - Me.CONTAINER_MAIN.Location = New System.Drawing.Point(0, 0) - Me.CONTAINER_MAIN.Name = "CONTAINER_MAIN" - Me.CONTAINER_MAIN.RightToolStripPanelVisible = False - Me.CONTAINER_MAIN.Size = New System.Drawing.Size(414, 341) - Me.CONTAINER_MAIN.TabIndex = 0 + CONTAINER_MAIN.ContentPanel.Controls.Add(Me.LIST_PLANS) + CONTAINER_MAIN.ContentPanel.Size = New System.Drawing.Size(414, 316) + CONTAINER_MAIN.Dock = System.Windows.Forms.DockStyle.Fill + CONTAINER_MAIN.LeftToolStripPanelVisible = False + CONTAINER_MAIN.Location = New System.Drawing.Point(0, 0) + CONTAINER_MAIN.Name = "CONTAINER_MAIN" + CONTAINER_MAIN.RightToolStripPanelVisible = False + CONTAINER_MAIN.Size = New System.Drawing.Size(414, 341) + CONTAINER_MAIN.TabIndex = 0 ' 'LIST_PLANS ' @@ -58,20 +59,18 @@ Namespace DownloadObjects Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(414, 341) - Me.Controls.Add(Me.CONTAINER_MAIN) + Me.Controls.Add(CONTAINER_MAIN) Me.KeyPreview = True Me.MinimumSize = New System.Drawing.Size(430, 380) Me.Name = "SchedulerEditorForm" Me.ShowIcon = False Me.Text = "Scheduler" - Me.CONTAINER_MAIN.ContentPanel.ResumeLayout(False) - Me.CONTAINER_MAIN.ResumeLayout(False) - Me.CONTAINER_MAIN.PerformLayout() + CONTAINER_MAIN.ContentPanel.ResumeLayout(False) + CONTAINER_MAIN.ResumeLayout(False) + CONTAINER_MAIN.PerformLayout() Me.ResumeLayout(False) End Sub - - Private WithEvents CONTAINER_MAIN As ToolStripContainer Private WithEvents LIST_PLANS As ListBox End Class End Namespace \ No newline at end of file diff --git a/SCrawler/Download/SchedulerEditorForm.resx b/SCrawler/Download/SchedulerEditorForm.resx index 1af7de1..56d6ce4 100644 --- a/SCrawler/Download/SchedulerEditorForm.resx +++ b/SCrawler/Download/SchedulerEditorForm.resx @@ -117,4 +117,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + False + \ No newline at end of file diff --git a/SCrawler/Download/SchedulerEditorForm.vb b/SCrawler/Download/SchedulerEditorForm.vb index 745efc0..5e837c4 100644 --- a/SCrawler/Download/SchedulerEditorForm.vb +++ b/SCrawler/Download/SchedulerEditorForm.vb @@ -9,42 +9,38 @@ Imports PersonalUtilities.Forms Imports PersonalUtilities.Forms.Toolbars Namespace DownloadObjects - Friend Class SchedulerEditorForm : Implements IEditToolbar - Private ReadOnly MyDefs As DefaultFormOptions + Friend Class SchedulerEditorForm + Private WithEvents MyDefs As DefaultFormOptions Private WithEvents BTT_SKIP As ToolStripButton Private WithEvents BTT_START As ToolStripButton Friend Sub New() InitializeComponent() - MyDefs = New DefaultFormOptions + MyDefs = New DefaultFormOptions(Me, Settings.Design) + BTT_SKIP = New ToolStripButton With { + .Text = "Skip", + .ToolTipText = "Skip next run", + .AutoToolTip = True, + .DisplayStyle = ToolStripItemDisplayStyle.Text + } + BTT_START = New ToolStripButton With { + .Text = "Start", + .Image = My.Resources.StartPic_01_Green_16, + .ToolTipText = "Run selected plan", + .AutoToolTip = True + } End Sub Private Sub SchedulerEditorForm_Load(sender As Object, e As EventArgs) Handles Me.Load With MyDefs - .MyViewInitialize(Me, Settings.Design) - .AddEditToolbar() - BTT_SKIP = New ToolStripButton With { - .Text = "Skip", - .ToolTipText = "Skip next run", - .AutoToolTip = True, - .DisplayStyle = ToolStripItemDisplayStyle.Text - } - BTT_START = New ToolStripButton With { - .Text = "Start", - .Image = My.Resources.StartPic_01_Green_16, - .ToolTipText = "Run selected plan", - .AutoToolTip = True - } - .MyEditToolbar.ToolStrip.Items.AddRange({BTT_START, BTT_SKIP}) + .MyViewInitialize() + .AddEditToolbarPlus({BTT_START, BTT_SKIP}) Refill() .EndLoaderOperations(False) End With End Sub - Private Sub SchedulerEditorForm_Disposed(sender As Object, e As EventArgs) Handles Me.Disposed - BTT_SKIP.Dispose() - End Sub Private Sub SchedulerEditorForm_KeyDown(sender As Object, e As KeyEventArgs) Handles Me.KeyDown If e.KeyCode = Keys.Escape Then Close() End Sub - Private Sub Refill() Implements IEditToolbar.Update + Private Sub Refill() Handles MyDefs.ButtonUpdateClick Try LIST_PLANS.Items.Clear() If Settings.Automation.Count > 0 Then @@ -57,7 +53,7 @@ Namespace DownloadObjects ErrorsDescriber.Execute(EDP.SendInLog, ex) End Try End Sub - Private Sub Add() Implements IEditToolbar.Add + Private Sub MyDefs_ButtonAddClick(ByVal Sender As Object, ByVal e As EditToolbar.EditToolbarEventArgs) Handles MyDefs.ButtonAddClick Dim a As New AutoDownloader(True) Using f As New AutoDownloaderEditorForm(a) f.ShowDialog() @@ -69,7 +65,7 @@ Namespace DownloadObjects End If End Using End Sub - Private Sub Edit() Implements IEditToolbar.Edit + Private Sub Edit() Handles MyDefs.ButtonEditClick If _LatestSelected.ValueBetween(0, LIST_PLANS.Items.Count - 1) Then Using f As New AutoDownloaderEditorForm(Settings.Automation(_LatestSelected)) : f.ShowDialog() : End Using Refill() @@ -78,14 +74,16 @@ Namespace DownloadObjects End If End Sub Private _DeleteInProgress As Boolean = False - Private Async Sub Delete() Implements IEditToolbar.Delete + Private Async Sub MyDefs_ButtonDeleteClickE(ByVal Sender As Object, ByVal e As EditToolbar.EditToolbarEventArgs) Handles MyDefs.ButtonDeleteClickE If Not _DeleteInProgress Then If _LatestSelected.ValueBetween(0, LIST_PLANS.Items.Count - 1) Then _DeleteInProgress = True Dim n$ = Settings.Automation(_LatestSelected).Name - Await Settings.Automation.RemoveAt(_LatestSelected) - Refill() - MsgBoxE($"Plan [{n}] deleted") + If MsgBoxE({$"Are you sure you want to delete the [{n}] plan?", "Deleting a plan..."}, vbExclamation + vbYesNo) = vbYes Then + Await Settings.Automation.RemoveAt(_LatestSelected) + Refill() + MsgBoxE($"Plan [{n}] deleted") + End If _DeleteInProgress = False Else MsgBoxE("You have not selected a plan to delete.", vbExclamation) diff --git a/SCrawler/Download/TDownloader.vb b/SCrawler/Download/TDownloader.vb index 0565f67..4b94e17 100644 --- a/SCrawler/Download/TDownloader.vb +++ b/SCrawler/Download/TDownloader.vb @@ -7,12 +7,12 @@ ' This program is distributed in the hope that it will be useful, ' but WITHOUT ANY WARRANTY Imports System.Threading -Imports PersonalUtilities.Forms.Toolbars -Imports EOptions = PersonalUtilities.Forms.Toolbars.IMyProgress.EnableOptions +Imports PersonalUtilities.Tools Imports SCrawler.API Imports SCrawler.API.Base Imports SCrawler.Plugin.Hosts Imports Download = SCrawler.Plugin.ISiteSettings.Download +Imports EOptions = PersonalUtilities.Forms.Toolbars.IMyProgress.EnableOptions Namespace DownloadObjects Friend Class TDownloader : Implements IDisposable #Region "Events" @@ -34,7 +34,7 @@ Namespace DownloadObjects End Property Friend ReadOnly Property Count As Integer Get - If Pool.Count = 0 Then Return 0 Else Return Pool.Sum(Function(j) j.Count) + Return If(Pool.Count = 0, 0, Pool.Sum(Function(j) j.Count)) End Get End Property #End Region @@ -53,30 +53,11 @@ Namespace DownloadObjects End Sub #End Region #Region "Jobs" - Friend Class Job : Implements IDisposable - Friend Event OnItemsCountChange(ByVal Sender As Job, ByVal Count As Integer) + Friend Class Job : Inherits JobThread(Of IUserData) Private ReadOnly Hosts As List(Of SettingsHost) Private ReadOnly Keys As List(Of String) Private ReadOnly RemovingKeys As List(Of String) - Private TokenSource As CancellationTokenSource - Friend Token As CancellationToken - Private [Thread] As Thread - Private _Working As Boolean - Friend ReadOnly Property Items As List(Of IUserData) Friend ReadOnly Property [Type] As Download - Friend ReadOnly Property Count As Integer - Get - Return Items.Count - End Get - End Property - Friend Sub Clear() - Items.Clear() - End Sub - Friend ReadOnly Property Working As Boolean - Get - Return _Working OrElse If(Thread?.IsAlive, False) - End Get - End Property Friend ReadOnly Property IsSeparated As Boolean Get Return Hosts.Count = 1 AndAlso Hosts(0).IsSeparatedTasks @@ -102,21 +83,19 @@ Namespace DownloadObjects Return Nothing End Get End Property - Friend Property Progress As MyProgress Friend Sub New(ByVal JobType As Download) Hosts = New List(Of SettingsHost) RemovingKeys = New List(Of String) Keys = New List(Of String) - Items = New List(Of IUserData) [Type] = JobType End Sub - Friend Function Add(ByVal User As IUserData) As Boolean + Public Overrides Function Add(ByVal User As IUserData) As Boolean With DirectCast(User, UserDataBase) If Keys.Count > 0 Then Dim i% = Keys.IndexOf(.User.Plugin) If i >= 0 Then Items.Add(User) - RaiseEvent OnItemsCountChange(Me, Count) + OnItemsCountChange(Me, Count) Return True Else If RemovingKeys.Count > 0 Then Return RemovingKeys.IndexOf(.User.Plugin) >= 0 @@ -151,29 +130,13 @@ Namespace DownloadObjects Return False End If End Function - Friend Sub ThrowIfCancellationRequested() - Token.ThrowIfCancellationRequested() - End Sub - Friend ReadOnly Property IsCancellationRequested As Boolean - Get - Return Token.IsCancellationRequested - End Get - End Property - Friend Sub [Start](ByVal [ThreadStart] As ThreadStart) - Thread = New Thread(ThreadStart) With {.IsBackground = True} - Thread.SetApartmentState(ApartmentState.MTA) - Thread.Start() - End Sub - Friend Sub [Start]() + Public Overrides Sub Start() If Hosts.Count > 0 Then Hosts.ForEach(Sub(h) h.DownloadStarted([Type])) TokenSource = New CancellationTokenSource Token = TokenSource.Token _Working = True End Sub - Friend Sub [Stop]() - If Not TokenSource Is Nothing Then TokenSource.Cancel() - End Sub - Friend Sub Stopped() + Public Overrides Sub Stopped() _Working = False TokenSource = Nothing Try @@ -186,25 +149,13 @@ Namespace DownloadObjects If Hosts.Count > 0 Then Hosts.ForEach(Sub(h) h.DownloadDone([Type])) End Sub #Region "IDisposable Support" - Private disposedValue As Boolean = False - Protected Overridable Overloads Sub Dispose(ByVal disposing As Boolean) - If Not disposedValue Then - If disposing Then - Hosts.Clear() - Keys.Clear() - RemovingKeys.Clear() - Items.Clear() - End If - disposedValue = True + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + If Not disposedValue And disposing Then + Hosts.Clear() + Keys.Clear() + RemovingKeys.Clear() End If - End Sub - Protected Overrides Sub Finalize() - Dispose(False) - MyBase.Finalize() - End Sub - Friend Overloads Sub Dispose() Implements IDisposable.Dispose - Dispose(True) - GC.SuppressFinalize(Me) + MyBase.Dispose(disposing) End Sub #End Region End Class diff --git a/SCrawler/Download/VideosDownloaderForm.Designer.vb b/SCrawler/Download/VideosDownloaderForm.Designer.vb index d64170f..24fffb8 100644 --- a/SCrawler/Download/VideosDownloaderForm.Designer.vb +++ b/SCrawler/Download/VideosDownloaderForm.Designer.vb @@ -16,11 +16,13 @@ Private Sub InitializeComponent() Dim SEP_1 As System.Windows.Forms.ToolStripSeparator Dim SEP_2 As System.Windows.Forms.ToolStripSeparator + Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(VideosDownloaderForm)) Me.ToolbarTOP = New System.Windows.Forms.ToolStrip() Me.BTT_ADD = New System.Windows.Forms.ToolStripButton() Me.BTT_ADD_LIST = New System.Windows.Forms.ToolStripButton() Me.BTT_DELETE = New System.Windows.Forms.ToolStripButton() Me.BTT_DOWN = New System.Windows.Forms.ToolStripButton() + Me.BTT_STOP = New System.Windows.Forms.ToolStripButton() Me.BTT_OPEN_PATH = New System.Windows.Forms.ToolStripButton() Me.ToolbarBOTTOM = New System.Windows.Forms.StatusStrip() Me.PR_V = New System.Windows.Forms.ToolStripProgressBar() @@ -45,7 +47,7 @@ 'ToolbarTOP ' Me.ToolbarTOP.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden - Me.ToolbarTOP.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.BTT_ADD, Me.BTT_ADD_LIST, Me.BTT_DELETE, SEP_1, Me.BTT_DOWN, SEP_2, Me.BTT_OPEN_PATH}) + Me.ToolbarTOP.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.BTT_ADD, Me.BTT_ADD_LIST, Me.BTT_DELETE, SEP_1, Me.BTT_DOWN, Me.BTT_STOP, SEP_2, Me.BTT_OPEN_PATH}) Me.ToolbarTOP.Location = New System.Drawing.Point(0, 0) Me.ToolbarTOP.Name = "ToolbarTOP" Me.ToolbarTOP.Size = New System.Drawing.Size(524, 25) @@ -87,6 +89,16 @@ Me.BTT_DOWN.Size = New System.Drawing.Size(104, 22) Me.BTT_DOWN.Text = "Download (F5)" ' + 'BTT_STOP + ' + Me.BTT_STOP.AutoToolTip = False + Me.BTT_STOP.Enabled = False + Me.BTT_STOP.Image = CType(resources.GetObject("BTT_STOP.Image"), System.Drawing.Image) + Me.BTT_STOP.ImageTransparentColor = System.Drawing.Color.Magenta + Me.BTT_STOP.Name = "BTT_STOP" + Me.BTT_STOP.Size = New System.Drawing.Size(51, 22) + Me.BTT_STOP.Text = "Stop" + ' 'BTT_OPEN_PATH ' Me.BTT_OPEN_PATH.AutoToolTip = False @@ -156,5 +168,6 @@ Private WithEvents LIST_VIDEOS As ListBox Private WithEvents BTT_DOWN As ToolStripButton Private WithEvents BTT_OPEN_PATH As ToolStripButton + Private WithEvents BTT_STOP As ToolStripButton End Class End Namespace \ No newline at end of file diff --git a/SCrawler/Download/VideosDownloaderForm.resx b/SCrawler/Download/VideosDownloaderForm.resx index d0894be..3e29515 100644 --- a/SCrawler/Download/VideosDownloaderForm.resx +++ b/SCrawler/Download/VideosDownloaderForm.resx @@ -126,6 +126,36 @@ 17, 17 + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAVCSURBVEhLjZVtTFNXGMcLQmdHO6CdhGSlc4gDBAr2Qrmo + GJygFFuBtoLKiJpRcUXFF5QoRmM00SgmS/Zh+7B92DKTmblEl2VzgEDmBBJgoBPDm4qlLX0vXOaWLNCz + /ynFl1g2nuSX9p7zP//nyXPOPZdHo7+gIKItPv6L9tjYkSaZ7PMtUuk7GA7zT/5PDCuV7BOZ7M5obGzf + jYQEPYYiQIh/ksYDo1HYXVBwfbi+noxduUIe1dX5mli2NVskWonp8DlV8BhkmHXWHTuecpcukenGRvKk + rMz9aVJSjSwyMhrTc0laV6z4bOjIEfL47FkyduYMMUNsOn6c3GLZO3KR6H1IgiYZzcn5AOYm7vJlwmEt + 19BApk+fJsMajecHqfQTSMQgjNcukZip+eO6OvL05ElihmjiwgUyXl/va1Iqf0sTiRIhfCUJ2rLJWl5u + ppVT82mYc8eOkWkU5q2sJG0xMQOQsUDEa4mLuzpSVUXGkMAEzCdOECsW2M+fJxa0q4VlO1OFwiSI/UmG + FYpNE2Vl5qmLFwmHYqZRFId104cPk8l9+8htpdK5SyL5DtIiIOZply9/91Zm5p3RPXt84xBZwASqsWNP + XGiZ4+hR0o4kq4XC5N8ZpsCi11unzp3zt4RDxRzay9XWkimYt2dluRMFgq9hbAByQDecF85IJElI0mna + tYtYDxwgtv37if3QIeJEMg+M8Ozrysm5N1ZcbOZOnfJXzGGOg5arqZkzZxh3skBwFX5VICVgHgr8wV8t + Fif/olB0mCoqfLbqauIALqORuGHgRTLvwYNkCtVOUWM8c3j2m6O9HSzrkQuF1JxWvgosBS+OaiD4SrF4 + VUt6eqd12zbi2L2buIDHYCBeVDiJhJPYwMniYuLdsIF4c3KIG3RkZ3szRKJrWL8X0MoF4DXz+eBnRUen + 3JbLO81q9Yx7+3biUqmIi2GIUyolTpGIOMPDiXPJEmITCn0t8fEeNiqKbmg1SAVvggXN58Pfrm65vH8C + hjaY2YEDUGM/YWHkoULxtz4p6SfoPwZpYFHm/rBWVhqta9eabALB6+aAjo0nJMy0aTSPkuPiirEkEizO + 3GswHHVu3Oi0ofqFzC3gKTClpJA+rXZg55o1GVj6n9eKP1wGQ4Nj82aXLSLiNXMHek/bRc3HwEhoKHkA + BjMyfP063UM9y9I2LZzEs3fvSUdhoTtY5Q6JhIwXFv5jSUz0UfPhgHkv6AD3GWYWSQZ2LpQER7EB5h6c + DL/xK22JiSGDRUV/nlu/vqtXrZ4wJSeTP2DaA+6CX0Eb6MvKmu3W6+9tlMvpBfniqndXVdU7VCqPPZj5 + smVkqKjoWQ3DtEC6vzA19cOBkpJHg+j9vHkraAa3QLdSOdul0/V+pdHQjeeDEJ67tNRsj4oKWjk1r1Yo + miE0ArqR4kN5eWv7tdrRe2lpz81/Bj+Cm6A/N3emR6sdgnY54PPsOt2gWyYLWrmRYW5DVBMwn/9S8Q/n + 57N9Ot1oT1qa72Xz70NCSM+6dTPtarUFugIQzeuqqNgxoVa7XDB9qfK/DgQ3nw9+bV5eNjZ2pDs9ndwI + mN/Nzp79VqUaL1q58kto5hIgljaXlZ0yb93qsbOsb0ilelabmdmK8YXM54NvyM1V0HZ0Yx1u29nrKpXl + LYGgEXOlYK5FiBAmPj6yV6v95nFJieNafj5OX2gtxhkgpPNUtEDwb5aXf3S/tNRyV6NxFiYm0m+BFkgB + Pa7P19I/USATbAn8Lvb1fwPQo0lPjhq8B4K+cEsArZh+rOkvfV5M0CLo/f92AJowUBiP9y9PzdvIaubv + /QAAAABJRU5ErkJggg== + + 124, 17 diff --git a/SCrawler/Download/VideosDownloaderForm.vb b/SCrawler/Download/VideosDownloaderForm.vb index 0f5eb42..0e1011b 100644 --- a/SCrawler/Download/VideosDownloaderForm.vb +++ b/SCrawler/Download/VideosDownloaderForm.vb @@ -8,27 +8,26 @@ ' but WITHOUT ANY WARRANTY Imports System.ComponentModel Imports PersonalUtilities.Forms +Imports PersonalUtilities.Tools Namespace DownloadObjects Friend Class VideosDownloaderForm +#Region "Declarations" Private MyView As FormsView - Private ReadOnly MyPR As Toolbars.MyProgress - Private ReadOnly UrlList As List(Of String) Private ReadOnly DownloadingUrlsFile As SFile = $"{SettingsFolderName}\VideosUrls.txt" + Private ReadOnly MyJob As JobThread(Of String) +#End Region +#Region "Initializer" Friend Sub New() InitializeComponent() - UrlList = New List(Of String) - MyPR = New Toolbars.MyProgress(ToolbarBOTTOM, PR_V, LBL_STATUS, "Downloading video") + MyJob = New JobThread(Of String) With {.Progress = New Toolbars.MyProgress(ToolbarBOTTOM, PR_V, LBL_STATUS, "Downloading video")} If DownloadingUrlsFile.Exists Then _ - UrlList.ListAddList(DownloadingUrlsFile.GetText.StringToList(Of String, List(Of String))(Environment.NewLine), LAP.NotContainsOnly) + MyJob.Items.ListAddList(DownloadingUrlsFile.GetText.StringToList(Of String, List(Of String))(Environment.NewLine), LAP.NotContainsOnly) End Sub Private Sub VideosDownloaderForm_Load(sender As Object, e As EventArgs) Handles Me.Load - Try - MyView = New FormsView(Me) - MyView.ImportFromXML(Settings.Design) - MyView.SetMeSize() - RefillList(False) - Catch ex As Exception - End Try + MyView = New FormsView(Me) + MyView.ImportFromXML(Settings.Design) + MyView.SetMeSize() + RefillList(False) End Sub Private Sub VideosDownloaderForm_Closing(sender As Object, e As CancelEventArgs) Handles Me.Closing e.Cancel = True @@ -36,95 +35,120 @@ Namespace DownloadObjects End Sub Private Sub VideosDownloaderForm_Disposed(sender As Object, e As EventArgs) Handles Me.Disposed If Not MyView Is Nothing Then MyView.Dispose(Settings.Design) - If UrlList.Count > 0 Then UpdateUrlsFile() - UrlList.Clear() + If MyJob.Count > 0 Then UpdateUrlsFile() + MyJob.Dispose() End Sub Private Sub VideosDownloaderForm_KeyDown(sender As Object, e As KeyEventArgs) Handles Me.KeyDown Dim b As Boolean = True Select Case e.KeyCode - Case Keys.Insert : AddVideo() - Case Keys.F5 : DownloadVideos() - Case Keys.F8 : BTT_DELETE_Click(Nothing, EventArgs.Empty) + Case Keys.Insert : AddItem() + Case Keys.F5 : StartDownloading() + Case Keys.F8 : DeleteItem() Case Else : b = False End Select If b Then e.Handled = True End Sub +#End Region +#Region "Refill, Update file" Private Sub RefillList(Optional ByVal Update As Boolean = True) Try - With LIST_VIDEOS - .Items.Clear() - If UrlList.Count > 0 Then UrlList.ForEach(Sub(u) .Items.Add(u)) - If .Items.Count > 0 And _LatestSelected >= 0 And _LatestSelected <= .Items.Count - 1 Then .SelectedIndex = _LatestSelected - If Update Then UpdateUrlsFile() - End With + Dim a As Action = Sub() + With LIST_VIDEOS + .Items.Clear() + If MyJob.Count > 0 Then MyJob.Items.ForEach(Sub(u) .Items.Add(u)) + If _LatestSelected.ValueBetween(0, .Items.Count - 1) Then .SelectedIndex = _LatestSelected + If Update Then UpdateUrlsFile() + End With + End Sub + If LIST_VIDEOS.InvokeRequired Then LIST_VIDEOS.Invoke(a) Else a.Invoke Catch ex As Exception - ErrorsDescriber.Execute(EDP.LogMessageValue, ex, "Error on list refill") + ErrorsDescriber.Execute(EDP.SendInLog, ex, "Error on list refill") End Try End Sub Private Sub UpdateUrlsFile() - If UrlList.Count > 0 Then - TextSaver.SaveTextToFile(UrlList.ListToString(Environment.NewLine), DownloadingUrlsFile, True,, EDP.SendInLog) + If MyJob.Count > 0 Then + TextSaver.SaveTextToFile(MyJob.ListToString(Environment.NewLine), DownloadingUrlsFile, True,, EDP.SendInLog) Else DownloadingUrlsFile.Delete(, Settings.DeleteMode, EDP.SendInLog) End If End Sub - Private Sub BTT_ADD_Click(sender As Object, e As EventArgs) Handles BTT_ADD.Click - AddVideo() - End Sub - Private Sub AddVideo() +#End Region +#Region "Add, Delete" + Private Sub AddItem() Handles BTT_ADD.Click Dim URL$ = GetNewVideoURL() If Not URL.IsEmptyString Then - If Not UrlList.Contains(URL) Then - UrlList.Add(URL) + If Not MyJob.Contains(URL) Then + MyJob.Add(URL) RefillList() Else - MsgBoxE("This URL already added to list") + MsgBoxE("This URL has already been added to the list") End If End If End Sub - Private Sub BTT_ADD_LIST_Click(sender As Object, e As EventArgs) Handles BTT_ADD_LIST.Click + Private Sub AddItemsRange() Handles BTT_ADD_LIST.Click Dim l$ = InputBoxE("Enter URLs (new line as delimiter):", "URLs list", GetCurrentBuffer(),,,,,, True) If Not l.IsEmptyString Then - Dim ub% = UrlList.Count - UrlList.ListAddList(l.StringFormatLines.StringToList(Of String, List(Of String))(vbCrLf).ListForEach(Function(u, i) u.Trim,, False)) - If Not UrlList.Count = ub Then RefillList() + Dim ub% = MyJob.Count + MyJob.Items.ListAddList(l.StringFormatLines.StringToList(Of String, List(Of String))(vbCrLf).ListForEach(Function(u, i) u.Trim,, False)) + If Not MyJob.Count = ub Then RefillList() End If End Sub - Private Sub BTT_DELETE_Click(sender As Object, e As EventArgs) Handles BTT_DELETE.Click - If _LatestSelected >= 0 And _LatestSelected <= UrlList.Count - 1 Then - If MsgBoxE({$"Do you really want to delete video URL:{vbCr}{UrlList(_LatestSelected)}", "Deleting URL..."}, - MsgBoxStyle.Exclamation + MsgBoxStyle.YesNo) = MsgBoxResult.Yes Then - UrlList.RemoveAt(_LatestSelected) + Private Sub DeleteItem() Handles BTT_DELETE.Click + If _LatestSelected.ValueBetween(0, MyJob.Count - 1) Then + If MsgBoxE({$"Are you sure you want to delete the video URL:{vbCr}{MyJob(_LatestSelected)}", "Deleting URL..."}, vbExclamation + vbYesNo) = vbYes Then + MyJob.Items.RemoveAt(_LatestSelected) RefillList() End If Else - MsgBoxE("URL does not selected", MsgBoxStyle.Exclamation) + MsgBoxE("URL not selected", MsgBoxStyle.Exclamation) End If End Sub +#End Region +#Region "Start, Stop" Private Sub BTT_DOWN_Click(sender As Object, e As EventArgs) Handles BTT_DOWN.Click - DownloadVideos() + StartDownloading() + End Sub + Private Sub BTT_STOP_Click(sender As Object, e As EventArgs) Handles BTT_STOP.Click + SetControlValueInvoke(ToolbarTOP, BTT_STOP, Sub() BTT_STOP.Enabled = False) + MyJob.Stop() + End Sub +#End Region +#Region "Downloading" + Private Sub StartDownloading() + If Not MyJob.Working And MyJob.Count > 0 Then + SetControlValueInvoke(ToolbarTOP, BTT_DOWN, Sub() BTT_DOWN.Enabled = False) + SetControlValueInvoke(ToolbarTOP, BTT_STOP, Sub() BTT_STOP.Enabled = True) + MyJob.Start(AddressOf DownloadVideos, Threading.ApartmentState.STA) + End If End Sub Private Sub DownloadVideos() - If UrlList.Count > 0 Then - MyPR.TotalCount = UrlList.Count - MyPR.Enabled = True + MyJob.Start() + If MyJob.Count > 0 Then + MyJob.Progress.TotalCount = MyJob.Count + MyJob.Progress.Enabled = True Dim IsFirst As Boolean = True - For i% = UrlList.Count - 1 To 0 Step -1 - If DownloadVideoByURL(UrlList(i), IsFirst, True) Then UrlList.RemoveAt(i) - MyPR.Perform() + For i% = MyJob.Count - 1 To 0 Step -1 + If MyJob.IsCancellationRequested Then Exit For + If DownloadVideoByURL(MyJob(i), IsFirst, True) Then MyJob.Items.RemoveAt(i) + MyJob.Progress.Perform() IsFirst = False Next - MyPR.Done() + MyJob.Progress.Done() RefillList() - MyPR.Enabled = False - Else - MsgBoxE("No one video added", MsgBoxStyle.Exclamation) + MyJob.Progress.Enabled = False End If + SetControlValueInvoke(ToolbarTOP, BTT_DOWN, Sub() BTT_DOWN.Enabled = True) + SetControlValueInvoke(ToolbarTOP, BTT_STOP, Sub() BTT_STOP.Enabled = False) + MyJob.Stopped() End Sub +#End Region +#Region "List handlers" Private _LatestSelected As Integer = -1 Private Sub LIST_VIDEOS_SelectedIndexChanged(sender As Object, e As EventArgs) Handles LIST_VIDEOS.SelectedIndexChanged _LatestSelected = LIST_VIDEOS.SelectedIndex End Sub +#End Region +#Region "Open path" Private Sub BTT_OPEN_PATH_Click(sender As Object, e As EventArgs) Handles BTT_OPEN_PATH.Click With Settings.LatestSavingPath If Not .Value.IsEmptyString Then @@ -134,9 +158,10 @@ Namespace DownloadObjects MsgBoxE($"Path [{ .Value}] does not exists!", MsgBoxStyle.Exclamation) End If Else - MsgBoxE("Saving path does not set!", MsgBoxStyle.Exclamation) + MsgBoxE("Save path not specified!", MsgBoxStyle.Exclamation) End If End With End Sub +#End Region End Class End Namespace \ No newline at end of file diff --git a/SCrawler/Editors/CollectionEditorForm.Designer.vb b/SCrawler/Editors/CollectionEditorForm.Designer.vb index 2b25ae0..f52770c 100644 --- a/SCrawler/Editors/CollectionEditorForm.Designer.vb +++ b/SCrawler/Editors/CollectionEditorForm.Designer.vb @@ -14,13 +14,14 @@ Private components As System.ComponentModel.IContainer Private Sub InitializeComponent() - Dim ActionButton1 As PersonalUtilities.Forms.Controls.Base.ActionButton = New PersonalUtilities.Forms.Controls.Base.ActionButton() + Dim CONTAINER_MAIN As System.Windows.Forms.ToolStripContainer + Dim ActionButton3 As PersonalUtilities.Forms.Controls.Base.ActionButton = New PersonalUtilities.Forms.Controls.Base.ActionButton() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(CollectionEditorForm)) - Dim ActionButton2 As PersonalUtilities.Forms.Controls.Base.ActionButton = New PersonalUtilities.Forms.Controls.Base.ActionButton() - Me.CONTAINER_MAIN = New System.Windows.Forms.ToolStripContainer() + Dim ActionButton4 As PersonalUtilities.Forms.Controls.Base.ActionButton = New PersonalUtilities.Forms.Controls.Base.ActionButton() Me.CMB_COLLECTIONS = New PersonalUtilities.Forms.Controls.ComboBoxExtended() - Me.CONTAINER_MAIN.ContentPanel.SuspendLayout() - Me.CONTAINER_MAIN.SuspendLayout() + CONTAINER_MAIN = New System.Windows.Forms.ToolStripContainer() + CONTAINER_MAIN.ContentPanel.SuspendLayout() + CONTAINER_MAIN.SuspendLayout() CType(Me.CMB_COLLECTIONS, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' @@ -29,28 +30,28 @@ ' 'CONTAINER_MAIN.ContentPanel ' - Me.CONTAINER_MAIN.ContentPanel.Controls.Add(Me.CMB_COLLECTIONS) - Me.CONTAINER_MAIN.ContentPanel.Padding = New System.Windows.Forms.Padding(2, 0, 2, 0) - Me.CONTAINER_MAIN.ContentPanel.Size = New System.Drawing.Size(454, 251) - Me.CONTAINER_MAIN.Dock = System.Windows.Forms.DockStyle.Fill - Me.CONTAINER_MAIN.LeftToolStripPanelVisible = False - Me.CONTAINER_MAIN.Location = New System.Drawing.Point(0, 0) - Me.CONTAINER_MAIN.Name = "CONTAINER_MAIN" - Me.CONTAINER_MAIN.RightToolStripPanelVisible = False - Me.CONTAINER_MAIN.Size = New System.Drawing.Size(454, 251) - Me.CONTAINER_MAIN.TabIndex = 0 - Me.CONTAINER_MAIN.TopToolStripPanelVisible = False + CONTAINER_MAIN.ContentPanel.Controls.Add(Me.CMB_COLLECTIONS) + CONTAINER_MAIN.ContentPanel.Padding = New System.Windows.Forms.Padding(2, 0, 2, 0) + CONTAINER_MAIN.ContentPanel.Size = New System.Drawing.Size(454, 251) + CONTAINER_MAIN.Dock = System.Windows.Forms.DockStyle.Fill + CONTAINER_MAIN.LeftToolStripPanelVisible = False + CONTAINER_MAIN.Location = New System.Drawing.Point(0, 0) + CONTAINER_MAIN.Name = "CONTAINER_MAIN" + CONTAINER_MAIN.RightToolStripPanelVisible = False + CONTAINER_MAIN.Size = New System.Drawing.Size(454, 251) + CONTAINER_MAIN.TabIndex = 0 + CONTAINER_MAIN.TopToolStripPanelVisible = False ' 'CMB_COLLECTIONS ' - ActionButton1.BackgroundImage = CType(resources.GetObject("ActionButton1.BackgroundImage"), System.Drawing.Image) - ActionButton1.Name = "Add" - ActionButton1.ToolTipText = "Add new collection" - ActionButton2.BackgroundImage = CType(resources.GetObject("ActionButton2.BackgroundImage"), System.Drawing.Image) - ActionButton2.Name = "ArrowDown" - ActionButton2.Visible = False - Me.CMB_COLLECTIONS.Buttons.Add(ActionButton1) - Me.CMB_COLLECTIONS.Buttons.Add(ActionButton2) + ActionButton3.BackgroundImage = CType(resources.GetObject("ActionButton3.BackgroundImage"), System.Drawing.Image) + ActionButton3.Name = "Add" + ActionButton3.ToolTipText = "Add new collection" + ActionButton4.BackgroundImage = CType(resources.GetObject("ActionButton4.BackgroundImage"), System.Drawing.Image) + ActionButton4.Name = "ArrowDown" + ActionButton4.Visible = False + Me.CMB_COLLECTIONS.Buttons.Add(ActionButton3) + Me.CMB_COLLECTIONS.Buttons.Add(ActionButton4) Me.CMB_COLLECTIONS.Dock = System.Windows.Forms.DockStyle.Fill Me.CMB_COLLECTIONS.ListDropDownStyle = PersonalUtilities.Forms.Controls.ComboBoxExtended.ListMode.Simple Me.CMB_COLLECTIONS.Location = New System.Drawing.Point(2, 0) @@ -63,7 +64,7 @@ Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(454, 251) - Me.Controls.Add(Me.CONTAINER_MAIN) + Me.Controls.Add(CONTAINER_MAIN) Me.KeyPreview = True Me.MinimizeBox = False Me.MinimumSize = New System.Drawing.Size(470, 290) @@ -71,15 +72,13 @@ Me.ShowIcon = False Me.ShowInTaskbar = False Me.Text = "Collection" - Me.CONTAINER_MAIN.ContentPanel.ResumeLayout(False) - Me.CONTAINER_MAIN.ResumeLayout(False) - Me.CONTAINER_MAIN.PerformLayout() + CONTAINER_MAIN.ContentPanel.ResumeLayout(False) + CONTAINER_MAIN.ResumeLayout(False) + CONTAINER_MAIN.PerformLayout() CType(Me.CMB_COLLECTIONS, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) End Sub - - Private WithEvents CONTAINER_MAIN As ToolStripContainer Private WithEvents CMB_COLLECTIONS As PersonalUtilities.Forms.Controls.ComboBoxExtended End Class End Namespace \ No newline at end of file diff --git a/SCrawler/Editors/CollectionEditorForm.resx b/SCrawler/Editors/CollectionEditorForm.resx index 9512fa7..492e1a6 100644 --- a/SCrawler/Editors/CollectionEditorForm.resx +++ b/SCrawler/Editors/CollectionEditorForm.resx @@ -117,8 +117,11 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + False + - + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGOfPtRkwAAACBjSFJNAAB6 JQAAgIMAAPn/AACA6QAAdTAAAOpgAAA6mAAAF2+SX8VGAAAACXBIWXMAAAsTAAALEwEAmpwYAAADmUlE @@ -140,7 +143,7 @@ 0AUyNxOP1DOwcaG/8I+/LRB+At7psBnyDBG0AAAAAElFTkSuQmCC - + iVBORw0KGgoAAAANSUhEUgAAAgAAAAIACAYAAAD0eNT6AAAABGdBTUEAALGPC/xhBQAAE65JREFUeF7t 3X2sJWddB/DdLi2lQG2hdOHuvfM887J7Cxca4ELTQMDWKigIFpBAEAgi9g+CJpJo9Q8NJhgBiYZIYspL diff --git a/SCrawler/Editors/CollectionEditorForm.vb b/SCrawler/Editors/CollectionEditorForm.vb index a851413..bf581d9 100644 --- a/SCrawler/Editors/CollectionEditorForm.vb +++ b/SCrawler/Editors/CollectionEditorForm.vb @@ -8,15 +8,14 @@ ' but WITHOUT ANY WARRANTY Imports PersonalUtilities.Forms Imports PersonalUtilities.Forms.Controls.Base -Imports PersonalUtilities.Forms.Toolbars Namespace Editors - Friend Class CollectionEditorForm : Implements IOkCancelToolbar - Private ReadOnly MyDefs As DefaultFormOptions + Friend Class CollectionEditorForm + Private WithEvents MyDefs As DefaultFormOptions Private ReadOnly Collections As List(Of String) Friend Property [Collection] As String = String.Empty Friend Sub New() InitializeComponent() - MyDefs = New DefaultFormOptions + MyDefs = New DefaultFormOptions(Me, Settings.Design) Collections = New List(Of String) End Sub Friend Sub New(ByVal CollectionName As String) @@ -26,7 +25,7 @@ Namespace Editors Private Sub CollectionEditorForm_Load(sender As Object, e As EventArgs) Handles Me.Load Try With MyDefs - .MyViewInitialize(Me, Settings.Design) + .MyViewInitialize() .AddOkCancelToolbar() Collections.ListAddList((From c In Settings.Users Where c.IsCollection Select c.CollectionName), LAP.NotContainsOnly, EDP.ThrowException) If Collections.ListExists Then Collections.Sort() : CMB_COLLECTIONS.Items.AddRange(From c In Collections Select New ListItem(c)) @@ -44,7 +43,7 @@ Namespace Editors Private Sub CollectionEditorForm_KeyDown(sender As Object, e As KeyEventArgs) Handles Me.KeyDown If e.KeyCode = Keys.Insert Then AddNewCollection() : e.Handled = True Else e.Handled = False End Sub - Private Sub OK() Implements IOkCancelToolbar.OK + Private Sub MyDefs_ButtonOkClick() Handles MyDefs.ButtonOkClick If CMB_COLLECTIONS.SelectedIndex >= 0 Then Collection = CMB_COLLECTIONS.Value.ToString MyDefs.CloseForm() @@ -52,15 +51,12 @@ Namespace Editors MsgBoxE("Collection not selected", MsgBoxStyle.Exclamation) End If End Sub - Private Sub Cancel() Implements IOkCancelToolbar.Cancel - MyDefs.CloseForm(DialogResult.Cancel) - End Sub - Private Sub CMB_COLLECTIONS_ActionOnButtonClick(ByVal Sender As ActionButton) Handles CMB_COLLECTIONS.ActionOnButtonClick + Private Sub CMB_COLLECTIONS_ActionOnButtonClick(ByVal Sender As ActionButton, ByVal e As EventArgs) Handles CMB_COLLECTIONS.ActionOnButtonClick If Sender.DefaultButton = ActionButton.DefaultButtons.Add Then AddNewCollection() End Sub Private Sub CMB_COLLECTIONS_ActionOnListDoubleClick(ByVal _Item As ListViewItem) Handles CMB_COLLECTIONS.ActionOnListDoubleClick _Item.Selected = True - OK() + MyDefs_ButtonOkClick() End Sub Private Sub AddNewCollection() Dim c$ = InputBoxE("Enter new collection name:", "Collection name") diff --git a/SCrawler/Editors/GlobalSettingsForm.Designer.vb b/SCrawler/Editors/GlobalSettingsForm.Designer.vb index d50a3db..68dfefd 100644 --- a/SCrawler/Editors/GlobalSettingsForm.Designer.vb +++ b/SCrawler/Editors/GlobalSettingsForm.Designer.vb @@ -215,7 +215,7 @@ Me.TXT_IMAGE_LARGE.Dock = System.Windows.Forms.DockStyle.Fill Me.TXT_IMAGE_LARGE.Location = New System.Drawing.Point(3, 3) Me.TXT_IMAGE_LARGE.Name = "TXT_IMAGE_LARGE" - Me.TXT_IMAGE_LARGE.NumberMaximum = New Decimal(New Integer() {1000, 0, 0, 0}) + Me.TXT_IMAGE_LARGE.NumberMaximum = New Decimal(New Integer() {256, 0, 0, 0}) Me.TXT_IMAGE_LARGE.NumberMinimum = New Decimal(New Integer() {50, 0, 0, 0}) Me.TXT_IMAGE_LARGE.Size = New System.Drawing.Size(278, 22) Me.TXT_IMAGE_LARGE.TabIndex = 0 @@ -231,7 +231,7 @@ Me.TXT_IMAGE_SMALL.Dock = System.Windows.Forms.DockStyle.Fill Me.TXT_IMAGE_SMALL.Location = New System.Drawing.Point(287, 3) Me.TXT_IMAGE_SMALL.Name = "TXT_IMAGE_SMALL" - Me.TXT_IMAGE_SMALL.NumberMaximum = New Decimal(New Integer() {500, 0, 0, 0}) + Me.TXT_IMAGE_SMALL.NumberMaximum = New Decimal(New Integer() {256, 0, 0, 0}) Me.TXT_IMAGE_SMALL.NumberMinimum = New Decimal(New Integer() {10, 0, 0, 0}) Me.TXT_IMAGE_SMALL.Size = New System.Drawing.Size(278, 22) Me.TXT_IMAGE_SMALL.TabIndex = 1 diff --git a/SCrawler/Editors/GlobalSettingsForm.vb b/SCrawler/Editors/GlobalSettingsForm.vb index 0d8ca19..e0b2ae0 100644 --- a/SCrawler/Editors/GlobalSettingsForm.vb +++ b/SCrawler/Editors/GlobalSettingsForm.vb @@ -8,24 +8,23 @@ ' but WITHOUT ANY WARRANTY Imports PersonalUtilities.Forms Imports PersonalUtilities.Forms.Controls.Base -Imports PersonalUtilities.Forms.Toolbars Namespace Editors - Friend Class GlobalSettingsForm : Implements IOkCancelToolbar - Private ReadOnly MyDefs As DefaultFormOptions + Friend Class GlobalSettingsForm + Private WithEvents MyDefs As DefaultFormOptions Friend Sub New() InitializeComponent() - MyDefs = New DefaultFormOptions + MyDefs = New DefaultFormOptions(Me, Settings.Design) End Sub Private Sub GlobalSettingsForm_Load(sender As Object, e As EventArgs) Handles Me.Load Try With MyDefs - .MyViewInitialize(Me, Settings.Design, True) + .MyViewInitialize(True) .AddOkCancelToolbar() With Settings 'Basis TXT_GLOBAL_PATH.Text = .GlobalPath.Value - TXT_IMAGE_LARGE.Value = .MaxLargeImageHeigh.Value - TXT_IMAGE_SMALL.Value = .MaxSmallImageHeigh.Value + TXT_IMAGE_LARGE.Value = .MaxLargeImageHeight.Value + TXT_IMAGE_SMALL.Value = .MaxSmallImageHeight.Value TXT_COLLECTIONS_PATH.Text = .CollectionsPath TXT_MAX_JOBS_USERS.Value = .MaxUsersJobsCount.Value TXT_MAX_JOBS_CHANNELS.Value = .ChannelsMaxJobsCount.Value @@ -60,9 +59,9 @@ Namespace Editors TXT_DOWN_COMPLETE_SCRIPT.Text = .DownloadsCompleteCommand TXT_DOWN_COMPLETE_SCRIPT.Checked = .DownloadsCompleteCommand.Attribute 'Downloading: file names - CH_FILE_NAME_CHANGE.Checked = .FileReplaceNameByDate Or .FileAddDateToFileName Or .FileAddTimeToFileName - OPT_FILE_NAME_REPLACE.Checked = .FileReplaceNameByDate - OPT_FILE_NAME_ADD_DATE.Checked = Not .FileReplaceNameByDate + CH_FILE_NAME_CHANGE.Checked = Not .FileReplaceNameByDate.Value = FileNameReplaceMode.None + OPT_FILE_NAME_REPLACE.Checked = .FileReplaceNameByDate.Value = FileNameReplaceMode.Replace + OPT_FILE_NAME_ADD_DATE.Checked = .FileReplaceNameByDate.Value = FileNameReplaceMode.Add CH_FILE_DATE.Checked = .FileAddDateToFileName CH_FILE_TIME.Checked = .FileAddTimeToFileName OPT_FILE_DATE_START.Checked = Not .FileDateTimePositionEnd @@ -78,19 +77,19 @@ Namespace Editors CH_CHANNELS_USERS_TEMP.Checked = .ChannelsDefaultTemporary End With .MyFieldsChecker = New FieldsChecker - With DirectCast(.MyFieldsChecker, FieldsChecker) + With .MyFieldsCheckerE .AddControl(Of String)(TXT_GLOBAL_PATH, TXT_GLOBAL_PATH.CaptionText) .AddControl(Of String)(TXT_COLLECTIONS_PATH, TXT_COLLECTIONS_PATH.CaptionText) .EndLoaderOperations() End With - .EndLoaderOperations() ChangeFileNameChangersEnabling() + .EndLoaderOperations() End With Catch ex As Exception 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 If MyDefs.MyFieldsChecker.AllParamsOK Then With Settings Dim a As Func(Of String, Object, Integer) = @@ -124,8 +123,8 @@ Namespace Editors 'Basis .GlobalPath.Value = TXT_GLOBAL_PATH.Text - .MaxLargeImageHeigh.Value = CInt(TXT_IMAGE_LARGE.Value) - .MaxSmallImageHeigh.Value = CInt(TXT_IMAGE_SMALL.Value) + .MaxLargeImageHeight.Value = CInt(TXT_IMAGE_LARGE.Value) + .MaxSmallImageHeight.Value = CInt(TXT_IMAGE_SMALL.Value) .CollectionsPath.Value = TXT_COLLECTIONS_PATH.Text .MaxUsersJobsCount.Value = CInt(TXT_MAX_JOBS_USERS.Value) .ChannelsMaxJobsCount.Value = TXT_MAX_JOBS_CHANNELS.Value @@ -161,14 +160,14 @@ Namespace Editors .DownloadsCompleteCommand.Attribute.Value = TXT_DOWN_COMPLETE_SCRIPT.Checked 'Downloading: file names If CH_FILE_NAME_CHANGE.Checked Then - .FileReplaceNameByDate.Value = OPT_FILE_NAME_REPLACE.Checked + .FileReplaceNameByDate.Value = If(OPT_FILE_NAME_REPLACE.Checked, FileNameReplaceMode.Replace, FileNameReplaceMode.Add) .FileAddDateToFileName.Value = CH_FILE_DATE.Checked .FileAddTimeToFileName.Value = CH_FILE_TIME.Checked .FileDateTimePositionEnd.Value = OPT_FILE_DATE_END.Checked Else .FileAddDateToFileName.Value = False .FileAddTimeToFileName.Value = False - .FileReplaceNameByDate.Value = False + .FileReplaceNameByDate.Value = FileNameReplaceMode.None End If 'Channels .ChannelsImagesRows.Value = CInt(TXT_CHANNELS_ROWS.Value) @@ -184,19 +183,16 @@ Namespace Editors MyDefs.CloseForm() End If End Sub - Private Sub Cancel() Implements IOkCancelToolbar.Cancel - MyDefs.CloseForm(DialogResult.Cancel) - End Sub - Private Sub TXT_GLOBAL_PATH_ActionOnButtonClick(ByVal Sender As ActionButton) Handles TXT_GLOBAL_PATH.ActionOnButtonClick + Private Sub TXT_GLOBAL_PATH_ActionOnButtonClick(ByVal Sender As ActionButton, ByVal e As EventArgs) Handles TXT_GLOBAL_PATH.ActionOnButtonClick If Sender.DefaultButton = ActionButton.DefaultButtons.Open Then Dim f As SFile = SFile.SelectPath(Settings.GlobalPath.Value) If Not f.IsEmptyString Then TXT_GLOBAL_PATH.Text = f End If End Sub - Private Sub TXT_MAX_JOBS_USERS_ActionOnButtonClick(ByVal Sender As ActionButton) Handles TXT_MAX_JOBS_USERS.ActionOnButtonClick + Private Sub TXT_MAX_JOBS_USERS_ActionOnButtonClick(ByVal Sender As ActionButton, ByVal e As EventArgs) Handles TXT_MAX_JOBS_USERS.ActionOnButtonClick If Sender.DefaultButton = ActionButton.DefaultButtons.Refresh Then TXT_MAX_JOBS_USERS.Value = SettingsCLS.DefaultMaxDownloadingTasks End Sub - Private Sub TXT_MAX_JOBS_CHANNELS_ActionOnButtonClick(ByVal Sender As ActionButton) Handles TXT_MAX_JOBS_CHANNELS.ActionOnButtonClick + Private Sub TXT_MAX_JOBS_CHANNELS_ActionOnButtonClick(ByVal Sender As ActionButton, ByVal e As EventArgs) Handles TXT_MAX_JOBS_CHANNELS.ActionOnButtonClick If Sender.DefaultButton = ActionButton.DefaultButtons.Refresh Then TXT_MAX_JOBS_CHANNELS.Value = SettingsCLS.DefaultMaxDownloadingTasks End Sub Private Sub CH_FILE_NAME_CHANGE_CheckedChanged(sender As Object, e As EventArgs) Handles CH_FILE_NAME_CHANGE.CheckedChanged @@ -217,11 +213,12 @@ Namespace Editors Dim b As Boolean = CH_FILE_NAME_CHANGE.Checked OPT_FILE_NAME_REPLACE.Enabled = b OPT_FILE_NAME_ADD_DATE.Enabled = b + If Not OPT_FILE_NAME_REPLACE.Checked And Not OPT_FILE_NAME_ADD_DATE.Checked Then OPT_FILE_NAME_REPLACE.Checked = True CH_FILE_DATE.Enabled = b CH_FILE_TIME.Enabled = b ChangePositionControlsEnabling() End Sub - Private Sub TXT_SCRIPT_ActionOnButtonClick(ByVal Sender As ActionButton) Handles TXT_SCRIPT.ActionOnButtonClick + Private Sub TXT_SCRIPT_ActionOnButtonClick(ByVal Sender As ActionButton, ByVal e As EventArgs) Handles TXT_SCRIPT.ActionOnButtonClick SettingsCLS.ScriptTextBoxButtonClick(TXT_SCRIPT, Sender) End Sub Private Sub CH_COPY_CHANNEL_USER_IMAGE_CheckedChanged(sender As Object, e As EventArgs) Handles CH_COPY_CHANNEL_USER_IMAGE.CheckedChanged diff --git a/SCrawler/Editors/LabelsForm.Designer.vb b/SCrawler/Editors/LabelsForm.Designer.vb index bdda142..66e16e6 100644 --- a/SCrawler/Editors/LabelsForm.Designer.vb +++ b/SCrawler/Editors/LabelsForm.Designer.vb @@ -13,14 +13,15 @@ Partial Friend Class LabelsForm : Inherits System.Windows.Forms.Form Private components As System.ComponentModel.IContainer Private Sub InitializeComponent() + Dim CONTAINER_MAIN As System.Windows.Forms.ToolStripContainer Dim ActionButton1 As PersonalUtilities.Forms.Controls.Base.ActionButton = New PersonalUtilities.Forms.Controls.Base.ActionButton() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(LabelsForm)) Dim ActionButton2 As PersonalUtilities.Forms.Controls.Base.ActionButton = New PersonalUtilities.Forms.Controls.Base.ActionButton() Dim ActionButton3 As PersonalUtilities.Forms.Controls.Base.ActionButton = New PersonalUtilities.Forms.Controls.Base.ActionButton() - Me.CONTAINER_MAIN = New System.Windows.Forms.ToolStripContainer() Me.CMB_LABELS = New PersonalUtilities.Forms.Controls.ComboBoxExtended() - Me.CONTAINER_MAIN.ContentPanel.SuspendLayout() - Me.CONTAINER_MAIN.SuspendLayout() + CONTAINER_MAIN = New System.Windows.Forms.ToolStripContainer() + CONTAINER_MAIN.ContentPanel.SuspendLayout() + CONTAINER_MAIN.SuspendLayout() CType(Me.CMB_LABELS, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' @@ -29,16 +30,16 @@ Partial Friend Class LabelsForm : Inherits System.Windows.Forms.Form ' 'CONTAINER_MAIN.ContentPanel ' - Me.CONTAINER_MAIN.ContentPanel.Controls.Add(Me.CMB_LABELS) - Me.CONTAINER_MAIN.ContentPanel.Size = New System.Drawing.Size(374, 421) - Me.CONTAINER_MAIN.Dock = System.Windows.Forms.DockStyle.Fill - Me.CONTAINER_MAIN.LeftToolStripPanelVisible = False - Me.CONTAINER_MAIN.Location = New System.Drawing.Point(0, 0) - Me.CONTAINER_MAIN.Name = "CONTAINER_MAIN" - Me.CONTAINER_MAIN.RightToolStripPanelVisible = False - Me.CONTAINER_MAIN.Size = New System.Drawing.Size(374, 421) - Me.CONTAINER_MAIN.TabIndex = 0 - Me.CONTAINER_MAIN.TopToolStripPanelVisible = False + CONTAINER_MAIN.ContentPanel.Controls.Add(Me.CMB_LABELS) + CONTAINER_MAIN.ContentPanel.Size = New System.Drawing.Size(374, 421) + CONTAINER_MAIN.Dock = System.Windows.Forms.DockStyle.Fill + CONTAINER_MAIN.LeftToolStripPanelVisible = False + CONTAINER_MAIN.Location = New System.Drawing.Point(0, 0) + CONTAINER_MAIN.Name = "CONTAINER_MAIN" + CONTAINER_MAIN.RightToolStripPanelVisible = False + CONTAINER_MAIN.Size = New System.Drawing.Size(374, 421) + CONTAINER_MAIN.TabIndex = 0 + CONTAINER_MAIN.TopToolStripPanelVisible = False ' 'CMB_LABELS ' @@ -69,7 +70,7 @@ Partial Friend Class LabelsForm : Inherits System.Windows.Forms.Form Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(374, 421) - Me.Controls.Add(Me.CONTAINER_MAIN) + Me.Controls.Add(CONTAINER_MAIN) Me.KeyPreview = True Me.MinimizeBox = False Me.MinimumSize = New System.Drawing.Size(390, 460) @@ -77,14 +78,12 @@ Partial Friend Class LabelsForm : Inherits System.Windows.Forms.Form Me.ShowIcon = False Me.ShowInTaskbar = False Me.Text = "Labels" - Me.CONTAINER_MAIN.ContentPanel.ResumeLayout(False) - Me.CONTAINER_MAIN.ResumeLayout(False) - Me.CONTAINER_MAIN.PerformLayout() + CONTAINER_MAIN.ContentPanel.ResumeLayout(False) + CONTAINER_MAIN.ResumeLayout(False) + CONTAINER_MAIN.PerformLayout() CType(Me.CMB_LABELS, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) End Sub - - Private WithEvents CONTAINER_MAIN As ToolStripContainer Private WithEvents CMB_LABELS As PersonalUtilities.Forms.Controls.ComboBoxExtended End Class \ No newline at end of file diff --git a/SCrawler/Editors/LabelsForm.resx b/SCrawler/Editors/LabelsForm.resx index 6ab9463..e9adbe8 100644 --- a/SCrawler/Editors/LabelsForm.resx +++ b/SCrawler/Editors/LabelsForm.resx @@ -117,6 +117,9 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + False + diff --git a/SCrawler/Editors/LabelsForm.vb b/SCrawler/Editors/LabelsForm.vb index df84c07..ab1d616 100644 --- a/SCrawler/Editors/LabelsForm.vb +++ b/SCrawler/Editors/LabelsForm.vb @@ -7,12 +7,11 @@ ' This program is distributed in the hope that it will be useful, ' but WITHOUT ANY WARRANTY Imports PersonalUtilities.Forms -Imports PersonalUtilities.Forms.Toolbars Imports PersonalUtilities.Forms.Controls Imports PersonalUtilities.Forms.Controls.Base Imports PersonalUtilities.Functions.Messaging -Friend Class LabelsForm : Implements IOkCancelDeleteToolbar - Private ReadOnly MyDefs As DefaultFormOptions +Friend Class LabelsForm + Private WithEvents MyDefs As DefaultFormOptions Friend ReadOnly Property LabelsList As List(Of String) Private ReadOnly _Source As IEnumerable(Of String) = Nothing Private ReadOnly Property Source As IEnumerable(Of String) @@ -32,7 +31,7 @@ Friend Class LabelsForm : Implements IOkCancelDeleteToolbar InitializeComponent() LabelsList = New List(Of String) LabelsList.ListAddList(LabelsArr) - MyDefs = New DefaultFormOptions + MyDefs = New DefaultFormOptions(Me, Settings.Design) End Sub Friend Sub New(ByVal Current As IEnumerable(Of String), ByVal Source As IEnumerable(Of String)) Me.New(Current) @@ -41,8 +40,9 @@ Friend Class LabelsForm : Implements IOkCancelDeleteToolbar Private Sub LabelsForm_Load(sender As Object, e As EventArgs) Handles Me.Load Try With MyDefs - .MyViewInitialize(Me, Settings.Design) - .AddOkCancelToolbar(, WithDeleteButton) + .MyViewInitialize() + .AddOkCancelToolbar() + .MyOkCancel.BTT_DELETE.Visible = WithDeleteButton If Source.Count > 0 Then Dim items As New List(Of Integer) CMB_LABELS.BeginUpdate() @@ -66,7 +66,7 @@ Friend Class LabelsForm : Implements IOkCancelDeleteToolbar Private Sub LabelsForm_Disposed(sender As Object, e As EventArgs) Handles Me.Disposed LabelsList.Clear() End Sub - Private Sub OK() Implements IOkCancelToolbar.OK + Private Sub MyDefs_ButtonOkClick(ByVal Sender As Object, ByVal e As KeyHandleEventArgs) Handles MyDefs.ButtonOkClick Try If MultiUser Then Dim m As New MMessage("You are changing labels for more one user" & vbNewLine & "What do you want to do?", @@ -88,18 +88,15 @@ Friend Class LabelsForm : Implements IOkCancelDeleteToolbar ErrorsDescriber.Execute(EDP.LogMessageValue, ex, "Choosing labels") End Try End Sub - Private Sub Cancel() Implements IOkCancelToolbar.Cancel - MyDefs.CloseForm(DialogResult.Cancel) - End Sub - Private Sub Delete() Implements IOkCancelDeleteToolbar.Delete + Private Sub MyDefs_ButtonDeleteClickOC(ByVal Sender As Object, ByVal e As KeyHandleEventArgs) Handles MyDefs.ButtonDeleteClickOC LabelsList.Clear() MyDefs.CloseForm() End Sub - Private Sub CMB_LABELS_ActionOnButtonClick(ByVal Sender As ActionButton) Handles CMB_LABELS.ActionOnButtonClick - If Sender.DefaultButton = ActionButton.DefaultButtons.Add Then AddNewLabel() - End Sub - Private Sub CMB_LABELS_ActionOnButtonClearClick() Handles CMB_LABELS.ActionOnButtonClearClick - CMB_LABELS.Clear(ComboBoxExtended.ClearMode.CheckedIndexes) + Private Sub CMB_LABELS_ActionOnButtonClick(ByVal Sender As ActionButton, ByVal e As EventArgs) Handles CMB_LABELS.ActionOnButtonClick + Select Case Sender.DefaultButton + Case ActionButton.DefaultButtons.Add : AddNewLabel() + Case ActionButton.DefaultButtons.Clear : CMB_LABELS.Clear(ComboBoxExtended.ClearMode.CheckedIndexes) + End Select End Sub Private Sub AddNewLabel() Dim nl$ = InputBoxE("Enter new label name:", "New label") diff --git a/SCrawler/Editors/SiteDefaults.vb b/SCrawler/Editors/SiteDefaults.vb index cfa62dc..3e4d6d6 100644 --- a/SCrawler/Editors/SiteDefaults.vb +++ b/SCrawler/Editors/SiteDefaults.vb @@ -21,8 +21,6 @@ Namespace Editors Private Sub InitCheckBox(ByRef CH As CheckBox, ByVal Caption As String) CH = New CheckBox With {.Text = Caption, .Dock = DockStyle.Fill, .UseVisualStyleBackColor = True, .ThreeState = True, .CheckState = CheckState.Indeterminate} - AddHandler CH.CheckedChanged, AddressOf Checker_CheckedChanged - AddHandler CH.CheckStateChanged, AddressOf Checker_CheckedChanged End Sub Private Sub SiteDefaults_Disposed(sender As Object, e As EventArgs) Handles Me.Disposed CH_TEMP.Dispose() @@ -64,11 +62,6 @@ Namespace Editors Private Function ShouldSerializeBaseControlsPadding() As Boolean Return Not _BaseControlsPadding.Equals(New Padding(0)) End Function - - Public Property ChangesDetected As Boolean = False - Private Sub Checker_CheckedChanged(sender As Object, e As EventArgs) - ChangesDetected = True - End Sub Public Property MyTemporary As CheckState diff --git a/SCrawler/Editors/SiteEditorForm.Designer.vb b/SCrawler/Editors/SiteEditorForm.Designer.vb index 8f58969..2cc0ec4 100644 --- a/SCrawler/Editors/SiteEditorForm.Designer.vb +++ b/SCrawler/Editors/SiteEditorForm.Designer.vb @@ -22,20 +22,21 @@ Dim ActionButton4 As PersonalUtilities.Forms.Controls.Base.ActionButton = New PersonalUtilities.Forms.Controls.Base.ActionButton() Dim ActionButton5 As PersonalUtilities.Forms.Controls.Base.ActionButton = New PersonalUtilities.Forms.Controls.Base.ActionButton() Dim ActionButton6 As PersonalUtilities.Forms.Controls.Base.ActionButton = New PersonalUtilities.Forms.Controls.Base.ActionButton() + Dim CONTAINER_MAIN As System.Windows.Forms.ToolStripContainer Me.TP_MAIN = New System.Windows.Forms.TableLayoutPanel() Me.TXT_PATH = New PersonalUtilities.Forms.Controls.TextBoxExtended() Me.TXT_COOKIES = New PersonalUtilities.Forms.Controls.TextBoxExtended() Me.TP_SITE_PROPS = New SCrawler.Editors.SiteDefaults() Me.TXT_PATH_SAVED_POSTS = New PersonalUtilities.Forms.Controls.TextBoxExtended() Me.CH_GET_USER_MEDIA_ONLY = New System.Windows.Forms.CheckBox() - Me.CONTAINER_MAIN = New System.Windows.Forms.ToolStripContainer() Me.TT_MAIN = New System.Windows.Forms.ToolTip(Me.components) + CONTAINER_MAIN = New System.Windows.Forms.ToolStripContainer() Me.TP_MAIN.SuspendLayout() CType(Me.TXT_PATH, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TXT_COOKIES, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TXT_PATH_SAVED_POSTS, System.ComponentModel.ISupportInitialize).BeginInit() - Me.CONTAINER_MAIN.ContentPanel.SuspendLayout() - Me.CONTAINER_MAIN.SuspendLayout() + CONTAINER_MAIN.ContentPanel.SuspendLayout() + CONTAINER_MAIN.SuspendLayout() Me.SuspendLayout() ' 'TP_MAIN @@ -142,23 +143,23 @@ ' 'CONTAINER_MAIN.ContentPanel ' - Me.CONTAINER_MAIN.ContentPanel.Controls.Add(Me.TP_MAIN) - Me.CONTAINER_MAIN.ContentPanel.Size = New System.Drawing.Size(544, 219) - Me.CONTAINER_MAIN.Dock = System.Windows.Forms.DockStyle.Fill - Me.CONTAINER_MAIN.LeftToolStripPanelVisible = False - Me.CONTAINER_MAIN.Location = New System.Drawing.Point(0, 0) - Me.CONTAINER_MAIN.Name = "CONTAINER_MAIN" - Me.CONTAINER_MAIN.RightToolStripPanelVisible = False - Me.CONTAINER_MAIN.Size = New System.Drawing.Size(544, 219) - Me.CONTAINER_MAIN.TabIndex = 0 - Me.CONTAINER_MAIN.TopToolStripPanelVisible = False + CONTAINER_MAIN.ContentPanel.Controls.Add(Me.TP_MAIN) + CONTAINER_MAIN.ContentPanel.Size = New System.Drawing.Size(544, 219) + CONTAINER_MAIN.Dock = System.Windows.Forms.DockStyle.Fill + CONTAINER_MAIN.LeftToolStripPanelVisible = False + CONTAINER_MAIN.Location = New System.Drawing.Point(0, 0) + CONTAINER_MAIN.Name = "CONTAINER_MAIN" + CONTAINER_MAIN.RightToolStripPanelVisible = False + CONTAINER_MAIN.Size = New System.Drawing.Size(544, 219) + CONTAINER_MAIN.TabIndex = 0 + CONTAINER_MAIN.TopToolStripPanelVisible = False ' 'SiteEditorForm ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(544, 219) - Me.Controls.Add(Me.CONTAINER_MAIN) + Me.Controls.Add(CONTAINER_MAIN) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle Me.KeyPreview = True Me.MaximizeBox = False @@ -174,14 +175,12 @@ CType(Me.TXT_PATH, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TXT_COOKIES, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TXT_PATH_SAVED_POSTS, System.ComponentModel.ISupportInitialize).EndInit() - Me.CONTAINER_MAIN.ContentPanel.ResumeLayout(False) - Me.CONTAINER_MAIN.ResumeLayout(False) - Me.CONTAINER_MAIN.PerformLayout() + CONTAINER_MAIN.ContentPanel.ResumeLayout(False) + CONTAINER_MAIN.ResumeLayout(False) + CONTAINER_MAIN.PerformLayout() Me.ResumeLayout(False) End Sub - - Private WithEvents CONTAINER_MAIN As ToolStripContainer Private WithEvents TXT_PATH As PersonalUtilities.Forms.Controls.TextBoxExtended Private WithEvents TXT_COOKIES As PersonalUtilities.Forms.Controls.TextBoxExtended Private WithEvents TP_MAIN As TableLayoutPanel diff --git a/SCrawler/Editors/SiteEditorForm.resx b/SCrawler/Editors/SiteEditorForm.resx index 0f3ab90..817b831 100644 --- a/SCrawler/Editors/SiteEditorForm.resx +++ b/SCrawler/Editors/SiteEditorForm.resx @@ -222,6 +222,9 @@ AFuc5QFgn6ClHh5iOQVAKNixyucB8NY0vG9JOzzyhrdq5IRgAAAAAElFTkSuQmCC + + False + 17, 17 diff --git a/SCrawler/Editors/SiteEditorForm.vb b/SCrawler/Editors/SiteEditorForm.vb index 5831e66..25627f4 100644 --- a/SCrawler/Editors/SiteEditorForm.vb +++ b/SCrawler/Editors/SiteEditorForm.vb @@ -9,16 +9,15 @@ Imports PersonalUtilities.Forms Imports PersonalUtilities.Forms.Controls Imports PersonalUtilities.Forms.Controls.Base -Imports PersonalUtilities.Forms.Toolbars Imports PersonalUtilities.Tools.WEB Imports CookieControl = PersonalUtilities.Tools.WEB.CookieListForm.CookieControl Imports SCrawler.Plugin Imports SCrawler.Plugin.Hosts Namespace Editors - Friend Class SiteEditorForm : Implements IOkCancelToolbar + Friend Class SiteEditorForm Private ReadOnly LBL_AUTH As Label Private ReadOnly LBL_OTHER As Label - Private ReadOnly MyDefs As DefaultFormOptions + Private WithEvents MyDefs As DefaultFormOptions Private WithEvents SpecialButton As Button #Region "Providers" Private Class SavedPostsChecker : Implements IFieldsCheckerProvider @@ -35,14 +34,14 @@ Namespace Editors End If End Function Private Function GetFormat(ByVal FormatType As Type) As Object Implements IFormatProvider.GetFormat - Throw New NotImplementedException() + Throw New NotImplementedException("[GetFormat] is not available in the context of [SavedPostsChecker]") End Function End Class #End Region Private ReadOnly Property Host As SettingsHost Friend Sub New(ByVal h As SettingsHost) InitializeComponent() - MyDefs = New DefaultFormOptions + MyDefs = New DefaultFormOptions(Me, Settings.Design) Host = h LBL_AUTH = New Label With {.Text = "Authorization", .TextAlign = ContentAlignment.MiddleCenter, .Dock = DockStyle.Fill} LBL_OTHER = New Label With {.Text = "Other Parameters", .TextAlign = ContentAlignment.MiddleCenter, .Dock = DockStyle.Fill} @@ -50,7 +49,7 @@ Namespace Editors Private Sub SiteEditorForm_Load(sender As Object, e As EventArgs) Handles Me.Load Try With MyDefs - .MyViewInitialize(Me, Settings.Design, True) + .MyViewInitialize(True) .AddOkCancelToolbar() .MyFieldsChecker = New FieldsChecker @@ -68,7 +67,7 @@ Namespace Editors SiteDefaultsFunctions.SetChecker(TP_SITE_PROPS, Host) - With DirectCast(MyDefs.MyFieldsChecker, FieldsChecker) + With MyDefs.MyFieldsCheckerE .AddControl(Of String)(TXT_PATH, TXT_PATH.CaptionText, True, New SavedPostsChecker) .AddControl(Of String)(TXT_PATH_SAVED_POSTS, TXT_PATH_SAVED_POSTS.CaptionText, True, New SavedPostsChecker) End With @@ -115,10 +114,9 @@ Namespace Editors .CreateControl(TT_MAIN) AddTpControl(.Control, .ControlHeight) If .LeftOffset > offset Then offset = .LeftOffset - If Not .Options.AllowNull Or Not .ProviderFieldsChecker Is Nothing Then - DirectCast(MyDefs.MyFieldsChecker, FieldsChecker). - AddControl(.Control, .Options.ControlText, .Type, .Options.AllowNull, .ProviderFieldsChecker) - End If + If Not .Options.AllowNull Or Not .ProviderFieldsChecker Is Nothing Then _ + MyDefs.MyFieldsCheckerE.AddControl(.Control, .Options.ControlText, .Type, + .Options.AllowNull, .ProviderFieldsChecker) End If End With End If @@ -155,7 +153,7 @@ Namespace Editors LBL_AUTH.Dispose() LBL_OTHER.Dispose() End Sub - Private Sub OK() Implements IOkCancelToolbar.OK + Private Sub MyDefs_ButtonOkClick(ByVal Sender As Object, ByVal e As KeyHandleEventArgs) Handles MyDefs.ButtonOkClick If MyDefs.MyFieldsChecker.AllParamsOK Then Dim i%, ii% With Host @@ -198,13 +196,10 @@ Namespace Editors MyDefs.CloseForm() End If End Sub - Private Sub Cancel() Implements IOkCancelToolbar.Cancel - MyDefs.CloseForm(DialogResult.Cancel) - End Sub - Private Sub TXT_PATH_ActionOnButtonClick(ByVal Sender As ActionButton) Handles TXT_PATH.ActionOnButtonClick + Private Sub TXT_PATH_ActionOnButtonClick(ByVal Sender As ActionButton, ByVal e As EventArgs) Handles TXT_PATH.ActionOnButtonClick ChangePath(Sender, Host.Path(False), TXT_PATH) End Sub - Private Sub TXT_PATH_SAVED_POSTS_ActionOnButtonClick(Sender As ActionButton) Handles TXT_PATH_SAVED_POSTS.ActionOnButtonClick + Private Sub TXT_PATH_SAVED_POSTS_ActionOnButtonClick(ByVal Sender As ActionButton, ByVal e As EventArgs) Handles TXT_PATH_SAVED_POSTS.ActionOnButtonClick ChangePath(Sender, Host.SavedPostsPath(False), TXT_PATH_SAVED_POSTS) End Sub Private Sub ChangePath(ByVal Sender As ActionButton, ByVal PathValue As SFile, ByRef CNT As TextBoxExtended) @@ -213,27 +208,27 @@ Namespace Editors If Not f.IsEmptyString Then CNT.Text = f End If End Sub - Private Sub TXT_COOKIES_ActionOnButtonClick(ByVal Sender As ActionButton) Handles TXT_COOKIES.ActionOnButtonClick - If Sender.DefaultButton = ActionButton.DefaultButtons.Edit Then - If Not Host.Responser Is Nothing Then - Using f As New CookieListForm(Host.Responser) With { - .MyDesignXML = Settings.Design, - .DisableControls = CookieControl.AddFromInternal + CookieControl.AuthorizeProgram + CookieControl.OpenBrowser - } - f.ShowDialog() - End Using - SetCookieText() - End If - End If - End Sub - Private Sub TXT_COOKIES_ActionOnButtonClearClick() Handles TXT_COOKIES.ActionOnButtonClearClick - If Not Host.Responser Is Nothing Then - With Host.Responser - If Not .Cookies Is Nothing Then .Cookies.Dispose() - .Cookies = New CookieKeeper(.CookiesDomain) - End With - SetCookieText() - End If + Private Sub TXT_COOKIES_ActionOnButtonClick(ByVal Sender As ActionButton, ByVal e As EventArgs) Handles TXT_COOKIES.ActionOnButtonClick + Select Case Sender.DefaultButton + Case ActionButton.DefaultButtons.Edit + If Not Host.Responser Is Nothing Then + Using f As New CookieListForm(Host.Responser) With { + .MyDesignXML = Settings.Design, + .DisableControls = CookieControl.AddFromInternal + CookieControl.AuthorizeProgram + CookieControl.OpenBrowser + } + f.ShowDialog() + End Using + SetCookieText() + End If + Case ActionButton.DefaultButtons.Clear + If Not Host.Responser Is Nothing Then + With Host.Responser + If Not .Cookies Is Nothing Then .Cookies.Dispose() + .Cookies = New CookieKeeper(.CookiesDomain) + End With + SetCookieText() + End If + End Select End Sub Private Sub SetCookieText() If Not Host.Responser Is Nothing Then TXT_COOKIES.Text = $"{If(Host.Responser.Cookies?.Count, 0)} cookies" diff --git a/SCrawler/Editors/SiteSelectionForm.vb b/SCrawler/Editors/SiteSelectionForm.vb index 071d3dc..8a04a03 100644 --- a/SCrawler/Editors/SiteSelectionForm.vb +++ b/SCrawler/Editors/SiteSelectionForm.vb @@ -7,39 +7,42 @@ ' This program is distributed in the hope that it will be useful, ' but WITHOUT ANY WARRANTY Imports PersonalUtilities.Forms -Imports PersonalUtilities.Forms.Toolbars Imports PersonalUtilities.Forms.Controls.Base Namespace Editors - Friend Class SiteSelectionForm : Implements IOkCancelToolbar - Private ReadOnly MyDefs As DefaultFormOptions + Friend Class SiteSelectionForm + Private WithEvents MyDefs As DefaultFormOptions Friend ReadOnly Property SelectedSites As List(Of String) Friend Sub New(ByVal s As List(Of String)) InitializeComponent() SelectedSites.ListAddList(s) If SelectedSites Is Nothing Then SelectedSites = New List(Of String) - MyDefs = New DefaultFormOptions + MyDefs = New DefaultFormOptions(Me, Settings.Design) End Sub Private Sub SiteSelectionForm_Load(sender As Object, e As EventArgs) Handles Me.Load - With MyDefs - .MyViewInitialize(Me, Settings.Design, True) - .AddOkCancelToolbar() - CMB_SITES.BeginUpdate() - Dim sl As List(Of String) = ListAddList(Nothing, Settings.Plugins.Select(Function(p) p.Name)) - CMB_SITES.Items.AddRange(sl.Select(Function(s) New ListItem(s))) - Dim l As New List(Of Integer) - If SelectedSites.Count > 0 Then sl.ForEach(Sub(s) If SelectedSites.Contains(s) Then l.Add(sl.IndexOf(s))) - sl.Clear() - CMB_SITES.EndUpdate() - If l.Count > 0 Then CMB_SITES.ListCheckedIndexes = l : l.Clear() - .DelegateClosingChecker = False - .EndLoaderOperations() - .MyOkCancel.EnableOK = True - End With + Try + With MyDefs + .MyViewInitialize(True) + .AddOkCancelToolbar() + CMB_SITES.BeginUpdate() + Dim sl As List(Of String) = ListAddList(Nothing, Settings.Plugins.Select(Function(p) p.Name)) + CMB_SITES.Items.AddRange(sl.Select(Function(s) New ListItem(s))) + Dim l As New List(Of Integer) + If SelectedSites.Count > 0 Then sl.ForEach(Sub(s) If SelectedSites.Contains(s) Then l.Add(sl.IndexOf(s))) + sl.Clear() + CMB_SITES.EndUpdate() + If l.Count > 0 Then CMB_SITES.ListCheckedIndexes = l : l.Clear() + .DelegateClosingChecker = False + .EndLoaderOperations() + .MyOkCancel.EnableOK = True + End With + Catch ex As Exception + MyDefs.InvokeLoaderError(ex) + End Try End Sub Private Sub SiteSelectionForm_Disposed(sender As Object, e As EventArgs) Handles Me.Disposed SelectedSites.Clear() End Sub - Public Sub OK() Implements IOkCancelToolbar.OK + Private Sub MyDefs_ButtonOkClick(ByVal Sender As Object, ByVal e As KeyHandleEventArgs) Handles MyDefs.ButtonOkClick Try SelectedSites.ListAddList(CMB_SITES.Items.CheckedItems.Select(Function(i) CStr(i.Value(0))), LAP.ClearBeforeAdd) MyDefs.CloseForm() @@ -47,8 +50,5 @@ Namespace Editors ErrorsDescriber.Execute(EDP.LogMessageValue, ex) End Try End Sub - Public Sub Cancel() Implements IOkCancelToolbar.Cancel - MyDefs.CloseForm(DialogResult.Cancel) - End Sub End Class End Namespace \ No newline at end of file diff --git a/SCrawler/Editors/UserCreatorForm.Designer.vb b/SCrawler/Editors/UserCreatorForm.Designer.vb index 1aafee9..1f884f1 100644 --- a/SCrawler/Editors/UserCreatorForm.Designer.vb +++ b/SCrawler/Editors/UserCreatorForm.Designer.vb @@ -32,6 +32,7 @@ Dim ActionButton7 As PersonalUtilities.Forms.Controls.Base.ActionButton = New PersonalUtilities.Forms.Controls.Base.ActionButton() Dim ActionButton8 As PersonalUtilities.Forms.Controls.Base.ActionButton = New PersonalUtilities.Forms.Controls.Base.ActionButton() Dim TT_MAIN As System.Windows.Forms.ToolTip + Dim CONTAINER_MAIN As System.Windows.Forms.ToolStripContainer Me.TXT_USER = New PersonalUtilities.Forms.Controls.TextBoxExtended() Me.CH_IS_CHANNEL = New System.Windows.Forms.CheckBox() Me.CMB_SITE = New PersonalUtilities.Forms.Controls.ComboBoxExtended() @@ -50,13 +51,13 @@ Me.CH_DOWN_VIDEOS = New System.Windows.Forms.CheckBox() Me.TXT_SPEC_FOLDER = New PersonalUtilities.Forms.Controls.TextBoxExtended() Me.TXT_SCRIPT = New PersonalUtilities.Forms.Controls.TextBoxExtended() - Me.CONTAINER_MAIN = New System.Windows.Forms.ToolStripContainer() TP_MAIN = New System.Windows.Forms.TableLayoutPanel() TP_SITE = New System.Windows.Forms.TableLayoutPanel() TP_PARAMS = New System.Windows.Forms.TableLayoutPanel() TP_OTHER = New System.Windows.Forms.TableLayoutPanel() TP_DOWN_OPTIONS = New System.Windows.Forms.TableLayoutPanel() TT_MAIN = New System.Windows.Forms.ToolTip(Me.components) + CONTAINER_MAIN = New System.Windows.Forms.ToolStripContainer() TP_MAIN.SuspendLayout() CType(Me.TXT_USER, System.ComponentModel.ISupportInitialize).BeginInit() TP_SITE.SuspendLayout() @@ -70,8 +71,8 @@ TP_DOWN_OPTIONS.SuspendLayout() CType(Me.TXT_SPEC_FOLDER, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TXT_SCRIPT, System.ComponentModel.ISupportInitialize).BeginInit() - Me.CONTAINER_MAIN.ContentPanel.SuspendLayout() - Me.CONTAINER_MAIN.SuspendLayout() + CONTAINER_MAIN.ContentPanel.SuspendLayout() + CONTAINER_MAIN.SuspendLayout() Me.SuspendLayout() ' 'TP_MAIN @@ -125,7 +126,7 @@ TP_SITE.ColumnCount = 3 TP_SITE.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 79.0!)) TP_SITE.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100.0!)) - TP_SITE.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 98.0!)) + TP_SITE.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 100.0!)) TP_SITE.Controls.Add(Me.CH_IS_CHANNEL, 0, 0) TP_SITE.Controls.Add(Me.CMB_SITE, 1, 0) TP_SITE.Controls.Add(Me.BTT_OTHER_SETTINGS, 2, 0) @@ -168,17 +169,17 @@ Me.CMB_SITE.Location = New System.Drawing.Point(84, 3) Me.CMB_SITE.Margin = New System.Windows.Forms.Padding(3, 2, 3, 3) Me.CMB_SITE.Name = "CMB_SITE" - Me.CMB_SITE.Size = New System.Drawing.Size(265, 22) + Me.CMB_SITE.Size = New System.Drawing.Size(263, 22) Me.CMB_SITE.TabIndex = 1 Me.CMB_SITE.TextBoxBorderStyle = System.Windows.Forms.BorderStyle.FixedSingle ' 'BTT_OTHER_SETTINGS ' Me.BTT_OTHER_SETTINGS.Dock = System.Windows.Forms.DockStyle.Fill - Me.BTT_OTHER_SETTINGS.Location = New System.Drawing.Point(354, 2) + Me.BTT_OTHER_SETTINGS.Location = New System.Drawing.Point(352, 2) Me.BTT_OTHER_SETTINGS.Margin = New System.Windows.Forms.Padding(1) Me.BTT_OTHER_SETTINGS.Name = "BTT_OTHER_SETTINGS" - Me.BTT_OTHER_SETTINGS.Size = New System.Drawing.Size(96, 24) + Me.BTT_OTHER_SETTINGS.Size = New System.Drawing.Size(98, 24) Me.BTT_OTHER_SETTINGS.TabIndex = 2 Me.BTT_OTHER_SETTINGS.Text = "Options (F2)" TT_MAIN.SetToolTip(Me.BTT_OTHER_SETTINGS, "Other settings") @@ -438,23 +439,23 @@ ' 'CONTAINER_MAIN.ContentPanel ' - Me.CONTAINER_MAIN.ContentPanel.Controls.Add(TP_MAIN) - Me.CONTAINER_MAIN.ContentPanel.Size = New System.Drawing.Size(454, 461) - Me.CONTAINER_MAIN.Dock = System.Windows.Forms.DockStyle.Fill - Me.CONTAINER_MAIN.LeftToolStripPanelVisible = False - Me.CONTAINER_MAIN.Location = New System.Drawing.Point(0, 0) - Me.CONTAINER_MAIN.Name = "CONTAINER_MAIN" - Me.CONTAINER_MAIN.RightToolStripPanelVisible = False - Me.CONTAINER_MAIN.Size = New System.Drawing.Size(454, 461) - Me.CONTAINER_MAIN.TabIndex = 0 - Me.CONTAINER_MAIN.TopToolStripPanelVisible = False + CONTAINER_MAIN.ContentPanel.Controls.Add(TP_MAIN) + CONTAINER_MAIN.ContentPanel.Size = New System.Drawing.Size(454, 461) + CONTAINER_MAIN.Dock = System.Windows.Forms.DockStyle.Fill + CONTAINER_MAIN.LeftToolStripPanelVisible = False + CONTAINER_MAIN.Location = New System.Drawing.Point(0, 0) + CONTAINER_MAIN.Name = "CONTAINER_MAIN" + CONTAINER_MAIN.RightToolStripPanelVisible = False + CONTAINER_MAIN.Size = New System.Drawing.Size(454, 461) + CONTAINER_MAIN.TabIndex = 0 + CONTAINER_MAIN.TopToolStripPanelVisible = False ' 'UserCreatorForm ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(454, 461) - Me.Controls.Add(Me.CONTAINER_MAIN) + Me.Controls.Add(CONTAINER_MAIN) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) Me.KeyPreview = True @@ -484,14 +485,12 @@ TP_DOWN_OPTIONS.PerformLayout() CType(Me.TXT_SPEC_FOLDER, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TXT_SCRIPT, System.ComponentModel.ISupportInitialize).EndInit() - Me.CONTAINER_MAIN.ContentPanel.ResumeLayout(False) - Me.CONTAINER_MAIN.ResumeLayout(False) - Me.CONTAINER_MAIN.PerformLayout() + CONTAINER_MAIN.ContentPanel.ResumeLayout(False) + CONTAINER_MAIN.ResumeLayout(False) + CONTAINER_MAIN.PerformLayout() Me.ResumeLayout(False) End Sub - - Private WithEvents CONTAINER_MAIN As ToolStripContainer Private WithEvents TXT_USER As PersonalUtilities.Forms.Controls.TextBoxExtended Private WithEvents CH_TEMP As CheckBox Private WithEvents CH_FAV As CheckBox diff --git a/SCrawler/Editors/UserCreatorForm.resx b/SCrawler/Editors/UserCreatorForm.resx index 66a09fe..4c77853 100644 --- a/SCrawler/Editors/UserCreatorForm.resx +++ b/SCrawler/Editors/UserCreatorForm.resx @@ -294,6 +294,9 @@ AFuc5QFgn6ClHh5iOQVAKNixyucB8NY0vG9JOzzyhrdq5IRgAAAAAElFTkSuQmCC + + False + AAABAAkAMDAQAAAAAABoBgAAlgAAACAgEAAAAAAA6AIAAP4GAAAQEBAAAAAAACgBAADmCQAAMDAAAAEA diff --git a/SCrawler/Editors/UserCreatorForm.vb b/SCrawler/Editors/UserCreatorForm.vb index 467564c..4a418e0 100644 --- a/SCrawler/Editors/UserCreatorForm.vb +++ b/SCrawler/Editors/UserCreatorForm.vb @@ -9,15 +9,14 @@ Imports PersonalUtilities.Forms Imports PersonalUtilities.Forms.Controls Imports PersonalUtilities.Forms.Controls.Base -Imports PersonalUtilities.Forms.Toolbars Imports PersonalUtilities.Functions.RegularExpressions Imports SCrawler.API.Base Imports SCrawler.Plugin Imports SCrawler.Plugin.Hosts Imports ADB = PersonalUtilities.Forms.Controls.Base.ActionButton.DefaultButtons Namespace Editors - Friend Class UserCreatorForm : Implements IOkCancelToolbar - Private ReadOnly MyDef As DefaultFormOptions + Friend Class UserCreatorForm + Private WithEvents MyDef As DefaultFormOptions Friend Property User As UserInfo Private Property UserInstance As IUserData #Region "User options" @@ -100,7 +99,7 @@ Namespace Editors Friend Sub New() InitializeComponent() UserLabels = New List(Of String) - MyDef = New DefaultFormOptions + MyDef = New DefaultFormOptions(Me, Settings.Design) End Sub ''' Edit exist user Friend Sub New(ByVal _Instance As IUserData) @@ -115,7 +114,7 @@ Namespace Editors Private Sub UserCreatorForm_Load(sender As Object, e As EventArgs) Handles Me.Load Try With MyDef - .MyViewInitialize(Me, Settings.Design, True) + .MyViewInitialize(True) .AddOkCancelToolbar() CH_AUTO_DETECT_SITE.Enabled = False With CMB_SITE @@ -168,7 +167,7 @@ Namespace Editors End If End If .MyFieldsChecker = New FieldsChecker - DirectCast(.MyFieldsChecker, FieldsChecker).AddControl(Of String)(TXT_USER, TXT_USER.CaptionText) + .MyFieldsCheckerE.AddControl(Of String)(TXT_USER, TXT_USER.CaptionText) .MyFieldsChecker.EndLoaderOperations() .EndLoaderOperations() End With @@ -190,7 +189,7 @@ Namespace Editors End Sub #End Region #Region "Ok, Cancel" - Private Sub OK() Implements IOkCancelToolbar.OK + Private Sub MyDef_ButtonOkClick(ByVal Sender As Object, ByVal e As KeyHandleEventArgs) Handles MyDef.ButtonOkClick If Not CH_ADD_BY_LIST.Checked Then If MyDef.MyFieldsChecker.AllParamsOK Then Dim s As SettingsHost = GetSiteByCheckers() @@ -250,13 +249,13 @@ Namespace Editors CloseForm: MyDef.CloseForm() End Sub - Private Sub Cancel() Implements IOkCancelToolbar.Cancel + Private Sub MyDef_ButtonCancelClick(ByVal Sender As Object, ByVal e As KeyHandleEventArgs) Handles MyDef.ButtonCancelClick MyDef.CloseForm(IIf(StartIndex >= 0, DialogResult.OK, DialogResult.Cancel)) End Sub #End Region #Region "Controls handlers" Private _TextChangeInvoked As Boolean = False - Private Sub TXT_USER_ActionOnTextChange() Handles TXT_USER.ActionOnTextChange + Private Sub TXT_USER_ActionOnTextChanged(ByVal Sender As Object, ByVal e As EventArgs) Handles TXT_USER.ActionOnTextChanged Try If Not _TextChangeInvoked Then _TextChangeInvoked = True @@ -280,10 +279,10 @@ CloseForm: End If _TextChangeInvoked = False End If - Catch ex As Exception + Catch End Try End Sub - Private Sub CMB_SITE_ActionSelectedItemChanged(ByVal _Item As ListViewItem) Handles CMB_SITE.ActionSelectedItemChanged + Private Sub CMB_SITE_ActionSelectedItemChanged(ByVal Item As ListViewItem) Handles CMB_SITE.ActionSelectedItemChanged CH_IS_CHANNEL.Checked = False MyExchangeOptions = Nothing SetParamsBySite() @@ -296,8 +295,8 @@ CloseForm: MyDef.MyOkCancel.EnableOK = True End If End Sub - Private Sub TXT_SPEC_FOLDER_ActionOnButtonClick(ByVal Sender As ActionButton) Handles TXT_SPEC_FOLDER.ActionOnButtonClick - If Sender.DefaultButton = ActionButton.DefaultButtons.Open Then + Private Sub TXT_SPEC_FOLDER_ActionOnButtonClick(ByVal Sender As ActionButton, ByVal e As EventArgs) Handles TXT_SPEC_FOLDER.ActionOnButtonClick + If Sender.DefaultButton = ADB.Open Then Dim f As SFile = Nothing If Not TXT_SPEC_FOLDER.Text.IsEmptyString Then f = $"{TXT_SPEC_FOLDER.Text}\" f = SFile.SelectPath(f, True) @@ -333,13 +332,13 @@ CloseForm: BTT_OTHER_SETTINGS.Enabled = True End If End Sub - Private Sub TXT_LABELS_ActionOnButtonClick(ByVal Sender As ActionButton) Handles TXT_LABELS.ActionOnButtonClick + Private Sub TXT_LABELS_ActionOnButtonClick(ByVal Sender As ActionButton, ByVal e As EventArgs) Handles TXT_LABELS.ActionOnButtonClick Select Case Sender.DefaultButton Case ADB.Open : ChangeLabels() Case ADB.Clear : UserLabels.Clear() End Select End Sub - Private Sub TXT_SCRIPT_ActionOnButtonClick(ByVal Sender As ActionButton) Handles TXT_SCRIPT.ActionOnButtonClick + Private Sub TXT_SCRIPT_ActionOnButtonClick(ByVal Sender As ActionButton, ByVal e As EventArgs) Handles TXT_SCRIPT.ActionOnButtonClick SettingsCLS.ScriptTextBoxButtonClick(TXT_SCRIPT, Sender) End Sub #End Region @@ -449,7 +448,7 @@ CloseForm: End If Return False Catch ex As Exception - Return ErrorsDescriber.Execute(EDP.LogMessageValue, ex, "Error on adding users by list", False) + Return ErrorsDescriber.Execute(EDP.LogMessageValue, ex, "Error when adding users by list", False) End Try End Function Private Function GetSiteByText(ByRef TXT As String) As ExchangeOptions diff --git a/SCrawler/FDatePickerForm.vb b/SCrawler/FDatePickerForm.vb index cc8177c..e012fc7 100644 --- a/SCrawler/FDatePickerForm.vb +++ b/SCrawler/FDatePickerForm.vb @@ -7,9 +7,8 @@ ' This program is distributed in the hope that it will be useful, ' but WITHOUT ANY WARRANTY Imports PersonalUtilities.Forms -Imports PersonalUtilities.Forms.Toolbars -Friend Class FDatePickerForm : Implements IOkCancelDeleteToolbar - Private MyDefs As DefaultFormOptions +Friend Class FDatePickerForm + Private ReadOnly MyDefs As DefaultFormOptions Friend ReadOnly Property SelectedDate As Date? Get If DT.Checked Then Return DT.Value.Date Else Return Nothing @@ -19,12 +18,12 @@ Friend Class FDatePickerForm : Implements IOkCancelDeleteToolbar Friend Sub New(ByVal d As Date?) InitializeComponent() _InitialValue = d + MyDefs = New DefaultFormOptions(Me, Settings.Design) End Sub Private Sub FDatePickerForm_Load(sender As Object, e As EventArgs) Handles Me.Load - MyDefs = New DefaultFormOptions With MyDefs - .MyViewInitialize(Me, Settings.Design, True) - .AddOkCancelToolbar() + .MyViewInitialize(True) + .AddOkCancelToolbar(True) If _InitialValue.HasValue Then DT.Checked = True DT.Value = _InitialValue.Value.Date @@ -36,13 +35,4 @@ Friend Class FDatePickerForm : Implements IOkCancelDeleteToolbar MyDefs.MyOkCancel.EnableOK = True End With End Sub - Private Sub OK() Implements IOkCancelToolbar.OK - MyDefs.CloseForm() - End Sub - Private Sub Cancel() Implements IOkCancelToolbar.Cancel - MyDefs.CloseForm(DialogResult.Cancel) - End Sub - Private Sub Delete() Implements IOkCancelDeleteToolbar.Delete - MyDefs.CloseForm(DialogResult.Abort) - End Sub End Class \ No newline at end of file diff --git a/SCrawler/LabelsKeeper.vb b/SCrawler/LabelsKeeper.vb index a2072cc..a546662 100644 --- a/SCrawler/LabelsKeeper.vb +++ b/SCrawler/LabelsKeeper.vb @@ -101,7 +101,7 @@ Friend Class LabelsKeeper : Implements ICollection(Of String), IMyEnumerator(Of End Function Private ReadOnly Property IsReadOnly As Boolean = False Implements ICollection(Of String).IsReadOnly Private Sub CopyTo(ByVal _Array() As String, ByVal ArrayIndex As Integer) Implements ICollection(Of String).CopyTo - Throw New NotImplementedException() + LabelsList.CopyTo(_Array, ArrayIndex) End Sub #Region "IEnumerable Support" Private Function GetEnumerator() As IEnumerator(Of String) Implements IEnumerable(Of String).GetEnumerator diff --git a/SCrawler/ListImagesLoader.vb b/SCrawler/ListImagesLoader.vb index c8ec3a6..42181ce 100644 --- a/SCrawler/ListImagesLoader.vb +++ b/SCrawler/ListImagesLoader.vb @@ -47,8 +47,8 @@ Friend Class ListImagesLoader If Settings.ViewModeIsPicture Then .LargeImageList.ColorDepth = ColorDepth.Depth32Bit .SmallImageList.ColorDepth = ColorDepth.Depth32Bit - .LargeImageList.ImageSize = New Size(DivideWithZeroChecking(Settings.MaxLargeImageHeigh.Value, 100) * 75, Settings.MaxLargeImageHeigh.Value) - .SmallImageList.ImageSize = New Size(DivideWithZeroChecking(Settings.MaxSmallImageHeigh.Value, 100) * 75, Settings.MaxSmallImageHeigh.Value) + .LargeImageList.ImageSize = New Size(DivideWithZeroChecking(Settings.MaxLargeImageHeight.Value, 100) * 75, Settings.MaxLargeImageHeight.Value) + .SmallImageList.ImageSize = New Size(DivideWithZeroChecking(Settings.MaxSmallImageHeight.Value, 100) * 75, Settings.MaxSmallImageHeight.Value) End If End With End Sub @@ -148,11 +148,11 @@ Friend Class ListImagesLoader Friend Shared Function ApplyLVIColor(ByVal User As IUserData, ByVal LVI As ListViewItem, ByVal IsInit As Boolean) As ListViewItem With LVI If Not User.Exists Then - .BackColor = ColorBttDeleteBack - .ForeColor = ColorBttDeleteFore + .BackColor = MyColor.DeleteBack + .ForeColor = MyColor.DeleteFore ElseIf User.Suspended Then - .BackColor = ColorBttEditBack - .ForeColor = ColorBttEditFore + .BackColor = MyColor.EditBack + .ForeColor = MyColor.EditFore ElseIf CheckUserCollection(User) Then .BackColor = Color.LightSkyBlue .ForeColor = Color.MidnightBlue diff --git a/SCrawler/MainFrame.Designer.vb b/SCrawler/MainFrame.Designer.vb index b8db9c4..bfb44f1 100644 --- a/SCrawler/MainFrame.Designer.vb +++ b/SCrawler/MainFrame.Designer.vb @@ -50,6 +50,7 @@ Partial Public Class MainFrame : Inherits System.Windows.Forms.Form Me.BTT_DOWN_SITE_FULL = New System.Windows.Forms.ToolStripMenuItem() Me.BTT_ADD_NEW_GROUP = New System.Windows.Forms.ToolStripMenuItem() Me.BTT_DOWN_AUTOMATION = New System.Windows.Forms.ToolStripMenuItem() + Me.BTT_DOWN_AUTOMATION_PAUSE = New System.Windows.Forms.ToolStripMenuItem() Me.BTT_DOWN_VIDEO = New System.Windows.Forms.ToolStripButton() Me.BTT_DOWN_STOP = New System.Windows.Forms.ToolStripButton() Me.MENU_VIEW = New System.Windows.Forms.ToolStripDropDownButton() @@ -104,7 +105,6 @@ Partial Public Class MainFrame : Inherits System.Windows.Forms.Form 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() - Me.BTT_DOWN_AUTOMATION_PAUSE = New System.Windows.Forms.ToolStripMenuItem() SEP_1 = New System.Windows.Forms.ToolStripSeparator() SEP_2 = New System.Windows.Forms.ToolStripSeparator() CONTEXT_SEP_1 = New System.Windows.Forms.ToolStripSeparator() @@ -372,6 +372,13 @@ Partial Public Class MainFrame : Inherits System.Windows.Forms.Form Me.BTT_DOWN_AUTOMATION.Size = New System.Drawing.Size(231, 22) Me.BTT_DOWN_AUTOMATION.Text = "Automation" ' + 'BTT_DOWN_AUTOMATION_PAUSE + ' + Me.BTT_DOWN_AUTOMATION_PAUSE.Image = Global.SCrawler.My.Resources.Resources.Pause_Blue_16 + Me.BTT_DOWN_AUTOMATION_PAUSE.Name = "BTT_DOWN_AUTOMATION_PAUSE" + Me.BTT_DOWN_AUTOMATION_PAUSE.Size = New System.Drawing.Size(231, 22) + Me.BTT_DOWN_AUTOMATION_PAUSE.Text = "Pause automation" + ' 'BTT_DOWN_VIDEO ' Me.BTT_DOWN_VIDEO.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text @@ -547,7 +554,7 @@ Partial Public Class MainFrame : Inherits System.Windows.Forms.Form Me.BTT_DONATE.Name = "BTT_DONATE" Me.BTT_DONATE.Size = New System.Drawing.Size(23, 20) Me.BTT_DONATE.Text = "Donate" - Me.BTT_DONATE.ToolTipText = "Donate" + Me.BTT_DONATE.ToolTipText = "Support" ' 'Toolbar_BOTTOM ' @@ -766,13 +773,6 @@ Partial Public Class MainFrame : Inherits System.Windows.Forms.Form Me.BTT_TRAY_CLOSE_NO_SCRIPT.ToolTipText = "Close the program without executing the script" Me.BTT_TRAY_CLOSE_NO_SCRIPT.Visible = False ' - 'BTT_DOWN_AUTOMATION_PAUSE - ' - Me.BTT_DOWN_AUTOMATION_PAUSE.Image = Global.SCrawler.My.Resources.Resources.Pause_Blue_16 - Me.BTT_DOWN_AUTOMATION_PAUSE.Name = "BTT_DOWN_AUTOMATION_PAUSE" - Me.BTT_DOWN_AUTOMATION_PAUSE.Size = New System.Drawing.Size(231, 22) - Me.BTT_DOWN_AUTOMATION_PAUSE.Text = "Pause automation" - ' 'MainFrame ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) diff --git a/SCrawler/MainFrame.vb b/SCrawler/MainFrame.vb index 4e3683d..bc56a72 100644 --- a/SCrawler/MainFrame.vb +++ b/SCrawler/MainFrame.vb @@ -138,7 +138,7 @@ EndFunction: Downloader.Dispose() MyProgressForm.Dispose() InfoForm.Dispose() - MainFrameObj.CLearNotifications() + MainFrameObj.ClearNotifications() If Not MyChannels Is Nothing Then MyChannels.Dispose() If Not VideoDownloader Is Nothing Then VideoDownloader.Dispose() If Not MySavedPosts Is Nothing Then MySavedPosts.Dispose() @@ -206,7 +206,7 @@ CloseResume: Case Keys.F2 : DownloadVideoByURL() Case Keys.F3 : EditSelectedUser() Case Keys.F5 : BTT_DOWN_SELECTED.PerformClick() - Case Keys.F6 : If Settings.ShowingMode.Value = ShowingModes.All Then BTT_DOWN_ALL.PerformClick() + Case Keys.F6 : BTT_DOWN_ALL.PerformClick() Case Else : b = NumGroup(e) End Select If b Then e.Handled = True @@ -262,13 +262,13 @@ CloseResume: #Region "Settings" Private Sub BTT_SETTINGS_Click(sender As Object, e As EventArgs) Handles BTT_SETTINGS.Click With Settings - Dim mhl% = .MaxLargeImageHeigh.Value - Dim mhs% = .MaxSmallImageHeigh.Value + Dim mhl% = .MaxLargeImageHeight.Value + Dim mhs% = .MaxSmallImageHeight.Value Dim sg As Boolean = .ShowGroups Using f As New GlobalSettingsForm f.ShowDialog() If f.DialogResult = DialogResult.OK Then - If ((Not .MaxLargeImageHeigh = mhl Or Not .MaxSmallImageHeigh = mhs) And .ViewModeIsPicture) Or + If ((Not .MaxLargeImageHeight = mhl Or Not .MaxSmallImageHeight = mhs) And .ViewModeIsPicture) Or (Not sg = Settings.ShowGroups And .UseGrouping) Then RefillList() TrayIcon.Visible = .CloseToTray LIST_PROFILES.ShowGroups = .UseGrouping @@ -565,7 +565,6 @@ CloseResume: .ShowingMode.Value = m End If End With - BTT_DOWN_ALL.Enabled = m = ShowingModes.All End Sub Private Sub SetExcludedButtonChecker() BTT_SHOW_EXCLUDED_LABELS.Checked = Settings.Labels.Excluded.Count > 0 @@ -696,7 +695,7 @@ CloseResume: End If End Using Else - MsgBoxE("No one user does not detected", vbExclamation) + MsgBoxE("No user found", vbExclamation) End If Catch ex As Exception ErrorsDescriber.Execute(EDP.ShowAllMsg, ex, "[ChangeUserGroups]") @@ -747,7 +746,7 @@ CloseResume: End Sub Private Sub BTT_CONTEXT_ADD_TO_COL_Click(sender As Object, e As EventArgs) Handles BTT_CONTEXT_ADD_TO_COL.Click If Settings.CollectionsPath.Value.IsEmptyString Then - MsgBoxE("Collection path does not set", MsgBoxStyle.Exclamation) + MsgBoxE("Collection path not specified", MsgBoxStyle.Exclamation) Else Dim user As IUserData = GetSelectedUser() If Not user Is Nothing Then @@ -979,7 +978,7 @@ CloseResume: On Error Resume Next If user.IsCollection Then If USER_CONTEXT.Visible Then USER_CONTEXT.Hide() - MsgBoxE($"This is collection!{vbNewLine}Edit collections does not allowed!", vbExclamation) + MsgBoxE($"This is collection!{vbNewLine}Collection editing not allowed!", vbExclamation) Else Using f As New UserCreatorForm(user) f.ShowDialog() diff --git a/SCrawler/MainFrameObjects.vb b/SCrawler/MainFrameObjects.vb index 96e7d26..3ea0ece 100644 --- a/SCrawler/MainFrameObjects.vb +++ b/SCrawler/MainFrameObjects.vb @@ -27,14 +27,14 @@ Friend Class MainFrameObjects Else RemoveHandler User.UserUpdated, AddressOf MF.User_OnUserUpdated End If - Catch ex As Exception + Catch End Try End Sub Friend Sub CollectionHandler(ByVal [Collection] As UserDataBind) Try AddHandler Collection.OnCollectionSelfRemoved, AddressOf MF.CollectionRemoved AddHandler Collection.OnUserRemoved, AddressOf MF.UserRemovedFromCollection - Catch ex As Exception + Catch End Try End Sub Friend Sub Focus(Optional ByVal Show As Boolean = False) @@ -54,7 +54,7 @@ Friend Class MainFrameObjects Friend Overloads Sub ShowNotification(ByVal Message As String, ByVal Title As String, ByVal Icon As ToolTipIcon) MF.TrayIcon.ShowBalloonTip(2000, Title, Message, Icon) End Sub - Friend Sub CLearNotifications() + Friend Sub ClearNotifications() Notificator.Clear() End Sub Private Sub Notificator_OnClicked(ByVal Key As String) Handles Notificator.OnClicked diff --git a/SCrawler/MainMod.vb b/SCrawler/MainMod.vb index e7d117d..7d49cf1 100644 --- a/SCrawler/MainMod.vb +++ b/SCrawler/MainMod.vb @@ -6,7 +6,6 @@ ' ' This program is distributed in the hope that it will be useful, ' but WITHOUT ANY WARRANTY -Imports PersonalUtilities.Functions.XML Imports PersonalUtilities.Functions.XML.Base Imports PersonalUtilities.Functions.RegularExpressions Imports PersonalUtilities.Tools @@ -16,7 +15,6 @@ Imports SCrawler.API Imports SCrawler.API.Base Imports SCrawler.Plugin.Hosts Imports SCrawler.DownloadObjects -Imports DownOptions = SCrawler.Plugin.ISiteSettings.Download Friend Module MainMod Friend Settings As SettingsCLS Friend Const SettingsFolderName As String = "Settings" @@ -85,6 +83,11 @@ Friend Module MainMod Deleted = 10000 Suspended = 12000 End Enum + Friend Enum FileNameReplaceMode As Integer + None = 0 + Replace = 1 + Add = 2 + End Enum Friend Downloader As TDownloader Friend InfoForm As DownloadedInfoForm Friend VideoDownloader As VideosDownloaderForm @@ -133,138 +136,6 @@ Friend Module MainMod Return $"{If(Host?.Name, String.Empty)}{Opt}" End If End Function - Friend Structure UserInfo : Implements IComparable(Of UserInfo), IEquatable(Of UserInfo), ICloneable, IEContainerProvider - Friend Const Name_Site As String = "Site" - Friend Const Name_Plugin As String = "Plugin" - Friend Const Name_Collection As String = "Collection" - Friend Const Name_Merged As String = "Merged" - Friend Const Name_IsChannel As String = "IsChannel" - Friend Const Name_SpecialPath As String = "SpecialPath" - Friend Name As String - Friend Site As String - Friend Plugin As String - Friend File As SFile - Friend SpecialPath As SFile - Friend Merged As Boolean - Friend IncludedInCollection As Boolean - Friend CollectionName As String - Friend IsChannel As Boolean - Friend [Protected] As Boolean - Friend ReadOnly Property DownloadOption As DownOptions - Get - If IsChannel Then - Return DownOptions.Channel - Else - Return DownOptions.Main - End If - End Get - End Property - Friend Sub New(ByVal _Name As String, ByVal Host As SettingsHost, Optional ByVal Collection As String = Nothing, - Optional ByVal _Merged As Boolean = False, Optional ByVal _SpecialPath As SFile = Nothing) - Name = _Name - Site = Host.Name - Plugin = Host.Key - IncludedInCollection = Not Collection.IsEmptyString - CollectionName = Collection - Merged = _Merged - SpecialPath = _SpecialPath - UpdateUserFile() - End Sub - Private Sub New(ByVal x As EContainer) - Name = x.Value - Site = x.Attribute(Name_Site).Value - Plugin = x.Attribute(Name_Plugin).Value - CollectionName = x.Attribute(Name_Collection).Value - IncludedInCollection = Not CollectionName.IsEmptyString - Merged = x.Attribute(Name_Merged).Value.FromXML(Of Boolean)(False) - SpecialPath = SFile.GetPath(x.Attribute(Name_SpecialPath).Value) - IsChannel = x.Attribute(Name_IsChannel).Value.FromXML(Of Boolean)(False) - 'UpdateUserFile() - End Sub - Friend Sub New(ByVal c As Reddit.Channel) - Name = c.Name - Site = Reddit.RedditSite - Plugin = Reddit.RedditSiteKey - File = c.File - IsChannel = True - End Sub - Public Shared Widening Operator CType(ByVal x As EContainer) As UserInfo - Return New UserInfo(x) - End Operator - Public Shared Widening Operator CType(ByVal u As UserInfo) As String - Return u.Name - End Operator - Public Shared Operator =(ByVal x As UserInfo, ByVal y As UserInfo) - Return x.Equals(y) - End Operator - Public Shared Operator <>(ByVal x As UserInfo, ByVal y As UserInfo) - Return Not x.Equals(y) - End Operator - Public Overrides Function ToString() As String - Return Name - End Function - Friend Sub UpdateUserFile() - File = New SFile With { - .Separator = "\", - .Path = GetFilePathByParams(), - .Extension = "xml", - .Name = $"{UserDataBase.UserFileAppender}_{Site}_{Name}" - } - End Sub - Private Function GetFilePathByParams() As String - If [Protected] Then Return String.Empty - If Not SpecialPath.IsEmptyString Then - Return $"{SpecialPath.PathWithSeparator}{SettingsFolderName}" - ElseIf Merged And IncludedInCollection Then - Return $"{Settings.CollectionsPathF.PathNoSeparator}\{CollectionName}\{SettingsFolderName}" - Else - If IncludedInCollection Then - Return $"{Settings.CollectionsPathF.PathNoSeparator}\{CollectionName}\{Site}_{Name}\{SettingsFolderName}" - ElseIf Not Settings(Plugin) Is Nothing Then - Return $"{Settings(Plugin).Path.PathNoSeparator}\{Name}\{SettingsFolderName}" - Else - Dim s$ = Site.ToLower - Dim i% = Settings.Plugins.FindIndex(Function(p) p.Name.ToLower = s) - If i >= 0 Then Return $"{Settings.Plugins(i).Settings.Path.PathNoSeparator}\{Name}\{SettingsFolderName}" Else Return String.Empty - End If - End If - End Function - Friend Function GetContainer(Optional ByVal e As ErrorsDescriber = Nothing) As EContainer Implements IEContainerProvider.ToEContainer - Return New EContainer("User", Name, {New EAttribute(Name_Site, Site), - New EAttribute(Name_Plugin, Plugin), - New EAttribute(Name_Collection, CollectionName), - New EAttribute(Name_Merged, Merged.BoolToInteger), - New EAttribute(Name_IsChannel, IsChannel.BoolToInteger), - New EAttribute(Name_SpecialPath, SpecialPath.PathWithSeparator)}) - End Function - Friend Function CompareTo(ByVal Other As UserInfo) As Integer Implements IComparable(Of UserInfo).CompareTo - If Site = Other.Site Then - Return Name.CompareTo(Other.Name) - Else - Return Site.CompareTo(Other.Site) - End If - End Function - Friend Overloads Function Equals(ByVal Other As UserInfo) As Boolean Implements IEquatable(Of UserInfo).Equals - Return Site = Other.Site And Name = Other.Name - End Function - Public Overloads Overrides Function Equals(ByVal Obj As Object) As Boolean - Return Equals(DirectCast(Obj, UserInfo)) - End Function - Friend Function Clone() As Object Implements ICloneable.Clone - Return New UserInfo With { - .Name = Name, - .Site = Site, - .Plugin = Plugin, - .File = File, - .SpecialPath = SpecialPath, - .Merged = Merged, - .IncludedInCollection = IncludedInCollection, - .CollectionName = CollectionName, - .IsChannel = IsChannel, - .[Protected] = [Protected] - } - End Function - End Structure #Region "Image Handlers management" Friend Sub ImageHandler(ByVal User As IUserData) ImageHandler(User, False) @@ -324,7 +195,7 @@ Friend Module MainMod ElseIf URL.Contains("imgur.com") Then um = Imgur.Envir.GetVideoInfo(URL) Else - MsgBoxE("Site of video URL does not recognized" & vbCr & "Operation canceled", MsgBoxStyle.Exclamation, e) + MsgBoxE("Site of video URL not recognized" & vbCr & "Operation canceled", MsgBoxStyle.Exclamation, e) Return False End If End If @@ -377,13 +248,13 @@ Friend Module MainMod Result = True End If Else - If um.Count = 1 Then MsgBoxE("File does not downloaded", MsgBoxStyle.Critical, e) + If um.Count = 1 Then MsgBoxE("File not downloaded", MsgBoxStyle.Critical, e) End If Else - If um.Count = 1 Then MsgBoxE("File destination does not pointed" & vbCr & "Operation canceled",, e) + If um.Count = 1 Then MsgBoxE("File destination not specified" & vbCr & "Operation canceled",, e) End If Else - If um.Count = 1 Then MsgBoxE("File URL does not found!", MsgBoxStyle.Critical, e) + If um.Count = 1 Then MsgBoxE("File URL not found!", MsgBoxStyle.Critical, e) End If Next End If @@ -392,100 +263,13 @@ Friend Module MainMod End If Return Result Catch ex As Exception - Return ErrorsDescriber.Execute(e, ex, "Downloading video by URL error", False) + Return ErrorsDescriber.Execute(e, ex, $"Error when trying to download video from URL: [{URL}]", False) End Try End Function -#End Region -#Region "Blacklist Support" - Friend Structure UserBan - Friend ReadOnly Name As String - Friend ReadOnly Reason As String - Friend ReadOnly Exists As Boolean - Friend Sub New(ByVal Value As String) - If Not Value.IsEmptyString Then - Dim v$() = Value.Split("|") - If v.ListExists Then - Name = v(0) - If v.Length > 1 Then Reason = v(1) - Exists = True - End If - End If - End Sub - Friend Sub New(ByVal _Name As String, ByVal _Reason As String) - Name = _Name - Reason = _Reason - Exists = True - End Sub - Public Shared Widening Operator CType(ByVal Value As String) As UserBan - Return New UserBan(Value) - End Operator - Public Shared Widening Operator CType(ByVal b As UserBan) As String - Return b.ToString - End Operator - Public Overrides Function ToString() As String - Return $"{Name}|{Reason}" - End Function - Friend Function Info() As String - If Not Reason.IsEmptyString Then - Return $"[{Name}] ({Reason})" - Else - Return Name - End If - End Function - Public Overrides Function Equals(ByVal Obj As Object) As Boolean - If Not IsNothing(Obj) Then - If TypeOf Obj Is UserBan Then - Return Name = DirectCast(Obj, UserBan).Name - Else - Return Name = New UserBan(CStr(Obj)).Name - End If - End If - Return False - End Function - End Structure - Friend Function UserBanned(ByVal UserNames() As String) As String() - If UserNames.ListExists Then - Dim i% - Dim Found As New List(Of UserBan) - For Each user In UserNames - i = Settings.BlackList.FindIndex(Function(u) u.Name = user) - If i >= 0 Then Found.Add(Settings.BlackList(i)) - Next - If Found.Count = 0 Then - Return New String() {} - Else - Dim m As New MMessage With { - .Title = "Banned user found", - .Buttons = {"Remove from ban and add", "Leave in ban and add", "Skip"}, - .Style = MsgBoxStyle.Exclamation, - .Exists = True - } - If Found.Count = 1 Then - m.Text = $"This user is banned:{vbNewLine}User: {Found(0).Name}" - If Not Found(0).Reason.IsEmptyString Then m.Text.StringAppendLine($"Reason: {Found(0).Reason}") - Else - m.Text = $"These users was banned:{vbNewLine.StringDup(2)}{Found.Select(Function(u) u.Info).ListToString(vbNewLine)}" - End If - Dim r% = MsgBoxE(m) - If r = 2 Then - Return Found.Select(Function(u) u.Name).ToArray - Else - If r = 0 Then - Settings.BlackList.ListDisposeRemove(Found) - Settings.UpdateBlackList() - End If - End If - End If - End If - Return New String() {} - End Function - Friend Function UserBanned(ByVal UserName As String) As Boolean - Return UserBanned({UserName}).ListExists - End Function #End Region Friend Sub CheckVersion(ByVal Force As Boolean) If Settings.CheckUpdatesAtStart Or Force Then _ - GitHub.DefaultVersionChecker(My.Application.Info.Version, "AAndyProgram", "SCrawler", - Settings.LatestVersion.Value, Settings.ShowNewVersionNotification.Value, Force) + GitHub.DefaultVersionChecker(My.Application.Info.Version, "AAndyProgram", "SCrawler", + Settings.LatestVersion.Value, Settings.ShowNewVersionNotification.Value, Force) End Sub End Module \ No newline at end of file diff --git a/SCrawler/My Project/AssemblyInfo.vb b/SCrawler/My Project/AssemblyInfo.vb index df86a96..a9107d3 100644 --- a/SCrawler/My Project/AssemblyInfo.vb +++ b/SCrawler/My Project/AssemblyInfo.vb @@ -13,7 +13,7 @@ Imports System.Runtime.InteropServices - + @@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices ' by using the '*' as shown below: ' - - + + diff --git a/SCrawler/PluginsEnvironment/Hosts/PluginHost.vb b/SCrawler/PluginsEnvironment/Hosts/PluginHost.vb index 0a14a50..70e3321 100644 --- a/SCrawler/PluginsEnvironment/Hosts/PluginHost.vb +++ b/SCrawler/PluginsEnvironment/Hosts/PluginHost.vb @@ -67,7 +67,7 @@ Namespace Plugin.Hosts End If End If Catch ex As Exception - ErrorsDescriber.Execute(EDP.SendInLog, ex, "[PluginHost.New]") + ErrorsDescriber.Execute(EDP.SendInLog, ex, $"[PluginHost.New({AssemblyFile})]") _HasError = True End Try End Sub @@ -93,7 +93,7 @@ Namespace Plugin.Hosts End If Return pList Catch ex As Exception - ErrorsDescriber.Execute(EDP.SendInLog, ex, "[PluginHost.GetPluginsHosts]") + ErrorsDescriber.Execute(EDP.SendInLog, ex, $"[PluginHost.GetPluginsHosts({GlobalPath})]") Return Nothing End Try End Function diff --git a/SCrawler/PluginsEnvironment/Hosts/PropertyValueHost.vb b/SCrawler/PluginsEnvironment/Hosts/PropertyValueHost.vb index e2766fd..badd268 100644 --- a/SCrawler/PluginsEnvironment/Hosts/PropertyValueHost.vb +++ b/SCrawler/PluginsEnvironment/Hosts/PropertyValueHost.vb @@ -86,7 +86,7 @@ Namespace Plugin.Hosts Friend Sub DisposeControl() If Not Control Is Nothing Then Control.Dispose() : Control = Nothing End Sub - Private Sub TextBoxClick(ByVal Sender As ActionButton) + Private Sub TextBoxClick(ByVal Sender As ActionButton, ByVal e As EventArgs) Try If Sender.DefaultButton = ADB.Refresh AndAlso Not Source Is Nothing AndAlso Not UpdateMethod Is Nothing Then If CBool(UpdateMethod.Invoke(Source, Nothing)) Then diff --git a/SCrawler/PluginsEnvironment/Hosts/UserDataHost.vb b/SCrawler/PluginsEnvironment/Hosts/UserDataHost.vb index 22a3803..9e6fa97 100644 --- a/SCrawler/PluginsEnvironment/Hosts/UserDataHost.vb +++ b/SCrawler/PluginsEnvironment/Hosts/UserDataHost.vb @@ -6,10 +6,10 @@ ' ' This program is distributed in the hope that it will be useful, ' but WITHOUT ANY WARRANTY -Imports PersonalUtilities.Functions.XML -Imports SCrawler.API.Base Imports System.Threading Imports System.Reflection +Imports PersonalUtilities.Functions.XML +Imports SCrawler.API.Base Imports UStates = SCrawler.Plugin.PluginUserMedia.States Imports UTypes = SCrawler.Plugin.PluginUserMedia.Types Namespace Plugin.Hosts diff --git a/SCrawler/SCrawler.vbproj b/SCrawler/SCrawler.vbproj index 77c397f..15b6762 100644 --- a/SCrawler/SCrawler.vbproj +++ b/SCrawler/SCrawler.vbproj @@ -30,6 +30,10 @@ false true + + 10.0.16299.0 + 10.0.16299.0 + AnyCPU true @@ -308,6 +312,7 @@ + VideosDownloaderForm.vb @@ -315,6 +320,7 @@ Form + diff --git a/SCrawler/SettingsCLS.vb b/SCrawler/SettingsCLS.vb index 229b9a5..4a1b9e0 100644 --- a/SCrawler/SettingsCLS.vb +++ b/SCrawler/SettingsCLS.vb @@ -70,8 +70,10 @@ Friend Class SettingsCLS : Implements IDisposable If tmpPluginList.ListExists Then Plugins.AddRange(tmpPluginList) FastProfilesLoading = New XMLValue(Of Boolean)("FastProfilesLoading", False, MyXML) - MaxLargeImageHeigh = New XMLValue(Of Integer)("MaxLargeImageHeigh", 150, MyXML) - MaxSmallImageHeigh = New XMLValue(Of Integer)("MaxSmallImageHeigh", 15, MyXML) + MaxLargeImageHeight = New XMLValue(Of Integer)("MaxLargeImageHeight", 150, MyXML) + MaxLargeImageHeight.ReplaceByValue("MaxLargeImageHeigh",, MyXML) + MaxSmallImageHeight = New XMLValue(Of Integer)("MaxSmallImageHeight", 15, MyXML) + MaxSmallImageHeight.ReplaceByValue("MaxSmallImageHeigh",, MyXML) DownloadOpenInfo = New XMLValueAttribute(Of Boolean, Boolean)("DownloadOpenInfo", "OpenAgain", False, False, MyXML) DownloadOpenProgress = New XMLValueAttribute(Of Boolean, Boolean)("DownloadOpenProgress", "OpenAgain", False, False, MyXML) DownloadsCompleteCommand = New XMLValueAttribute(Of String, Boolean)("DownloadsCompleteCommand", "Use",,, MyXML) @@ -119,7 +121,7 @@ Friend Class SettingsCLS : Implements IDisposable AddHandler FileAddTimeToFileName.OnValueChanged, AddressOf ChangeDateProvider FileDateTimePositionEnd = New XMLValue(Of Boolean)("FileDateTimePositionEnd", True, MyXML, n) AddHandler FileDateTimePositionEnd.OnValueChanged, AddressOf ChangeDateProvider - FileReplaceNameByDate = New XMLValue(Of Boolean)("FileReplaceNameByDate", False, MyXML, n) + FileReplaceNameByDate = New XMLValue(Of Integer)("FileReplaceNameByDate", FileNameReplaceMode.None, MyXML, n) CheckUpdatesAtStart = New XMLValue(Of Boolean)("CheckUpdatesAtStart", True, MyXML) ShowNewVersionNotification = New XMLValue(Of Boolean)("ShowNewVersionNotification", True, MyXML) @@ -151,7 +153,11 @@ Friend Class SettingsCLS : Implements IDisposable If FileAddDateToFileName Then p = "yyyyMMdd" If FileAddTimeToFileName Then p.StringAppend("HHmmss", "_") If Not p.IsEmptyString Then FileDateAppenderProvider = New ADateTime(p) Else FileDateAppenderProvider = New ADateTime("yyyyMMdd_HHmmss") - If FileDateTimePositionEnd Then FileDateAppenderPattern = "{0}_{1}" Else FileDateAppenderPattern = "{1}_{0}" + If FileReplaceNameByDate.Value = FileNameReplaceMode.Replace Then + FileDateAppenderPattern = "{1}" + Else + If FileDateTimePositionEnd Then FileDateAppenderPattern = "{0}_{1}" Else FileDateAppenderPattern = "{1}_{0}" + End If End If End Sub #Region "Script" @@ -378,7 +384,7 @@ Friend Class SettingsCLS : Implements IDisposable Friend ReadOnly Property CollectionsPathF As SFile Get If GlobalPath.IsEmptyString Then - Throw New ArgumentNullException("GlobalPath", "GlobalPath does not set") + Throw New ArgumentNullException("GlobalPath", "GlobalPath not set") Else Return SFile.GetPath($"{GlobalPath.Value.PathWithSeparator}{CollectionsPath.Value}") End If @@ -402,13 +408,13 @@ Friend Class SettingsCLS : Implements IDisposable Friend ReadOnly Property FileAddDateToFileName As XMLValue(Of Boolean) Friend ReadOnly Property FileAddTimeToFileName As XMLValue(Of Boolean) Friend ReadOnly Property FileDateTimePositionEnd As XMLValue(Of Boolean) - Friend ReadOnly Property FileReplaceNameByDate As XMLValue(Of Boolean) + Friend ReadOnly Property FileReplaceNameByDate As XMLValue(Of Integer) #End Region #End Region #Region "View" Friend ReadOnly Property FastProfilesLoading As XMLValue(Of Boolean) - Friend ReadOnly Property MaxLargeImageHeigh As XMLValue(Of Integer) - Friend ReadOnly Property MaxSmallImageHeigh As XMLValue(Of Integer) + Friend ReadOnly Property MaxLargeImageHeight As XMLValue(Of Integer) + Friend ReadOnly Property MaxSmallImageHeight As XMLValue(Of Integer) Friend ReadOnly Property DownloadOpenInfo As XMLValueAttribute(Of Boolean, Boolean) Friend ReadOnly Property DownloadOpenProgress As XMLValueAttribute(Of Boolean, Boolean) Friend ReadOnly Property DownloadsCompleteCommand As XMLValueAttribute(Of String, Boolean) @@ -481,6 +487,7 @@ Friend Class SettingsCLS : Implements IDisposable DeleteCachePath() End If If Not Automation Is Nothing Then Automation.Dispose() + AutoDownloader.CachePath.Delete(SFO.Path, SFODelete.DeletePermanently, EDP.None) Plugins.Clear() Users.ListClearDispose UsersList.Clear() diff --git a/SCrawler/UserBan.vb b/SCrawler/UserBan.vb new file mode 100644 index 0000000..594bfab --- /dev/null +++ b/SCrawler/UserBan.vb @@ -0,0 +1,95 @@ +' Copyright (C) 2022 Andy +' 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 +Partial Friend Module MainMod + Friend Structure UserBan + Friend ReadOnly Name As String + Friend ReadOnly Reason As String + Friend ReadOnly Exists As Boolean + Friend Sub New(ByVal Value As String) + If Not Value.IsEmptyString Then + Dim v$() = Value.Split("|") + If v.ListExists Then + Name = v(0) + If v.Length > 1 Then Reason = v(1) + Exists = True + End If + End If + End Sub + Friend Sub New(ByVal _Name As String, ByVal _Reason As String) + Name = _Name + Reason = _Reason + Exists = True + End Sub + Public Shared Widening Operator CType(ByVal Value As String) As UserBan + Return New UserBan(Value) + End Operator + Public Shared Widening Operator CType(ByVal b As UserBan) As String + Return b.ToString + End Operator + Public Overrides Function ToString() As String + Return $"{Name}|{Reason}" + End Function + Friend Function Info() As String + If Not Reason.IsEmptyString Then + Return $"[{Name}] ({Reason})" + Else + Return Name + End If + End Function + Public Overrides Function Equals(ByVal Obj As Object) As Boolean + If Not IsNothing(Obj) Then + If TypeOf Obj Is UserBan Then + Return Name = DirectCast(Obj, UserBan).Name + Else + Return Name = New UserBan(CStr(Obj)).Name + End If + End If + Return False + End Function + End Structure + Friend Function UserBanned(ByVal UserNames() As String) As String() + If UserNames.ListExists Then + Dim i% + Dim Found As New List(Of UserBan) + For Each user In UserNames + i = Settings.BlackList.FindIndex(Function(u) u.Name = user) + If i >= 0 Then Found.Add(Settings.BlackList(i)) + Next + If Found.Count = 0 Then + Return New String() {} + Else + Dim m As New MMessage With { + .Title = "Banned user found", + .Buttons = {"Remove from ban and add", "Leave in ban and add", "Skip"}, + .Style = MsgBoxStyle.Exclamation, + .Exists = True + } + If Found.Count = 1 Then + m.Text = $"This user is banned:{vbNewLine}User: {Found(0).Name}" + If Not Found(0).Reason.IsEmptyString Then m.Text.StringAppendLine($"Reason: {Found(0).Reason}") + Else + m.Text = $"These users have been banned:{vbNewLine.StringDup(2)}{Found.Select(Function(u) u.Info).ListToString(vbNewLine)}" + End If + Dim r% = MsgBoxE(m) + If r = 2 Then + Return Found.Select(Function(u) u.Name).ToArray + Else + If r = 0 Then + Settings.BlackList.ListDisposeRemove(Found) + Settings.UpdateBlackList() + End If + End If + End If + End If + Return New String() {} + End Function + Friend Function UserBanned(ByVal UserName As String) As Boolean + Return UserBanned({UserName}).ListExists + End Function +End Module \ No newline at end of file diff --git a/SCrawler/UserImage.vb b/SCrawler/UserImage.vb index 66cf74f..7dafbaf 100644 --- a/SCrawler/UserImage.vb +++ b/SCrawler/UserImage.vb @@ -25,8 +25,8 @@ Friend Class UserImage : Inherits ImageRenderer _SmallAddress = Address _SmallAddress.Name &= ImagePostfix_Small If GenerateLargeSmallPictures Then - GetImage(Settings.MaxSmallImageHeigh.Value, True) - GetImage(Settings.MaxLargeImageHeigh.Value, False) + GetImage(Settings.MaxSmallImageHeight.Value, True) + GetImage(Settings.MaxLargeImageHeight.Value, False) End If End Sub Friend Sub New(ByVal _ImgOriginal As SFile, ByVal _ImgLarge As SFile, ByVal _ImgSmall As SFile, ByVal Destination As SFile) @@ -39,27 +39,15 @@ Friend Class UserImage : Inherits ImageRenderer _SmallAddress = _ImgSmall End Sub ''' - Friend ReadOnly Property SmallSize As Size - Get - Return GetImage(Settings.MaxSmallImageHeigh.Value, True).Size - End Get - End Property - ''' Friend ReadOnly Property Small As ImageRenderer Get - Return GetImage(Settings.MaxSmallImageHeigh.Value, True) - End Get - End Property - ''' - Friend ReadOnly Property LargeSize As Size - Get - Return GetImage(Settings.MaxLargeImageHeigh.Value, False).Size + Return GetImage(Settings.MaxSmallImageHeight.Value, True) End Get End Property ''' Friend ReadOnly Property Large As ImageRenderer Get - Return GetImage(Settings.MaxLargeImageHeigh.Value, False) + Return GetImage(Settings.MaxLargeImageHeight.Value, False) End Get End Property ''' diff --git a/SCrawler/UserInfo.vb b/SCrawler/UserInfo.vb new file mode 100644 index 0000000..3adfde2 --- /dev/null +++ b/SCrawler/UserInfo.vb @@ -0,0 +1,148 @@ +' Copyright (C) 2022 Andy +' 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.XML +Imports PersonalUtilities.Functions.XML.Base +Imports SCrawler.API +Imports SCrawler.API.Base +Imports SCrawler.Plugin.Hosts +Imports DownOptions = SCrawler.Plugin.ISiteSettings.Download +Partial Friend Module MainMod + Friend Structure UserInfo : Implements IComparable(Of UserInfo), IEquatable(Of UserInfo), ICloneable, IEContainerProvider + Friend Const Name_Site As String = "Site" + Friend Const Name_Plugin As String = "Plugin" + Friend Const Name_Collection As String = "Collection" + Friend Const Name_Merged As String = "Merged" + Friend Const Name_IsChannel As String = "IsChannel" + Friend Const Name_SpecialPath As String = "SpecialPath" + Friend Name As String + Friend Site As String + Friend Plugin As String + Friend File As SFile + Friend SpecialPath As SFile + Friend Merged As Boolean + Friend IncludedInCollection As Boolean + Friend CollectionName As String + Friend IsChannel As Boolean + Friend [Protected] As Boolean + Friend ReadOnly Property DownloadOption As DownOptions + Get + If IsChannel Then + Return DownOptions.Channel + Else + Return DownOptions.Main + End If + End Get + End Property + Friend Sub New(ByVal _Name As String, ByVal Host As SettingsHost, Optional ByVal Collection As String = Nothing, + Optional ByVal _Merged As Boolean = False, Optional ByVal _SpecialPath As SFile = Nothing) + Name = _Name + Site = Host.Name + Plugin = Host.Key + IncludedInCollection = Not Collection.IsEmptyString + CollectionName = Collection + Merged = _Merged + SpecialPath = _SpecialPath + UpdateUserFile() + End Sub + Private Sub New(ByVal x As EContainer) + Name = x.Value + Site = x.Attribute(Name_Site).Value + Plugin = x.Attribute(Name_Plugin).Value + CollectionName = x.Attribute(Name_Collection).Value + IncludedInCollection = Not CollectionName.IsEmptyString + Merged = x.Attribute(Name_Merged).Value.FromXML(Of Boolean)(False) + SpecialPath = SFile.GetPath(x.Attribute(Name_SpecialPath).Value) + IsChannel = x.Attribute(Name_IsChannel).Value.FromXML(Of Boolean)(False) + 'UpdateUserFile() + End Sub + Friend Sub New(ByVal c As Reddit.Channel) + Name = c.Name + Site = Reddit.RedditSite + Plugin = Reddit.RedditSiteKey + File = c.File + IsChannel = True + End Sub + Public Shared Widening Operator CType(ByVal x As EContainer) As UserInfo + Return New UserInfo(x) + End Operator + Public Shared Widening Operator CType(ByVal u As UserInfo) As String + Return u.Name + End Operator + Public Shared Operator =(ByVal x As UserInfo, ByVal y As UserInfo) + Return x.Equals(y) + End Operator + Public Shared Operator <>(ByVal x As UserInfo, ByVal y As UserInfo) + Return Not x.Equals(y) + End Operator + Public Overrides Function ToString() As String + Return Name + End Function + Friend Sub UpdateUserFile() + File = New SFile With { + .Separator = "\", + .Path = GetFilePathByParams(), + .Extension = "xml", + .Name = $"{UserDataBase.UserFileAppender}_{Site}_{Name}" + } + End Sub + Private Function GetFilePathByParams() As String + If [Protected] Then Return String.Empty + If Not SpecialPath.IsEmptyString Then + Return $"{SpecialPath.PathWithSeparator}{SettingsFolderName}" + ElseIf Merged And IncludedInCollection Then + Return $"{Settings.CollectionsPathF.PathNoSeparator}\{CollectionName}\{SettingsFolderName}" + Else + If IncludedInCollection Then + Return $"{Settings.CollectionsPathF.PathNoSeparator}\{CollectionName}\{Site}_{Name}\{SettingsFolderName}" + ElseIf Not Settings(Plugin) Is Nothing Then + Return $"{Settings(Plugin).Path.PathNoSeparator}\{Name}\{SettingsFolderName}" + Else + Dim s$ = Site.ToLower + Dim i% = Settings.Plugins.FindIndex(Function(p) p.Name.ToLower = s) + If i >= 0 Then Return $"{Settings.Plugins(i).Settings.Path.PathNoSeparator}\{Name}\{SettingsFolderName}" Else Return String.Empty + End If + End If + End Function + Friend Function GetContainer(Optional ByVal e As ErrorsDescriber = Nothing) As EContainer Implements IEContainerProvider.ToEContainer + Return New EContainer("User", Name, {New EAttribute(Name_Site, Site), + New EAttribute(Name_Plugin, Plugin), + New EAttribute(Name_Collection, CollectionName), + New EAttribute(Name_Merged, Merged.BoolToInteger), + New EAttribute(Name_IsChannel, IsChannel.BoolToInteger), + New EAttribute(Name_SpecialPath, SpecialPath.PathWithSeparator)}) + End Function + Friend Function CompareTo(ByVal Other As UserInfo) As Integer Implements IComparable(Of UserInfo).CompareTo + If Site = Other.Site Then + Return Name.CompareTo(Other.Name) + Else + Return Site.CompareTo(Other.Site) + End If + End Function + Friend Overloads Function Equals(ByVal Other As UserInfo) As Boolean Implements IEquatable(Of UserInfo).Equals + Return Site = Other.Site And Name = Other.Name + End Function + Public Overloads Overrides Function Equals(ByVal Obj As Object) As Boolean + Return Equals(DirectCast(Obj, UserInfo)) + End Function + Friend Function Clone() As Object Implements ICloneable.Clone + Return New UserInfo With { + .Name = Name, + .Site = Site, + .Plugin = Plugin, + .File = File, + .SpecialPath = SpecialPath, + .Merged = Merged, + .IncludedInCollection = IncludedInCollection, + .CollectionName = CollectionName, + .IsChannel = IsChannel, + .[Protected] = [Protected] + } + End Function + End Structure +End Module \ No newline at end of file