2024.8.10.0

YT Fix bug when video is parsed using cookies but not downloaded SCrawler Feed: add a button to open file folder
AAndyProgram · Aug 10, 2024 · e285de1 · e285de1
1 parent 26db0e3
commit e285de1
Show file tree

Hide file tree

Showing 9 changed files with 54 additions and 25 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -1,3 +1,15 @@
+# 2024.8.10.0
+
+*2024-08-10*
+
+- Added
+ - Feed: button to open file folder
+- Updated
+ - yt-dlp up to version **2024.08.06**
+ - gallery-dl up to version **1.27.2**
+- Fixed
+ - YouTube (standalone app): **video is being parsed using cookies but is not downloading** *(Issue #205)*
+
 # 2024.8.1.0
 
 *2024-08-01*

diff --git a/SCrawler.YouTube/Controls/VideoOptionsForm.vb b/SCrawler.YouTube/Controls/VideoOptionsForm.vb
@@ -32,6 +32,7 @@ Namespace API.YouTube.Controls
  Private Initialization As Boolean = True
  Private ReadOnly InheritsFromContainer As Boolean
  Private ReadOnly M3U8Files As List(Of SFile)
+ Friend Property UseCookies As Boolean = False
  Private ReadOnly Property M3U8FilesFull As List(Of SFile)
  Get
  Return ListAddList(Nothing, M3U8Files, LAP.NotContainsOnly).ListAddValue(CMB_PLS.Text, LAP.NotContainsOnly)
@@ -65,6 +66,7 @@ Namespace API.YouTube.Controls
  CNT_PROCESSOR = New TableControlsProcessor(TP_CONTROLS)
  Me.InheritsFromContainer = InheritsFromContainer
  MyFieldsChecker = New FieldsChecker
+ UseCookies = MyYouTubeSettings.DefaultUseCookies
  End Sub
 #End Region
 #Region "Form handlers"
@@ -227,7 +229,7 @@ Namespace API.YouTube.Controls
  Dim data As IEnumerable(Of Control)
 
  If .HasElements Then
- data = .Elements.Select(Function(ee) New MediaItem(ee, True) With {.Dock = DockStyle.Fill, .Checked = ee.Checked})
+ data = .Elements.Select(Function(ee) New MediaItem(ee, True) With {.Dock = DockStyle.Fill, .Checked = ee.Checked, .UseCookies = UseCookies})
  Else
  data = (From m As MediaObject In .Self.MediaObjects
  Where m.Type = __contentType

diff --git a/SCrawler.YouTube/Downloader/MediaItem.vb b/SCrawler.YouTube/Downloader/MediaItem.vb
@@ -437,7 +437,7 @@ Namespace DownloadObjects.STDownloader
  Else
  RaiseEvent BeforeOpenEditor(Me, MyContainer)
  End If
- Using f As New VideoOptionsForm(MyContainer, initProtected Or isFull)
+ Using f As New VideoOptionsForm(MyContainer, initProtected Or isFull) With {.UseCookies = UseCookies}
  f.ShowDialog()
  .Protected = IIf(f.DialogResult = DialogResult.OK, True, initProtected)
  End Using
@@ -465,12 +465,12 @@ Namespace DownloadObjects.STDownloader
  If Not MyContainer Is Nothing Then
  Dim f As Form = Nothing
  Select Case MyContainer.ObjectType
- Case Base.YouTubeMediaType.Single : f = New VideoOptionsForm(MyContainer, True)
+ Case Base.YouTubeMediaType.Single : f = New VideoOptionsForm(MyContainer, True) With {.UseCookies = UseCookies}
  Case Base.YouTubeMediaType.Channel, Base.YouTubeMediaType.PlayList
  If MyContainer.IsMusic Then
  f = New MusicPlaylistsForm(MyContainer)
  Else
- f = New VideoOptionsForm(MyContainer, True)
+ f = New VideoOptionsForm(MyContainer, True) With {.UseCookies = UseCookies}
  End If
  End Select
  If Not f Is Nothing Then

diff --git a/SCrawler.YouTube/Downloader/VideoListForm.vb b/SCrawler.YouTube/Downloader/VideoListForm.vb
@@ -132,7 +132,8 @@ Namespace DownloadObjects.STDownloader
 #End Region
 #Region "Controls"
  Protected Sub ControlCreateAndAdd(ByVal Container As IYouTubeMediaContainer, Optional ByVal DisableDownload As Boolean = False,
- Optional ByVal PerformClick As Boolean = True, Optional ByVal IsLoading As Boolean = False)
+ Optional ByVal PerformClick As Boolean = True, Optional ByVal IsLoading As Boolean = False,
+ Optional ByVal UseCookies As Boolean = False)
  ControlInvokeFast(TP_CONTROLS, Sub()
  With TP_CONTROLS
  .SuspendLayout()
@@ -142,7 +143,7 @@ Namespace DownloadObjects.STDownloader
  .RowStyles.Insert(0, New RowStyle(SizeType.Absolute, 60))
  .RowCount = .RowStyles.Count
  OffsetControls(0, True)
- Dim cnt As New MediaItem(Container) With {.Dock = DockStyle.Fill, .Margin = New Padding(0)}
+ Dim cnt As New MediaItem(Container) With {.Dock = DockStyle.Fill, .Margin = New Padding(0), .UseCookies = UseCookies}
  AddHandler cnt.FileDownloaded, AddressOf MediaControl_FileDownloaded
  AddHandler cnt.Removal, AddressOf MediaControl_Removal
  AddHandler cnt.DownloadAgain, AddressOf MediaControl_DownloadAgain
@@ -333,19 +334,19 @@ Namespace DownloadObjects.STDownloader
  If Not c Is Nothing Then
  Dim f As Form
  Select Case c.ObjectType
- Case YouTubeMediaType.Single : f = New VideoOptionsForm(c)
+ Case YouTubeMediaType.Single : f = New VideoOptionsForm(c) With {.UseCookies = useCookies}
  Case YouTubeMediaType.Channel, YouTubeMediaType.PlayList
  If c.IsMusic Then
  f = New MusicPlaylistsForm(c)
  Else
- f = New VideoOptionsForm(c)
+ f = New VideoOptionsForm(c) With {.UseCookies = useCookies}
  End If
  Case Else : c.Dispose() : Throw New ArgumentException($"Object type {c.ObjectType} not implemented", "IYouTubeMediaContainer.ObjectType")
  End Select
  If Not f Is Nothing Then
  If TypeOf f Is IDesignXMLContainer Then DirectCast(f, IDesignXMLContainer).DesignXML = DesignXML
  f.ShowDialog()
- If f.DialogResult = DialogResult.OK AndAlso ValidateContainerURL(c) Then ControlCreateAndAdd(c, disableDown)
+ If f.DialogResult = DialogResult.OK AndAlso ValidateContainerURL(c) Then ControlCreateAndAdd(c, disableDown,,, useCookies)
  f.Dispose()
  End If
  End If

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("2024.7.24.0")>
-<Assembly: AssemblyFileVersion("2024.7.24.0")>
+<Assembly: AssemblyVersion("2024.8.10.0")>
+<Assembly: AssemblyFileVersion("2024.8.10.0")>
 <Assembly: NeutralResourcesLanguage("en")>
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("2024.7.24.0")>
-<Assembly: AssemblyFileVersion("2024.7.24.0")>
+<Assembly: AssemblyVersion("2024.8.10.0")>
+<Assembly: AssemblyFileVersion("2024.8.10.0")>
 <Assembly: NeutralResourcesLanguage("en")>
diff --git a/SCrawler/Download/Feed/FeedMedia.Designer.vb b/SCrawler/Download/Feed/FeedMedia.Designer.vb
diff --git a/SCrawler/Download/Feed/FeedMedia.vb b/SCrawler/Download/Feed/FeedMedia.vb
@@ -178,6 +178,7 @@ Namespace DownloadObjects
  BTT_CONTEXT_DOWN.Visible = True
  CONTEXT_SEP_0.Visible = True
  BTT_CONTEXT_OPEN_USER.Visible = False
+ BTT_CONTEXT_OPEN_FILE_FOLDER.Visible = False
  CONTEXT_SEP_5.Visible = False
  BTT_CONTEXT_DELETE.Visible = False
 
@@ -416,8 +417,12 @@ Namespace DownloadObjects
  End Sub
 #End Region
 #Region "Open media, folder"
- Private Sub BTT_CONTEXT_OPEN_MEDIA_Click(sender As Object, e As EventArgs) Handles BTT_CONTEXT_OPEN_MEDIA.Click
- File.Open()
+ Private Sub BTT_CONTEXT_OPEN_MEDIA_Click(sender As Object, e As EventArgs) Handles BTT_CONTEXT_OPEN_MEDIA.Click, BTT_CONTEXT_OPEN_FILE_FOLDER.Click
+ If Not sender Is Nothing AndAlso sender Is BTT_CONTEXT_OPEN_FILE_FOLDER Then
+ GlobalOpenPath(File)
+ Else
+ File.Open()
+ End If
  End Sub
  Private Sub BTT_CONTEXT_OPEN_USER_Click(sender As Object, e As EventArgs) Handles BTT_CONTEXT_OPEN_USER.Click
  If Not UserKey.IsEmptyString Then

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("2024.8.1.0")>
-<Assembly: AssemblyFileVersion("2024.8.1.0")>
+<Assembly: AssemblyVersion("2024.8.10.0")>
+<Assembly: AssemblyFileVersion("2024.8.10.0")>
 <Assembly: NeutralResourcesLanguage("en")>