2023.12.10.0

YT: move updater functions into the app SCrawler.API.Twitter: update parsing function to new GDL (1.26.4-dev)
AAndyProgram · Dec 10, 2023 · 64d6e6b · 64d6e6b
1 parent da7cddc
commit 64d6e6b
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 11 deletions.
diff --git 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
@@ -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
@@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("2023.12.7.0")>
-<Assembly: AssemblyFileVersion("2023.12.7.0")>
+<Assembly: AssemblyVersion("2023.12.10.0")>
+<Assembly: AssemblyFileVersion("2023.12.10.0")>
 <Assembly: NeutralResourcesLanguage("en")>
diff --git 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
@@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("2023.12.7.0")>
-<Assembly: AssemblyFileVersion("2023.12.7.0")>
+<Assembly: AssemblyVersion("2023.12.10.0")>
+<Assembly: AssemblyFileVersion("2023.12.10.0")>
 <Assembly: NeutralResourcesLanguage("en")>
diff --git 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
@@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("2023.12.7.0")>
-<Assembly: AssemblyFileVersion("2023.12.7.0")>
+<Assembly: AssemblyVersion("2023.12.10.0")>
+<Assembly: AssemblyFileVersion("2023.12.10.0")>
 <Assembly: NeutralResourcesLanguage("en")>