Skip to content

Commit e285de1

Browse files
committed
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
1 parent 26db0e3 commit e285de1

9 files changed

Lines changed: 54 additions & 25 deletions

File tree

Changelog.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
# 2024.8.10.0
2+
3+
*2024-08-10*
4+
5+
- Added
6+
- Feed: button to open file folder
7+
- Updated
8+
- yt-dlp up to version **2024.08.06**
9+
- gallery-dl up to version **1.27.2**
10+
- Fixed
11+
- YouTube (standalone app): **video is being parsed using cookies but is not downloading** *(Issue #205)*
12+
113
# 2024.8.1.0
214

315
*2024-08-01*

SCrawler.YouTube/Controls/VideoOptionsForm.vb

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ Namespace API.YouTube.Controls
3232
Private Initialization As Boolean = True
3333
Private ReadOnly InheritsFromContainer As Boolean
3434
Private ReadOnly M3U8Files As List(Of SFile)
35+
Friend Property UseCookies As Boolean = False
3536
Private ReadOnly Property M3U8FilesFull As List(Of SFile)
3637
Get
3738
Return ListAddList(Nothing, M3U8Files, LAP.NotContainsOnly).ListAddValue(CMB_PLS.Text, LAP.NotContainsOnly)
@@ -65,6 +66,7 @@ Namespace API.YouTube.Controls
6566
CNT_PROCESSOR = New TableControlsProcessor(TP_CONTROLS)
6667
Me.InheritsFromContainer = InheritsFromContainer
6768
MyFieldsChecker = New FieldsChecker
69+
UseCookies = MyYouTubeSettings.DefaultUseCookies
6870
End Sub
6971
#End Region
7072
#Region "Form handlers"
@@ -227,7 +229,7 @@ Namespace API.YouTube.Controls
227229
Dim data As IEnumerable(Of Control)
228230

229231
If .HasElements Then
230-
data = .Elements.Select(Function(ee) New MediaItem(ee, True) With {.Dock = DockStyle.Fill, .Checked = ee.Checked})
232+
data = .Elements.Select(Function(ee) New MediaItem(ee, True) With {.Dock = DockStyle.Fill, .Checked = ee.Checked, .UseCookies = UseCookies})
231233
Else
232234
data = (From m As MediaObject In .Self.MediaObjects
233235
Where m.Type = __contentType

SCrawler.YouTube/Downloader/MediaItem.vb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,7 @@ Namespace DownloadObjects.STDownloader
437437
Else
438438
RaiseEvent BeforeOpenEditor(Me, MyContainer)
439439
End If
440-
Using f As New VideoOptionsForm(MyContainer, initProtected Or isFull)
440+
Using f As New VideoOptionsForm(MyContainer, initProtected Or isFull) With {.UseCookies = UseCookies}
441441
f.ShowDialog()
442442
.Protected = IIf(f.DialogResult = DialogResult.OK, True, initProtected)
443443
End Using
@@ -465,12 +465,12 @@ Namespace DownloadObjects.STDownloader
465465
If Not MyContainer Is Nothing Then
466466
Dim f As Form = Nothing
467467
Select Case MyContainer.ObjectType
468-
Case Base.YouTubeMediaType.Single : f = New VideoOptionsForm(MyContainer, True)
468+
Case Base.YouTubeMediaType.Single : f = New VideoOptionsForm(MyContainer, True) With {.UseCookies = UseCookies}
469469
Case Base.YouTubeMediaType.Channel, Base.YouTubeMediaType.PlayList
470470
If MyContainer.IsMusic Then
471471
f = New MusicPlaylistsForm(MyContainer)
472472
Else
473-
f = New VideoOptionsForm(MyContainer, True)
473+
f = New VideoOptionsForm(MyContainer, True) With {.UseCookies = UseCookies}
474474
End If
475475
End Select
476476
If Not f Is Nothing Then

SCrawler.YouTube/Downloader/VideoListForm.vb

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,8 @@ Namespace DownloadObjects.STDownloader
132132
#End Region
133133
#Region "Controls"
134134
Protected Sub ControlCreateAndAdd(ByVal Container As IYouTubeMediaContainer, Optional ByVal DisableDownload As Boolean = False,
135-
Optional ByVal PerformClick As Boolean = True, Optional ByVal IsLoading As Boolean = False)
135+
Optional ByVal PerformClick As Boolean = True, Optional ByVal IsLoading As Boolean = False,
136+
Optional ByVal UseCookies As Boolean = False)
136137
ControlInvokeFast(TP_CONTROLS, Sub()
137138
With TP_CONTROLS
138139
.SuspendLayout()
@@ -142,7 +143,7 @@ Namespace DownloadObjects.STDownloader
142143
.RowStyles.Insert(0, New RowStyle(SizeType.Absolute, 60))
143144
.RowCount = .RowStyles.Count
144145
OffsetControls(0, True)
145-
Dim cnt As New MediaItem(Container) With {.Dock = DockStyle.Fill, .Margin = New Padding(0)}
146+
Dim cnt As New MediaItem(Container) With {.Dock = DockStyle.Fill, .Margin = New Padding(0), .UseCookies = UseCookies}
146147
AddHandler cnt.FileDownloaded, AddressOf MediaControl_FileDownloaded
147148
AddHandler cnt.Removal, AddressOf MediaControl_Removal
148149
AddHandler cnt.DownloadAgain, AddressOf MediaControl_DownloadAgain
@@ -333,19 +334,19 @@ Namespace DownloadObjects.STDownloader
333334
If Not c Is Nothing Then
334335
Dim f As Form
335336
Select Case c.ObjectType
336-
Case YouTubeMediaType.Single : f = New VideoOptionsForm(c)
337+
Case YouTubeMediaType.Single : f = New VideoOptionsForm(c) With {.UseCookies = useCookies}
337338
Case YouTubeMediaType.Channel, YouTubeMediaType.PlayList
338339
If c.IsMusic Then
339340
f = New MusicPlaylistsForm(c)
340341
Else
341-
f = New VideoOptionsForm(c)
342+
f = New VideoOptionsForm(c) With {.UseCookies = useCookies}
342343
End If
343344
Case Else : c.Dispose() : Throw New ArgumentException($"Object type {c.ObjectType} not implemented", "IYouTubeMediaContainer.ObjectType")
344345
End Select
345346
If Not f Is Nothing Then
346347
If TypeOf f Is IDesignXMLContainer Then DirectCast(f, IDesignXMLContainer).DesignXML = DesignXML
347348
f.ShowDialog()
348-
If f.DialogResult = DialogResult.OK AndAlso ValidateContainerURL(c) Then ControlCreateAndAdd(c, disableDown)
349+
If f.DialogResult = DialogResult.OK AndAlso ValidateContainerURL(c) Then ControlCreateAndAdd(c, disableDown,,, useCookies)
349350
f.Dispose()
350351
End If
351352
End If

SCrawler.YouTube/My Project/AssemblyInfo.vb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices
3232
' by using the '*' as shown below:
3333
' <Assembly: AssemblyVersion("1.0.*")>
3434

35-
<Assembly: AssemblyVersion("2024.7.24.0")>
36-
<Assembly: AssemblyFileVersion("2024.7.24.0")>
35+
<Assembly: AssemblyVersion("2024.8.10.0")>
36+
<Assembly: AssemblyFileVersion("2024.8.10.0")>
3737
<Assembly: NeutralResourcesLanguage("en")>

SCrawler.YouTubeDownloader/My Project/AssemblyInfo.vb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices
3232
' by using the '*' as shown below:
3333
' <Assembly: AssemblyVersion("1.0.*")>
3434

35-
<Assembly: AssemblyVersion("2024.7.24.0")>
36-
<Assembly: AssemblyFileVersion("2024.7.24.0")>
35+
<Assembly: AssemblyVersion("2024.8.10.0")>
36+
<Assembly: AssemblyFileVersion("2024.8.10.0")>
3737
<Assembly: NeutralResourcesLanguage("en")>

SCrawler/Download/Feed/FeedMedia.Designer.vb

Lines changed: 17 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

SCrawler/Download/Feed/FeedMedia.vb

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,7 @@ Namespace DownloadObjects
178178
BTT_CONTEXT_DOWN.Visible = True
179179
CONTEXT_SEP_0.Visible = True
180180
BTT_CONTEXT_OPEN_USER.Visible = False
181+
BTT_CONTEXT_OPEN_FILE_FOLDER.Visible = False
181182
CONTEXT_SEP_5.Visible = False
182183
BTT_CONTEXT_DELETE.Visible = False
183184

@@ -416,8 +417,12 @@ Namespace DownloadObjects
416417
End Sub
417418
#End Region
418419
#Region "Open media, folder"
419-
Private Sub BTT_CONTEXT_OPEN_MEDIA_Click(sender As Object, e As EventArgs) Handles BTT_CONTEXT_OPEN_MEDIA.Click
420-
File.Open()
420+
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
421+
If Not sender Is Nothing AndAlso sender Is BTT_CONTEXT_OPEN_FILE_FOLDER Then
422+
GlobalOpenPath(File)
423+
Else
424+
File.Open()
425+
End If
421426
End Sub
422427
Private Sub BTT_CONTEXT_OPEN_USER_Click(sender As Object, e As EventArgs) Handles BTT_CONTEXT_OPEN_USER.Click
423428
If Not UserKey.IsEmptyString Then

SCrawler/My Project/AssemblyInfo.vb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices
3232
' by using the '*' as shown below:
3333
' <Assembly: AssemblyVersion("1.0.*")>
3434

35-
<Assembly: AssemblyVersion("2024.8.1.0")>
36-
<Assembly: AssemblyFileVersion("2024.8.1.0")>
35+
<Assembly: AssemblyVersion("2024.8.10.0")>
36+
<Assembly: AssemblyFileVersion("2024.8.10.0")>
3737
<Assembly: NeutralResourcesLanguage("en")>

0 commit comments

Comments
 (0)