From dd272c6f6d17da51ecac10d7201df1bbf68213d9 Mon Sep 17 00:00:00 2001 From: Andy <88590076+AAndyProgram@users.noreply.github.com> Date: Mon, 6 Jun 2022 21:32:43 +0300 Subject: [PATCH] 2022.6.6.0 Minor fixes Fixed Twitter gifs --- Changelog.md | 8 ++++ ProgramScreenshots/MainWindowGroups.png | Bin 12793 -> 6992 bytes .../My Project/AssemblyInfo.vb | 4 +- SCrawler.Plugin.XVIDEOS/SettingsForm.vb | 4 +- SCrawler/API/Instagram/OptionsForm.vb | 4 +- SCrawler/API/Reddit/RedditViewSettingsForm.vb | 4 +- SCrawler/API/Twitter/UserData.vb | 36 ++++++++++++++++++ SCrawler/Channels/ChannelsStatsForm.vb | 6 +-- SCrawler/Download/AutoDownloaderEditorForm.vb | 4 +- SCrawler/Download/Groups/GroupEditorForm.vb | 4 +- SCrawler/Editors/CollectionEditorForm.vb | 6 +-- SCrawler/Editors/GlobalSettingsForm.vb | 6 +-- SCrawler/Editors/LabelsForm.vb | 6 +-- SCrawler/Editors/SiteEditorForm.vb | 4 +- SCrawler/Editors/SiteSelectionForm.vb | 4 +- SCrawler/Editors/UserCreatorForm.vb | 4 +- SCrawler/FDatePickerForm.vb | 6 +-- SCrawler/MainFrame.vb | 1 + SCrawler/My Project/AssemblyInfo.vb | 4 +- 19 files changed, 80 insertions(+), 35 deletions(-) diff --git a/Changelog.md b/Changelog.md index 8b84bdd..da143f1 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,3 +1,11 @@ +# 2022.6.6.0 + +- Added + - Ability to pause automation +- Fixed + - GIFs from Twitter not downloading + - Not quite correct algorithm for stopping automation + # 2022.6.3.0 Changed version numbering method. From now on, new versions will be numbered by release date (YYYY.M.D) diff --git a/ProgramScreenshots/MainWindowGroups.png b/ProgramScreenshots/MainWindowGroups.png index 784b3fb43b49e1723291fa61b06d3cdcd33827aa..c110df93fb12f45a57ea68b192829be371946325 100644 GIT binary patch literal 6992 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 literal 12793 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 - - + + diff --git a/SCrawler.Plugin.XVIDEOS/SettingsForm.vb b/SCrawler.Plugin.XVIDEOS/SettingsForm.vb index 987e17f..4ec5106 100644 --- a/SCrawler.Plugin.XVIDEOS/SettingsForm.vb +++ b/SCrawler.Plugin.XVIDEOS/SettingsForm.vb @@ -29,7 +29,7 @@ Public Class SettingsForm : Implements IOkCancelToolbar MyDefs.InvokeLoaderError(ex) End Try End Sub - Private Sub ToolbarBttOK() Implements IOkCancelToolbar.ToolbarBttOK + Private Sub OK() Implements IOkCancelToolbar.OK Settings.Domains.Clear() With LIST_DOMAINS If .Items.Count > 0 Then @@ -39,7 +39,7 @@ Public Class SettingsForm : Implements IOkCancelToolbar Settings.UpdateDomains() MyDefs.CloseForm() End Sub - Private Sub ToolbarBttCancel() Implements IOkCancelToolbar.ToolbarBttCancel + Private Sub Cancel() Implements IOkCancelToolbar.Cancel MyDefs.CloseForm(Windows.Forms.DialogResult.Cancel) End Sub Private Sub BTT_ADD_Click(sender As Object, e As EventArgs) Handles BTT_ADD.Click diff --git a/SCrawler/API/Instagram/OptionsForm.vb b/SCrawler/API/Instagram/OptionsForm.vb index e6a0485..71a563f 100644 --- a/SCrawler/API/Instagram/OptionsForm.vb +++ b/SCrawler/API/Instagram/OptionsForm.vb @@ -30,14 +30,14 @@ Namespace API.Instagram .EndLoaderOperations() End With End Sub - Private Sub ToolbarBttOK() Implements IOkCancelToolbar.ToolbarBttOK + Private Sub OK() Implements IOkCancelToolbar.OK With MyExchangeOptions .GetStories = CH_GET_STORIES.Checked .GetTagged = CH_GET_TAGGED.Checked End With MyDefs.CloseForm() End Sub - Private Sub ToolbarBttCancel() Implements IOkCancelToolbar.ToolbarBttCancel + Private Sub Cancel() Implements IOkCancelToolbar.Cancel MyDefs.CloseForm(DialogResult.Cancel) End Sub End Class diff --git a/SCrawler/API/Reddit/RedditViewSettingsForm.vb b/SCrawler/API/Reddit/RedditViewSettingsForm.vb index bdb9ad5..c892e0c 100644 --- a/SCrawler/API/Reddit/RedditViewSettingsForm.vb +++ b/SCrawler/API/Reddit/RedditViewSettingsForm.vb @@ -53,7 +53,7 @@ Namespace API.Reddit MyDefs.InvokeLoaderError(ex) End Try End Sub - Private Sub ToolbarBttOK() Implements IOkCancelToolbar.ToolbarBttOK + Private Sub OK() Implements IOkCancelToolbar.OK With MyOptions Select Case True Case OPT_VIEW_MODE_HOT.Checked : .ViewMode = CView.Hot @@ -71,7 +71,7 @@ Namespace API.Reddit End With MyDefs.CloseForm() End Sub - Private Sub ToolbarBttCancel() Implements IOkCancelToolbar.ToolbarBttCancel + 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 diff --git a/SCrawler/API/Twitter/UserData.vb b/SCrawler/API/Twitter/UserData.vb index 9cbc39d..f3a0c09 100644 --- a/SCrawler/API/Twitter/UserData.vb +++ b/SCrawler/API/Twitter/UserData.vb @@ -197,6 +197,7 @@ Namespace API.Twitter #Region "Video options" Private Function CheckVideoNode(ByVal w As EContainer, ByVal PostID As String, ByVal PostDate As String) As Boolean Try + If CheckForGif(w, PostID, PostDate) Then Return True Dim URL$ = GetVideoNodeURL(w) If Not URL.IsEmptyString Then Dim f$ = UrlFile(URL) @@ -212,6 +213,41 @@ Namespace API.Twitter Return False End Try End Function + Private Function CheckForGif(ByVal w As EContainer, ByVal PostID As String, ByVal PostDate As String) As Boolean + Try + Dim gifUrl As Predicate(Of EContainer) = Function(e) Not e.Value("content_type").IsEmptyString AndAlso + e.Value("content_type").Contains("mp4") AndAlso + Not e.Value("url").IsEmptyString + Dim url$, ff$ + Dim f As SFile + Dim m As UserMedia + With w({"extended_entities", "media"}).XmlIfNothing + If .Count > 0 Then + For Each n As EContainer In .Self + If n.Value("type") = "animated_gif" Then + With n({"video_info", "variants"}).XmlIfNothing.ItemF({gifUrl}).XmlIfNothing + url = .Value("url") + ff = UrlFile(url) + If Not ff.IsEmptyString Then + If Not _DataNames.Contains(ff) Then + m = MediaFromData(url, PostID, PostDate) + f = m.File + If Not f.IsEmptyString Then f.Name = $"GIF_{f.Name}" : m.File = f + _TempMediaList.ListAddValue(m, LNC) + End If + Return True + End If + End With + End If + Next + End If + End With + Return False + Catch ex As Exception + LogError(ex, "[API.Twitter.UserData.CheckForGif]") + Return False + End Try + 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 diff --git a/SCrawler/Channels/ChannelsStatsForm.vb b/SCrawler/Channels/ChannelsStatsForm.vb index 65f183c..b51ceb4 100644 --- a/SCrawler/Channels/ChannelsStatsForm.vb +++ b/SCrawler/Channels/ChannelsStatsForm.vb @@ -47,13 +47,13 @@ Friend Class ChannelsStatsForm : Implements IOkCancelDeleteToolbar CMB_CHANNELS.EndUpdate() End If End Sub - Private Sub ToolbarBttOK() Implements IOkCancelToolbar.ToolbarBttOK + Private Sub OK() Implements IOkCancelToolbar.OK MyDefs.CloseForm() End Sub - Private Sub ToolbarBttCancel() Implements IOkCancelToolbar.ToolbarBttCancel + Private Sub Cancel() Implements IOkCancelToolbar.Cancel MyDefs.CloseForm(DialogResult.Cancel) End Sub - Private Sub ToolbarBttDelete() Implements IOkCancelDeleteToolbar.ToolbarBttDelete + Private Sub Delete() Implements IOkCancelDeleteToolbar.Delete Try Dim c As List(Of String) = CMB_CHANNELS.Items.CheckedItems.Select(Function(cc) CStr(cc.Value(1))).ListIfNothing If c.ListExists Then diff --git a/SCrawler/Download/AutoDownloaderEditorForm.vb b/SCrawler/Download/AutoDownloaderEditorForm.vb index 02ee24c..3b7549a 100644 --- a/SCrawler/Download/AutoDownloaderEditorForm.vb +++ b/SCrawler/Download/AutoDownloaderEditorForm.vb @@ -79,7 +79,7 @@ Namespace DownloadObjects Private Sub AutoDownloaderEditorForm_Disposed(sender As Object, e As EventArgs) Handles Me.Disposed MyGroups.Clear() End Sub - Friend Sub SaveSetiings() Implements IOkCancelToolbar.ToolbarBttOK + Friend Sub SaveSettings() Implements IOkCancelToolbar.OK If If(MyDefs.MyFieldsChecker?.AllParamsOK, True) Then With Settings.Automation Select Case True @@ -98,7 +98,7 @@ Namespace DownloadObjects If Not IsControlForm Then MyDefs.CloseForm() End If End Sub - Private Sub ToolbarBttCancel() Implements IOkCancelToolbar.ToolbarBttCancel + 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 diff --git a/SCrawler/Download/Groups/GroupEditorForm.vb b/SCrawler/Download/Groups/GroupEditorForm.vb index f52478f..8bc61ca 100644 --- a/SCrawler/Download/Groups/GroupEditorForm.vb +++ b/SCrawler/Download/Groups/GroupEditorForm.vb @@ -63,7 +63,7 @@ Namespace DownloadObjects.Groups .EndLoaderOperations() End With End Sub - Private Sub ToolbarBttOK() Implements IOkCancelToolbar.ToolbarBttOK + Private Sub OK() Implements IOkCancelToolbar.OK If MyDefs.MyFieldsChecker.AllParamsOK Then If MyGroup Is Nothing Then MyGroup = New DownloadGroup With MyGroup @@ -74,7 +74,7 @@ Namespace DownloadObjects.Groups MyDefs.CloseForm() End If End Sub - Private Sub ToolbarBttCancel() Implements IOkCancelToolbar.ToolbarBttCancel + Private Sub Cancel() Implements IOkCancelToolbar.Cancel MyDefs.CloseForm(DialogResult.Cancel) End Sub End Class diff --git a/SCrawler/Editors/CollectionEditorForm.vb b/SCrawler/Editors/CollectionEditorForm.vb index 18d98a3..4aacd06 100644 --- a/SCrawler/Editors/CollectionEditorForm.vb +++ b/SCrawler/Editors/CollectionEditorForm.vb @@ -43,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 ToolbarBttOK() Implements IOkCancelToolbar.ToolbarBttOK + Private Sub OK() Implements IOkCancelToolbar.OK If CMB_COLLECTIONS.SelectedIndex >= 0 Then Collection = CMB_COLLECTIONS.Value.ToString MyDefs.CloseForm() @@ -51,7 +51,7 @@ Namespace Editors MsgBoxE("Collection not selected", MsgBoxStyle.Exclamation) End If End Sub - Private Sub ToolbarBttCancel() Implements IOkCancelToolbar.ToolbarBttCancel + 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 @@ -59,7 +59,7 @@ Namespace Editors End Sub Private Sub CMB_COLLECTIONS_ActionOnListDoubleClick(ByVal _Item As ListViewItem) Handles CMB_COLLECTIONS.ActionOnListDoubleClick _Item.Selected = True - ToolbarBttOK() + OK() End Sub Private Sub AddNewCollection() Dim c$ = InputBoxE("Enter new collection name:", "Collection name") diff --git a/SCrawler/Editors/GlobalSettingsForm.vb b/SCrawler/Editors/GlobalSettingsForm.vb index 8c5c159..e910646 100644 --- a/SCrawler/Editors/GlobalSettingsForm.vb +++ b/SCrawler/Editors/GlobalSettingsForm.vb @@ -107,7 +107,7 @@ Namespace Editors Private Sub GlobalSettingsForm_Disposed(sender As Object, e As EventArgs) Handles Me.Disposed Automation.Dispose() End Sub - Private Sub ToolbarBttOK() Implements IOkCancelToolbar.ToolbarBttOK + Private Sub OK() Implements IOkCancelToolbar.OK If MyDefs.MyFieldsChecker.AllParamsOK Then With Settings Dim a As Func(Of String, Object, Integer) = @@ -195,14 +195,14 @@ Namespace Editors .ChannelsAddUserImagesFromAllChannels.Value = CH_COPY_CHANNEL_USER_IMAGE_ALL.Checked .ChannelsDefaultTemporary.Value = CH_CHANNELS_USERS_TEMP.Checked - Automation.SaveSetiings() + Automation.SaveSettings() .EndUpdate() End With MyDefs.CloseForm() End If End Sub - Private Sub ToolbarBttCancel() Implements IOkCancelToolbar.ToolbarBttCancel + 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 diff --git a/SCrawler/Editors/LabelsForm.vb b/SCrawler/Editors/LabelsForm.vb index 05bb29d..c0bd450 100644 --- a/SCrawler/Editors/LabelsForm.vb +++ b/SCrawler/Editors/LabelsForm.vb @@ -68,7 +68,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 ToolbarBttOK() Implements IOkCancelToolbar.ToolbarBttOK + Private Sub OK() Implements IOkCancelToolbar.OK Try If MultiUser Then Dim m As New MMessage("You are changing labels for more one user" & vbNewLine & "What do you want to do?", @@ -90,10 +90,10 @@ Friend Class LabelsForm : Implements IOkCancelDeleteToolbar ErrorsDescriber.Execute(EDP.LogMessageValue, ex, "Choosing labels") End Try End Sub - Private Sub ToolbarBttCancel() Implements IOkCancelToolbar.ToolbarBttCancel + Private Sub Cancel() Implements IOkCancelToolbar.Cancel MyDefs.CloseForm(DialogResult.Cancel) End Sub - Private Sub ToolbarBttDelete() Implements IOkCancelDeleteToolbar.ToolbarBttDelete + Private Sub Delete() Implements IOkCancelDeleteToolbar.Delete LabelsList.Clear() MyDefs.CloseForm() End Sub diff --git a/SCrawler/Editors/SiteEditorForm.vb b/SCrawler/Editors/SiteEditorForm.vb index 5079671..a8982b7 100644 --- a/SCrawler/Editors/SiteEditorForm.vb +++ b/SCrawler/Editors/SiteEditorForm.vb @@ -157,7 +157,7 @@ Namespace Editors LBL_AUTH.Dispose() LBL_OTHER.Dispose() End Sub - Private Sub ToolbarBttOK() Implements IOkCancelToolbar.ToolbarBttOK + Private Sub OK() Implements IOkCancelToolbar.OK If MyDefs.MyFieldsChecker.AllParamsOK Then Dim i%, ii% With Host @@ -200,7 +200,7 @@ Namespace Editors MyDefs.CloseForm() End If End Sub - Private Sub ToolbarBttCancel() Implements IOkCancelToolbar.ToolbarBttCancel + 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 diff --git a/SCrawler/Editors/SiteSelectionForm.vb b/SCrawler/Editors/SiteSelectionForm.vb index d20085e..0b6fd4b 100644 --- a/SCrawler/Editors/SiteSelectionForm.vb +++ b/SCrawler/Editors/SiteSelectionForm.vb @@ -39,7 +39,7 @@ Namespace Editors Private Sub SiteSelectionForm_Disposed(sender As Object, e As EventArgs) Handles Me.Disposed SelectedSites.Clear() End Sub - Public Sub ToolbarBttOK() Implements IOkCancelToolbar.ToolbarBttOK + Public Sub OK() Implements IOkCancelToolbar.OK Try SelectedSites.ListAddList(CMB_SITES.Items.CheckedItems.Select(Function(i) CStr(i.Value(0))), LAP.ClearBeforeAdd) MyDefs.CloseForm() @@ -47,7 +47,7 @@ Namespace Editors ErrorsDescriber.Execute(EDP.LogMessageValue, ex) End Try End Sub - Public Sub ToolbarBttCancel() Implements IOkCancelToolbar.ToolbarBttCancel + Public Sub Cancel() Implements IOkCancelToolbar.Cancel MyDefs.CloseForm(DialogResult.Cancel) End Sub End Class diff --git a/SCrawler/Editors/UserCreatorForm.vb b/SCrawler/Editors/UserCreatorForm.vb index 68ac8c6..a334c41 100644 --- a/SCrawler/Editors/UserCreatorForm.vb +++ b/SCrawler/Editors/UserCreatorForm.vb @@ -194,7 +194,7 @@ Namespace Editors Private Function GetSiteByCheckers() As SettingsHost Return If(CMB_SITE.SelectedIndex >= 0, Settings(CStr(CMB_SITE.Items(CMB_SITE.SelectedIndex).Value(0))), Nothing) End Function - Private Sub ToolbarBttOK() Implements IOkCancelToolbar.ToolbarBttOK + Private Sub OK() Implements IOkCancelToolbar.OK If Not CH_ADD_BY_LIST.Checked Then If MyDef.MyFieldsChecker.AllParamsOK Then Dim s As SettingsHost = GetSiteByCheckers() @@ -254,7 +254,7 @@ Namespace Editors CloseForm: MyDef.CloseForm() End Sub - Private Sub ToolbarBttCancel() Implements IOkCancelToolbar.ToolbarBttCancel + Private Sub Cancel() Implements IOkCancelToolbar.Cancel MyDef.CloseForm(IIf(StartIndex >= 0, DialogResult.OK, DialogResult.Cancel)) End Sub Private _TextChangeInvoked As Boolean = False diff --git a/SCrawler/FDatePickerForm.vb b/SCrawler/FDatePickerForm.vb index b71edbe..7261e94 100644 --- a/SCrawler/FDatePickerForm.vb +++ b/SCrawler/FDatePickerForm.vb @@ -40,13 +40,13 @@ Friend Class FDatePickerForm : Implements IOkCancelDeleteToolbar MyDefs.InvokeLoaderError(ex) End Try End Sub - Private Sub ToolbarBttOK() Implements IOkCancelToolbar.ToolbarBttOK + Private Sub OK() Implements IOkCancelToolbar.OK MyDefs.CloseForm() End Sub - Private Sub ToolbarBttCancel() Implements IOkCancelToolbar.ToolbarBttCancel + Private Sub Cancel() Implements IOkCancelToolbar.Cancel MyDefs.CloseForm(DialogResult.Cancel) End Sub - Private Sub ToolbarBttDelete() Implements IOkCancelDeleteToolbar.ToolbarBttDelete + Private Sub Delete() Implements IOkCancelDeleteToolbar.Delete MyDefs.CloseForm(DialogResult.Abort) End Sub End Class \ No newline at end of file diff --git a/SCrawler/MainFrame.vb b/SCrawler/MainFrame.vb index 7d6a164..04c52f3 100644 --- a/SCrawler/MainFrame.vb +++ b/SCrawler/MainFrame.vb @@ -44,6 +44,7 @@ Public Class MainFrame End Sub Private Sub MainFrame_Load(sender As Object, e As EventArgs) Handles Me.Load If _VideoDownloadingMode Then GoTo FormClosingInvoker + If Now.Month = 6 Then Text = "SCrawler: Happy LGBT Pride Month! :-)" Settings.DeleteCachePath() MainFrameObj = New MainFrameObjects(Me) MainFrameObj.ChangeCloseVisible() diff --git a/SCrawler/My Project/AssemblyInfo.vb b/SCrawler/My Project/AssemblyInfo.vb index 6caed7e..c70fe12 100644 --- a/SCrawler/My Project/AssemblyInfo.vb +++ b/SCrawler/My Project/AssemblyInfo.vb @@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices ' by using the '*' as shown below: ' - - + +