From 64d6e6b28ca02704608814ac7939775a21564640 Mon Sep 17 00:00:00 2001 From: Andy <88590076+AAndyProgram@users.noreply.github.com> Date: Sun, 10 Dec 2023 10:16:58 +0300 Subject: [PATCH] 2023.12.10.0 YT: move updater functions into the app SCrawler.API.Twitter: update parsing function to new GDL (1.26.4-dev) --- Changelog.md | 9 +++++++++ SCrawler.YouTube/Downloader/VideoListForm.vb | 7 ++++--- SCrawler.YouTube/My Project/AssemblyInfo.vb | 4 ++-- SCrawler.YouTubeDownloader/MainFrame.vb | 2 ++ SCrawler.YouTubeDownloader/My Project/AssemblyInfo.vb | 4 ++-- SCrawler/API/Twitter/UserData.vb | 9 +++++++-- SCrawler/My Project/AssemblyInfo.vb | 4 ++-- 7 files changed, 28 insertions(+), 11 deletions(-) diff --git a/Changelog.md b/Changelog.md index 3efd15b..b3369e7 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,3 +1,12 @@ +# 2023.12.10.0 + +*2023-12-10* + +- Updated + - gallery-dl up to version 1.26.4-dev +- Fixed + - Twitter: data is not downloading + # 2023.12.7.0 *2023-12-07* diff --git a/SCrawler.YouTube/Downloader/VideoListForm.vb b/SCrawler.YouTube/Downloader/VideoListForm.vb index aadeca3..a06ffe7 100644 --- a/SCrawler.YouTube/Downloader/VideoListForm.vb +++ b/SCrawler.YouTube/Downloader/VideoListForm.vb @@ -59,8 +59,6 @@ Namespace DownloadObjects.STDownloader MyDownloaderSettings = MyYouTubeSettings End If - CheckVersion(False) - With MyView : .Import() : .SetFormSize() : End With BTT_DELETE.Enabled = False If Not AppMode Then @@ -444,7 +442,10 @@ Namespace DownloadObjects.STDownloader Try : Process.Start("https://github.com/AAndyProgram/SCrawler/blob/main/HowToSupport.md") : Catch : End Try End Sub Private Sub BTT_INFO_Click(sender As Object, e As EventArgs) Handles BTT_INFO.Click - CheckVersion(True) + CheckVersionImpl(True) + End Sub + Protected Sub CheckVersionImpl(ByVal Force As Boolean) + CheckVersion(Force) End Sub Protected Overloads Sub RemoveControls(Optional ByVal Predicate As Predicate(Of MediaItem) = Nothing, Optional ByVal RemoveFiles As Boolean = False) ControlInvokeFast(TP_CONTROLS, Sub() diff --git a/SCrawler.YouTube/My Project/AssemblyInfo.vb b/SCrawler.YouTube/My Project/AssemblyInfo.vb index f495393..9f55f25 100644 --- a/SCrawler.YouTube/My Project/AssemblyInfo.vb +++ b/SCrawler.YouTube/My Project/AssemblyInfo.vb @@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices ' by using the '*' as shown below: ' - - + + diff --git a/SCrawler.YouTubeDownloader/MainFrame.vb b/SCrawler.YouTubeDownloader/MainFrame.vb index 07de683..28c31c1 100644 --- a/SCrawler.YouTubeDownloader/MainFrame.vb +++ b/SCrawler.YouTubeDownloader/MainFrame.vb @@ -20,6 +20,8 @@ Public Class MainFrame Protected Overrides Sub VideoListForm_Load(sender As Object, e As EventArgs) MyBase.VideoListForm_Load(sender, e) TRAY_ICON.Visible = MyYouTubeSettings.CloseToTray + CheckNewReleaseFolder() + CheckVersionImpl(False) End Sub Private _CloseInvoked As Boolean = False Private _IgnoreTrayOptions As Boolean = False diff --git a/SCrawler.YouTubeDownloader/My Project/AssemblyInfo.vb b/SCrawler.YouTubeDownloader/My Project/AssemblyInfo.vb index 59f8d91..eff70b9 100644 --- a/SCrawler.YouTubeDownloader/My Project/AssemblyInfo.vb +++ b/SCrawler.YouTubeDownloader/My Project/AssemblyInfo.vb @@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices ' by using the '*' as shown below: ' - - + + diff --git a/SCrawler/API/Twitter/UserData.vb b/SCrawler/API/Twitter/UserData.vb index 89b86f0..ab70e52 100644 --- a/SCrawler/API/Twitter/UserData.vb +++ b/SCrawler/API/Twitter/UserData.vb @@ -136,7 +136,9 @@ Namespace API.Twitter Private Function GetContainerSubnodes() As List(Of String()) Return New List(Of String()) From { {{"content", "itemContent", "tweet_results", "result", "legacy"}}, - {{"content", "itemContent", "tweet_results", "result", "tweet", "legacy"}} + {{"content", "itemContent", "tweet_results", "result", "tweet", "legacy"}}, + {{"item", "itemContent", "tweet_results", "result", "legacy"}}, + {{"item", "itemContent", "tweet_results", "result", "tweet", "legacy"}} } End Function Protected Overrides Sub DownloadDataF(ByVal Token As CancellationToken) @@ -168,6 +170,7 @@ Namespace API.Twitter Dim pinNode As Predicate(Of EContainer) = Function(ee) ee.Value("type").StringToLower = "timelinepinentry" Dim entriesNode As Predicate(Of EContainer) = Function(ee) ee.Name = "entries" Or ee.Name = entry Dim sourceIdPredicate As Predicate(Of EContainer) = Function(ee) ee.Name = "source_user_id_str" Or ee.Name = "source_user_id" + Dim newTwitterNodes() As Object = {0, "content", "items"} Dim p As Predicate(Of EContainer) Dim pIndx% Dim isOneNode As Boolean, isPins As Boolean, ExistsDetected As Boolean, userInfoParsed As Boolean = False @@ -308,7 +311,9 @@ Namespace API.Twitter ProgressPre.Perform() If Not __parseContainer(.Self) Then Exit For Else - For Each tmpNode In .Self + For Each tmpNode In If(If(.ItemF(newTwitterNodes)?.Count, 0) > 0, + .ItemF(newTwitterNodes), + .Self) ProgressPre.Perform() If Not __parseContainer(tmpNode) Then Exit For Next diff --git a/SCrawler/My Project/AssemblyInfo.vb b/SCrawler/My Project/AssemblyInfo.vb index 47f162c..38dfdf9 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: ' - - + +