mirror of
https://github.com/AAndyProgram/SCrawler.git
synced 2026-03-15 00:02:17 +00:00
Plugins IPluginContentProvider: added DownloadSingleObject function; added tokens to GetMedia and Download functions; removed GetSpecialData function Add IDownloadableMedia interface Removed 'Channel' option from all functions and enums ISiteSettings: added GetSingleMediaInstance function ExchangeOptions: removed 'IsChannel' UserMediaTypes: added Audio and AudioPre enums IUserMedia, PluginUserMedia: changed ContentType and DownloadState from integers to their enums SCrawler Add YouTube standalone downloader Add gallery-dl & yt-dlp support Remove 'UserInfo' requirement from 'ProfilesSaved' Update 'SiteSettingsBase' to use domains and Netscape cookies UserDataBase: remove channels; remove old 'Merge' const; standardize SavedPosts file naming; move 'ValidateMD5' function from Twitter to UserDataBase to use it in other UserData classes; add 'DownloadSingleObject' environment for single posts; add validating file extension for m3u8 during download; add reindex of video file during download Rewritten DomainsContainer Create a universal settings form and PSettingsArttribute Gfycat, Imgur: turn these classes into IUserData to download a single object All plugins: update 'GetInstance' function for saved posts; update domains where implemented; remove 'OptionForm' where it exists; update options where they exist; update unix date providers; reconfigure channels where they exist LPSG: fix attachments; update converters and regex Add sites: ThisVid, Mastodon, Pinterest, YouTube, YouTube music Reddit: standardize container parsing for all data types; new channel environment; fix 'ReparseMissing' function; redirect data downloading to the base download function, saved crossposts support Twitter: fixed gif path bug; fixed downloading saved posts PornHub: hide unnecessary errors; photo galleries bug RedGifs: add 'UserAgent' option Added icons to download progress Rename some objects Completely redesigned standalone downloader form and rewritten its environment WebClient2: update to use tokens Labels: update label form (save labels to file only when OK button is clicked); change removing labels.txt from recycle bin to permanent; disable storing label 'NoParsedUser' UserCreatorForm: remove the 'Channel' checkbox and related functions; ability to extract the user's URL from the buffer and apply parameters if found Remove temporary 'EncryptCookies' module MainFrame: added simplified way to create new users (Ctrl+Insert to create a new user with default parameters from clipboard URL); removed SCrawler command line argument "-v" (remove the ability to run SCrawler as video downloader) PropertyValueHost: update for option forms compatibility SettingsHost: removed 'GetSpecialData' fork; added 'GetSingleMediaInstance' fork UserDataHost: update functions with tokens; update events; add 'DownloadSingleObject' function Settings: add the ability to get environment from 4 destinations; add the ability to set the program environment manually; add CMDEncoding; add cache; remove the old function 'RemoveUnusedPlugins'; add 'STDownloader' properties; add YT compatibility; add new notification options; add deleting user settings file when 'SettingsCLS.Dispose()' if where are no users in SCrawler UserFinder: remove old 'Merge' const; remove channel option UserInfo: remove channel option
86 lines
4.2 KiB
VB.net
86 lines
4.2 KiB
VB.net
' 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.Tools
|
|
Imports PersonalUtilities.Functions.RegularExpressions
|
|
Namespace API.Base.GDL
|
|
Friend Module Declarations
|
|
Private Structure GDLURL : Implements IRegExCreator
|
|
Private _URL As String
|
|
Friend ReadOnly Property URL As String
|
|
Get
|
|
Return _URL
|
|
End Get
|
|
End Property
|
|
Public Shared Widening Operator CType(ByVal u As String) As GDLURL
|
|
Return New GDLURL With {._URL = u}
|
|
End Operator
|
|
Public Shared Widening Operator CType(ByVal u As GDLURL) As String
|
|
Return u.URL
|
|
End Operator
|
|
Private Function CreateFromArray(ByVal ParamsArray() As String) As Object Implements IRegExCreator.CreateFromArray
|
|
If ParamsArray.ListExists(2) Then
|
|
Dim u$ = ParamsArray(0).StringTrim.StringTrimEnd("/"), u2$
|
|
If Not u.IsEmptyString Then
|
|
u2 = ParamsArray(1).StringTrim
|
|
If Not u2.IsEmptyString AndAlso u2.StartsWith("GET", StringComparison.OrdinalIgnoreCase) Then
|
|
u2 = u2.Remove(0, 3).StringTrim.StringTrimStart("/")
|
|
If Not u2.IsEmptyString Then _URL = $"{u}/{u2}"
|
|
End If
|
|
End If
|
|
End If
|
|
Return Me
|
|
End Function
|
|
Public Shared Operator =(ByVal x As GDLURL, ByVal y As GDLURL) As Boolean
|
|
Return x.URL = y.URL
|
|
End Operator
|
|
Public Shared Operator <>(ByVal x As GDLURL, ByVal y As GDLURL) As Boolean
|
|
Return Not x.URL = y.URL
|
|
End Operator
|
|
Public Overrides Function ToString() As String
|
|
Return URL
|
|
End Function
|
|
Public Overrides Function Equals(ByVal Obj As Object) As Boolean
|
|
Return URL = CType(Obj, String)
|
|
End Function
|
|
End Structure
|
|
Private ReadOnly Property GdlUrlPattern As RParams = RParams.DM(GDLBatch.UrlLibStart.Replace("[", "\[").Replace("]", "\]") &
|
|
"([^""]+?)""(GET [^""]+)""", 0, EDP.ReturnValue)
|
|
Friend Function GetUrlsFromGalleryDl(ByVal Batch As BatchExecutor, ByVal Command As String) As List(Of String)
|
|
Dim urls As New List(Of String)
|
|
Dim u As GDLURL
|
|
With Batch
|
|
.Execute(Command)
|
|
If .ErrorOutputData.Count > 0 Then
|
|
For Each eValue$ In .ErrorOutputData
|
|
u = RegexFields(Of GDLURL)(eValue, {GdlUrlPattern}, {1, 2}, EDP.ReturnValue).ListIfNothing.FirstOrDefault
|
|
If Not u.URL.IsEmptyString Then urls.ListAddValue(u, LNC)
|
|
Next
|
|
End If
|
|
End With
|
|
Return urls
|
|
End Function
|
|
End Module
|
|
Friend Class GDLBatch : Inherits BatchExecutor
|
|
Friend Property TempPostsList As List(Of String)
|
|
Friend Const UrlLibStart As String = "[urllib3.connectionpool][debug]"
|
|
Friend Const UrlTextStart As String = UrlLibStart & " https"
|
|
Friend Sub New()
|
|
MyBase.New(True)
|
|
ChangeDirectory(Settings.GalleryDLFile.File)
|
|
End Sub
|
|
Protected Overrides Async Sub OutputDataReceiver(ByVal Sender As Object, ByVal e As DataReceivedEventArgs)
|
|
MyBase.OutputDataReceiver(Sender, e)
|
|
Await Validate(e.Data)
|
|
End Sub
|
|
Protected Overridable Async Function Validate(ByVal Value As String) As Task
|
|
If Await Task.Run(Of Boolean)(Function() Not Value.IsEmptyString AndAlso
|
|
TempPostsList.Exists(Function(v) Value.Contains(v))) Then Kill(EDP.None)
|
|
End Function
|
|
End Class
|
|
End Namespace |