2026.10.26.0

YT Exclude AI from results and correct handling SC API.UserDataBase: force put text into the 'text' folder API.Instagram: fix saved posts API.OnlyFans: text posts are not downloading API.Xhamster: correct processing progress
2026-11-10 05:35:25 +00:00 · 2026-10-26 17:59:40 +03:00
parent 51d8326807
commit 59dacf67bd
17 changed files with 266 additions and 76 deletions
--- a/SCrawler.YouTube/Controls/VideoOption.Designer.vb
+++ b/SCrawler.YouTube/Controls/VideoOption.Designer.vb
@@ -22,37 +22,36 @@ Namespace API.YouTube.Controls
        Private components As System.ComponentModel.IContainer
        <System.Diagnostics.DebuggerStepThrough()>
        Private Sub InitializeComponent()
-            Dim TP_MAIN As System.Windows.Forms.TableLayoutPanel
+            Me.TP_MAIN = New System.Windows.Forms.TableLayoutPanel()
            Me.OPT_CHECKED = New System.Windows.Forms.RadioButton()
            Me.LBL_DEFINITION_INFO = New System.Windows.Forms.Label()
            Me.LBL_DEFINITION = New System.Windows.Forms.Label()
            Me.LBL_CODECS = New System.Windows.Forms.Label()
            Me.LBL_SIZE = New System.Windows.Forms.Label()
-            TP_MAIN = New System.Windows.Forms.TableLayoutPanel()
-            TP_MAIN.SuspendLayout()
+            Me.TP_MAIN.SuspendLayout()
            Me.SuspendLayout()
            '
            'TP_MAIN
            '
-            TP_MAIN.ColumnCount = 5
-            TP_MAIN.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 36.0!))
-            TP_MAIN.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 110.0!))
-            TP_MAIN.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 58.0!))
-            TP_MAIN.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100.0!))
-            TP_MAIN.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 71.0!))
-            TP_MAIN.Controls.Add(Me.OPT_CHECKED, 0, 0)
-            TP_MAIN.Controls.Add(Me.LBL_DEFINITION_INFO, 1, 0)
-            TP_MAIN.Controls.Add(Me.LBL_DEFINITION, 2, 0)
-            TP_MAIN.Controls.Add(Me.LBL_CODECS, 3, 0)
-            TP_MAIN.Controls.Add(Me.LBL_SIZE, 4, 0)
-            TP_MAIN.Dock = System.Windows.Forms.DockStyle.Fill
-            TP_MAIN.Location = New System.Drawing.Point(0, 0)
-            TP_MAIN.Margin = New System.Windows.Forms.Padding(0)
-            TP_MAIN.Name = "TP_MAIN"
-            TP_MAIN.RowCount = 1
-            TP_MAIN.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100.0!))
-            TP_MAIN.Size = New System.Drawing.Size(459, 30)
-            TP_MAIN.TabIndex = 0
+            Me.TP_MAIN.ColumnCount = 5
+            Me.TP_MAIN.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 36.0!))
+            Me.TP_MAIN.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 110.0!))
+            Me.TP_MAIN.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 58.0!))
+            Me.TP_MAIN.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100.0!))
+            Me.TP_MAIN.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 71.0!))
+            Me.TP_MAIN.Controls.Add(Me.OPT_CHECKED, 0, 0)
+            Me.TP_MAIN.Controls.Add(Me.LBL_DEFINITION_INFO, 1, 0)
+            Me.TP_MAIN.Controls.Add(Me.LBL_DEFINITION, 2, 0)
+            Me.TP_MAIN.Controls.Add(Me.LBL_CODECS, 3, 0)
+            Me.TP_MAIN.Controls.Add(Me.LBL_SIZE, 4, 0)
+            Me.TP_MAIN.Dock = System.Windows.Forms.DockStyle.Fill
+            Me.TP_MAIN.Location = New System.Drawing.Point(0, 0)
+            Me.TP_MAIN.Margin = New System.Windows.Forms.Padding(0)
+            Me.TP_MAIN.Name = "TP_MAIN"
+            Me.TP_MAIN.RowCount = 1
+            Me.TP_MAIN.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100.0!))
+            Me.TP_MAIN.Size = New System.Drawing.Size(459, 30)
+            Me.TP_MAIN.TabIndex = 0
            '
            'OPT_CHECKED
            '
@@ -115,11 +114,11 @@ Namespace API.YouTube.Controls
            '
            Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
            Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-            Me.Controls.Add(TP_MAIN)
+            Me.Controls.Add(Me.TP_MAIN)
            Me.Name = "VideoOption"
            Me.Size = New System.Drawing.Size(459, 30)
-            TP_MAIN.ResumeLayout(False)
-            TP_MAIN.PerformLayout()
+            Me.TP_MAIN.ResumeLayout(False)
+            Me.TP_MAIN.PerformLayout()
            Me.ResumeLayout(False)

        End Sub
@@ -128,5 +127,6 @@ Namespace API.YouTube.Controls
        Private WithEvents LBL_DEFINITION As Label
        Private WithEvents LBL_CODECS As Label
        Private WithEvents LBL_SIZE As Label
+        Private WithEvents TP_MAIN As TableLayoutPanel
    End Class
 End Namespace
--- a/SCrawler.YouTube/Controls/VideoOption.resx
+++ b/SCrawler.YouTube/Controls/VideoOption.resx
@@ -117,7 +117,4 @@
  <resheader name="writer">
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
-  <metadata name="TP_MAIN.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </metadata>
 </root>
--- a/SCrawler.YouTube/Controls/VideoOption.vb
+++ b/SCrawler.YouTube/Controls/VideoOption.vb
@@ -8,10 +8,14 @@
 ' but WITHOUT ANY WARRANTY
 Imports System.ComponentModel
 Imports SCrawler.API.YouTube.Base
+Imports SCrawler.API.YouTube.Objects
+Imports UMTypes = SCrawler.Plugin.UserMediaTypes
 Namespace API.YouTube.Controls
    <DefaultEvent("CheckedChanged"), DesignTimeVisible(False), ToolboxItem(False)>
    Friend Class VideoOption : Implements ISupportInitialize
        Friend Event CheckedChanged As EventHandler
+        Private Const DRC As String = YouTubeMediaContainerBase.DRC
+        Private Const StringDelimiter As String = " " & ChrW(183) & " "
        <Browsable(False)> Friend Property MyMedia As MediaObject
        <Browsable(False)> Friend Property Checked As Boolean
            Get
@@ -21,16 +25,43 @@ Namespace API.YouTube.Controls
                OPT_CHECKED.Checked = _Checked
            End Set
        End Property
+        <Browsable(False)> Friend ReadOnly Property ContentType As UMTypes
+            Get
+                If MyMedia.Type = UMTypes.Audio Then
+                    Return UMTypes.Audio
+                ElseIf MyMedia.Type = UMTypes.Video Or MyMedia.Type = YouTubeMediaContainerBase.TypeAudioVideo Then
+                    Return UMTypes.Video
+                Else
+                    Return UMTypes.Undefined
+                End If
+            End Get
+        End Property
+        Private _CodecLength As Integer = 0
+        <Browsable(False)> Friend ReadOnly Property CodecLengthBase As Integer
+            Get
+                With TP_MAIN.ColumnStyles
+                    Return .Item(0).Width + .Item(1).Width + .Item(2).Width + .Item(4).Width
+                End With
+            End Get
+        End Property
+        <Browsable(False)> Friend ReadOnly Property CodecLength As Integer
+            Get
+                Return Math.Max(LBL_CODECS.PreferredWidth, _CodecLength)
+            End Get
+        End Property
+        Friend Sub SetAudioChangingHandler(ByVal obj As VideoOptionsForm)
+            AddHandler obj.AudioIndexChanged, AddressOf AudioChanged
+        End Sub
        Friend Sub New()
            InitializeComponent()
        End Sub
        Friend Sub New(ByVal m As MediaObject, Optional ByVal SelectedAudio As MediaObject = Nothing)
            Me.New
-            Const d$ = " " & ChrW(183) & " "
-            Const DRC$ = Objects.YouTubeMediaContainerBase.DRC
            MyMedia = m
            If m.Type = Plugin.UserMediaTypes.Audio Then
-                If m.Bitrate >= 320 Then
+                If Not m.FormatQuality.IsEmptyString Then
+                    LBL_DEFINITION_INFO.Text = $"{m.FormatQuality.ToUpperFirstChar} Quality"
+                ElseIf m.Bitrate >= 320 Then
                    LBL_DEFINITION_INFO.Text = "High Quality"
                ElseIf m.Bitrate >= 190 Then
                    LBL_DEFINITION_INFO.Text = "Medium Quality"
@@ -38,8 +69,8 @@ Namespace API.YouTube.Controls
                    LBL_DEFINITION_INFO.Text = "Low Quality"
                End If
                LBL_DEFINITION.Text = $"{m.Bitrate}k"
-                LBL_CODECS.Text = $"{m.Extension} {d} {m.Codec} {d} {m.Bitrate}k"
-                If Not m.ID.IsEmptyString AndAlso m.ID.StringToLower.Contains(DRC) Then LBL_CODECS.Text &= $" {d} DRC"
+                'LBL_CODECS.Text = $"{m.Extension} {d} {m.Codec} {d} {m.Bitrate}k{If(m.LanguageCaption.IsEmptyString, String.Empty, $" {d} {m.LanguageCaption}")}"
+                'If Not m.ID.IsEmptyString AndAlso m.ID.StringToLower.Contains(DRC) Then LBL_CODECS.Text &= $" {d} DRC"
            Else
                If m.Height >= 1440 Then
                    LBL_DEFINITION_INFO.Text = "Ultra High Definition"
@@ -53,11 +84,13 @@ Namespace API.YouTube.Controls
                    LBL_DEFINITION_INFO.Text = "Low Definition"
                End If
                LBL_DEFINITION.Text = $"{m.Height}p"
-                LBL_CODECS.Text = $"{m.Extension.StringToUpper}{d}{m.Codec.StringToUpper}{d}{m.FPS}fps{d}{m.Bitrate}k"
-                If Not m.Protocol.IsEmptyString Then LBL_CODECS.Text &= $" ({m.Protocol})"
-                If Not m.ID.IsEmptyString AndAlso m.ID.StringToLower.Contains(DRC) Then LBL_CODECS.Text &= $"{d}DRC"
-                If Not SelectedAudio.ID.IsEmptyString Then LBL_CODECS.Text &= $" / {SelectedAudio.Extension}{d}{SelectedAudio.Codec}{d}{SelectedAudio.Bitrate}k"
-                If Not SelectedAudio.ID.IsEmptyString AndAlso SelectedAudio.ID.StringToLower.Contains(DRC) Then LBL_CODECS.Text &= $"{d}DRC"
+                'LBL_CODECS.Text = $"{m.Extension.StringToUpper}{d}{m.Codec.StringToUpper}{d}{m.FPS}fps{d}{m.Bitrate}k"
+                'If Not m.Protocol.IsEmptyString Then LBL_CODECS.Text &= $" ({m.Protocol})"
+                'If Not m.ID.IsEmptyString AndAlso m.ID.StringToLower.Contains(DRC) Then LBL_CODECS.Text &= $"{d}DRC"
+                'With SelectedAudio
+                '    If Not .ID.IsEmptyString Then LBL_CODECS.Text &= $" / {If(.LanguageCaption.IsEmptyString, String.Empty, $"{ .LanguageCaption} {d}")}{ .Bitrate}k ({ .Extension}, { .Codec})"
+                '    If Not .ID.IsEmptyString AndAlso .ID.StringToLower.Contains(DRC) Then LBL_CODECS.Text &= $"{d}DRC"
+                'End With

                If MyYouTubeSettings.DefaultVideoHighlightFPS_H > 0 AndAlso m.FPS > MyYouTubeSettings.DefaultVideoHighlightFPS_H Then _
                   BackColor = MyColor.DeleteBack : ForeColor = MyColor.DeleteFore
@@ -65,6 +98,8 @@ Namespace API.YouTube.Controls
                   BackColor = MyColor.UpdateBack : ForeColor = MyColor.UpdateFore
            End If

+            GenerateInfoCaption(SelectedAudio)
+
            Dim sv% = m.Size / 1024
            If sv >= 1000 Then
                LBL_SIZE.Text = AConvert(Of String)(sv / 1024, VideoSizeProvider)
@@ -74,9 +109,36 @@ Namespace API.YouTube.Controls
                LBL_SIZE.Text &= " MB"
            End If
        End Sub
+        Private Sub GenerateInfoCaption(ByVal SelectedAudio As MediaObject)
+            Const d$ = StringDelimiter
+            If ContentType = UMTypes.Audio Then
+                With MyMedia
+                    LBL_CODECS.Text = $"{ .Extension} {d} { .Codec} {d} { .Bitrate}k{If(.LanguageCaption.IsEmptyString, String.Empty, $" {d} { .LanguageCaption(True)}")}"
+                    If Not .ID.IsEmptyString AndAlso .ID.StringToLower.Contains(DRC) Then LBL_CODECS.Text &= $" {d} DRC"
+                End With
+            Else
+                With MyMedia
+                    LBL_CODECS.Text = $"{ .Extension.StringToUpper}{d}{ .Codec.StringToUpper}{d}{ .FPS}fps{d}{ .Bitrate}k"
+                    If Not .Protocol.IsEmptyString Then LBL_CODECS.Text &= $" ({ .Protocol})"
+                    If Not .ID.IsEmptyString AndAlso .ID.StringToLower.Contains(DRC) Then LBL_CODECS.Text &= $"{d}DRC"
+                    _CodecLength = LBL_CODECS.Text.MeasureTextDefault(LBL_CODECS.Font).Width
+                End With
+                With SelectedAudio
+                    If Not .ID.IsEmptyString Then LBL_CODECS.Text &= $" / {If(.LanguageCaption.IsEmptyString, String.Empty, $"{ .LanguageCaption} {d}")}{ .Bitrate}k ({ .Extension}, { .Codec})"
+                    If Not .ID.IsEmptyString AndAlso .ID.StringToLower.Contains(DRC) Then LBL_CODECS.Text &= $"{d}DRC"
+                End With
+            End If
+        End Sub
        Private Sub OPT_CHECKED_CheckedChanged(sender As Object, e As EventArgs) Handles OPT_CHECKED.CheckedChanged
            RaiseEvent CheckedChanged(Me, e)
        End Sub
+        Private Sub AudioChanged(ByVal Sender As Object, ByVal e As EventArgs)
+            If ContentType = UMTypes.Video AndAlso Not Sender Is Nothing Then
+                With DirectCast(Sender, VideoOption)
+                    If .ContentType = UMTypes.Audio And .Checked Then GenerateInfoCaption(.MyMedia)
+                End With
+            End If
+        End Sub
        Private Sub Labels_Click(sender As Object, e As EventArgs) Handles LBL_DEFINITION_INFO.Click, LBL_DEFINITION.Click, LBL_CODECS.Click, LBL_SIZE.Click
            OPT_CHECKED.Checked = True
        End Sub
--- a/SCrawler.YouTube/Controls/VideoOptionsForm.vb
+++ b/SCrawler.YouTube/Controls/VideoOptionsForm.vb
@@ -20,6 +20,7 @@ Imports UMTypes = SCrawler.Plugin.UserMediaTypes
 Imports ADB = PersonalUtilities.Forms.Controls.Base.ActionButton.DefaultButtons
 Namespace API.YouTube.Controls
    Friend Class VideoOptionsForm : Implements IDesignXMLContainer
+        Friend Event AudioIndexChanged As EventHandler
 #Region "Declarations"
        Private MyView As FormView
        Private ReadOnly MyFieldsChecker As FieldsChecker
@@ -29,6 +30,7 @@ Namespace API.YouTube.Controls
        Private Const ControlsRow As Integer = 7
        Private ReadOnly Property CNT_PROCESSOR As TableControlsProcessor
        Friend Property MyContainer As YouTubeMediaContainerBase
+        Private ReadOnly AVControls As List(Of VideoOption)
        Private Initialization As Boolean = True
        Private ReadOnly InheritsFromContainer As Boolean
        Private ReadOnly M3U8Files As List(Of SFile)
@@ -63,6 +65,7 @@ Namespace API.YouTube.Controls
            InitializeComponent()
            M3U8Files = New List(Of SFile)
            MyContainer = Container
+            AVControls = New List(Of VideoOption)
            CNT_PROCESSOR = New TableControlsProcessor(TP_CONTROLS)
            Me.InheritsFromContainer = InheritsFromContainer
            MyFieldsChecker = New FieldsChecker
@@ -210,6 +213,7 @@ Namespace API.YouTube.Controls
            MyView.DisposeIfReady()
            MyFieldsChecker.DisposeIfReady()
            M3U8Files.Clear()
+            AVControls.ListClearDispose
        End Sub
 #End Region
 #Region "Refill"
@@ -218,6 +222,7 @@ Namespace API.YouTube.Controls
            Dim h% = -1
            Dim rh% = IIf(MyContainer.HasElements, 60, 25)
            Dim s As New Size(Width, h)
+            Dim codecW% = 0
            Dim CalculateSize As Action(Of Integer) =
                Sub(ByVal InitHeight As Integer)
                    With TP_MAIN.RowStyles(ControlsRow) : .SizeType = SizeType.Absolute : .Height = InitHeight : End With
@@ -230,7 +235,7 @@ Namespace API.YouTube.Controls
            Dim __contentType As UMTypes = IIf(OPT_VIDEO.Checked, UMTypes.Video, UMTypes.Audio)
            With TP_CONTROLS
                If .Controls.Count > 0 Then
-                    For Each cnt As Control In .Controls : cnt.Dispose() : Next
+                    'For Each cnt As Control In .Controls : cnt.Dispose() : Next
                    .Controls.Clear()
                End If
                .RowStyles.Clear()
@@ -239,14 +244,29 @@ Namespace API.YouTube.Controls
            With MyContainer
                Dim audio As MediaObject = Nothing
                If __contentType = UMTypes.Video Then audio = .SelectedAudio
-                Dim data As IEnumerable(Of Control)
+                Dim data As IEnumerable(Of Control) = Nothing

                If .HasElements Then
                    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 Or (__contentType = UMTypes.Video And m.Type = YouTubeMediaContainerBase.TypeAudioVideo)
-                            Select New VideoOption(m, audio) With {.Dock = DockStyle.Fill, .Checked = m.Index = MyContainer.SelectedVideoIndex})
+                    If AVControls.Count = 0 Then
+                        AVControls.AddRange(From m As MediaObject In .Self.MediaObjects
+                                            Where m.Type = UMTypes.Audio Or m.Type = UMTypes.Video Or m.Type = YouTubeMediaContainerBase.TypeAudioVideo
+                                            Select New VideoOption(m, audio) With {
+                                                .Dock = DockStyle.Fill,
+                                                .Checked = m.Index = If(m.Type = UMTypes.Audio, MyContainer.SelectedAudioIndex, MyContainer.SelectedVideoIndex)
+                                                })
+                        If AVControls.Count > 0 Then
+                            AVControls.ForEach(Sub(ByVal av As VideoOption)
+                                                   AddHandler av.CheckedChanged, AddressOf VideoOption_CheckedChanged
+                                                   av.SetAudioChangingHandler(Me)
+                                               End Sub)
+                        End If
+                    End If
+                    'data = (From m As MediaObject In .Self.MediaObjects
+                    '        Where m.Type = __contentType Or (__contentType = UMTypes.Video And m.Type = YouTubeMediaContainerBase.TypeAudioVideo)
+                    '        Select New VideoOption(m, audio) With {.Dock = DockStyle.Fill, .Checked = m.Index = MyContainer.SelectedVideoIndex})
+                    If AVControls.Count > 0 Then data = AVControls.Where(Function(av) av.ContentType = __contentType)
                End If

                If data.ListExists Then
@@ -312,6 +332,16 @@ Namespace API.YouTube.Controls
                        End With
                    End If

+                    If Not .HasElements Then
+                        codecW = AVControls.Max(Function(av) av.CodecLength)
+                        Dim baseW% = DirectCast(TP_CONTROLS.Controls(0), VideoOption).CodecLengthBase
+                        If baseW + codecW + 12 + 30 > Width Then
+                            s.Width += Math.Abs((Size.Width - baseW - codecW - 12 - 30))
+                            'MinimumSize = s
+                            'Size = s
+                        End If
+                    End If
+
                    With TP_CONTROLS
                        .PerformLayout()
                        .Select()
@@ -332,6 +362,16 @@ Namespace API.YouTube.Controls
        Private Sub MediaItem_CheckedChanged(ByVal Sender As MediaItem, ByVal Container As IYouTubeMediaContainer)
            ControlInvokeFast(TP_CONTROLS, Sub() Container.Checked = Sender.Checked, EDP.None)
        End Sub
+        Private Sub VideoOption_CheckedChanged(ByVal Sender As Object, ByVal e As EventArgs)
+            If Not Sender Is Nothing Then
+                With DirectCast(Sender, VideoOption)
+                    If .MyMedia.Type = UMTypes.Audio And .Checked Then
+                        MyContainer.SelectedAudioIndex = .MyMedia.Index
+                        RaiseEvent AudioIndexChanged(Sender, e)
+                    End If
+                End With
+            End If
+        End Sub
        Private Sub MediaItem_BeforeOpenEditor(ByVal Sender As MediaItem, ByVal Container As IYouTubeMediaContainer)
            MediaItem_BeforeOpenEditorImpl(Sender, Container, False)
        End Sub