2022.11.16.0

Add sites: PornHub, XHamster Add saved xvideos posts downloading PluginProvider: added TaskGroup attribute; added IUserMedia inteface; changed PluginUserMedia to IUserMedia in interface declarations; changed 'User' String to IPluginContentProvider in ISiteSettings sinterface Added update the 'LOG' button at the end of the ProfileSaved download function API.Base: added 'IUserMedia' compatibility for 'UserMedia'; moved 'GetImage' from 'UserPost' to 'ChannelsViewForm'; update constants in UserDataBase; updated UserDataBase to new UserInfo environment. API.Instagram.UserData: fixed date issue API.Reddit.SiteSettings: update user patterns API.Twitter.Declarations: moved provider here from MainFrame UserDataBind: updated to new UserInfo environment ActiveDownloadingProgress: updated form rendering AutoDownloader: added SpecialDelay TDownloader: added 'Suspended' option; updated for TaskGroups CollectionEditorForm: fixed order bug LabelsForm: remove old stuff UserEditorForm: added collection editing MainFrame: improve label selection Add import users Added the ability to create a virtual collection and add a virtual user to a real collection SettingsCLS: improve users loading
2026-03-15 08:12:17 +00:00 · 2022-11-16 13:41:45 +03:00
parent 7d169acebc
commit bdc7321331
90 changed files with 3831 additions and 1028 deletions
--- a/SCrawler/API/Base/M3U8Base.vb
+++ b/SCrawler/API/Base/M3U8Base.vb
@@ -0,0 +1,64 @@
+' Copyright (C) 2023  Andy https://github.com/AAndyProgram
+' This program is free software: you can redistribute it and/or modify
+' it under the terms of the GNU General Public License as published by
+' the Free Software Foundation, either version 3 of the License, or
+' (at your option) any later version.
+'
+' This program is distributed in the hope that it will be useful,
+' but WITHOUT ANY WARRANTY
+Imports PersonalUtilities.Functions.RegularExpressions
+Imports PersonalUtilities.Tools.Web
+Imports PersonalUtilities.Tools.Web.Clients
+Namespace API.Base
+    Namespace M3U8Declarations
+        Friend Module M3U8Defaults
+            Friend ReadOnly TsFilesRegEx As RParams = RParams.DM(".+?\.ts[^\r\n]*", 0, RegexReturn.List)
+        End Module
+    End Namespace
+    Friend NotInheritable Class M3U8Base
+        Private Sub New()
+        End Sub
+        Friend Shared Function CreateUrl(ByVal Appender As String, ByVal File As String) As String
+            File = File.StringTrimStart("/")
+            If File.StartsWith("http") Then
+                Return File
+            Else
+                If File.StartsWith("hls/") And Appender.Contains("hls/") Then _
+                   Appender = LinkFormatterSecure(Appender.Replace("https://", String.Empty).Split("/").First)
+                Return $"{Appender.StringTrimEnd("/")}/{File}"
+            End If
+        End Function
+        Friend Shared Function Download(ByVal URLs As List(Of String), ByVal DestinationFile As SFile, Optional ByVal Responser As Response = Nothing) As SFile
+            Dim CachePath As SFile = Nothing
+            Try
+                If URLs.ListExists Then
+                    Dim ConcatFile As SFile = DestinationFile
+                    If ConcatFile.Name.IsEmptyString Then ConcatFile.Name = "PlayListFile"
+                    ConcatFile.Extension = "mp4"
+                    CachePath = $"{DestinationFile.PathWithSeparator}_Cache\{SFile.GetDirectories($"{DestinationFile.PathWithSeparator}_Cache\",,, EDP.ReturnValue).ListIfNothing.Count + 1}\"
+                    If CachePath.Exists(SFO.Path) Then
+                        Dim p As New SFileNumbers(ConcatFile.Name,,, New ANumbers With {.Format = ANumbers.Formats.General})
+                        ConcatFile = SFile.Indexed_IndexFile(ConcatFile,, p, EDP.ReturnValue)
+                        Dim i%
+                        Dim eFiles As New List(Of SFile)
+                        Dim dFile As SFile = CachePath
+                        dFile.Extension = "ts"
+                        Using w As New DownloadObjects.WebClient2(Responser)
+                            For i = 0 To URLs.Count - 1
+                                dFile.Name = $"ConPart_{i}"
+                                w.DownloadFile(URLs(i), dFile)
+                                eFiles.Add(dFile)
+                            Next
+                        End Using
+                        DestinationFile = FFMPEG.ConcatenateFiles(eFiles, Settings.FfmpegFile, ConcatFile, p, EDP.ThrowException)
+                        eFiles.Clear()
+                        Return DestinationFile
+                    End If
+                End If
+                Return Nothing
+            Finally
+                CachePath.Delete(SFO.Path, SFODelete.None, EDP.None)
+            End Try
+        End Function
+    End Class
+End Namespace