mirror of
https://github.com/AAndyProgram/SCrawler.git
synced 2026-03-15 00:02:17 +00:00
2023.4.28.0
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
This commit is contained in:
@@ -7,34 +7,76 @@
|
||||
' This program is distributed in the hope that it will be useful,
|
||||
' but WITHOUT ANY WARRANTY
|
||||
Imports System.Net
|
||||
Imports System.ComponentModel
|
||||
Imports PersonalUtilities.Tools.Web.Clients
|
||||
Imports PersonalUtilities.Tools.Web.Clients.Base
|
||||
Namespace DownloadObjects
|
||||
Friend Class WebClient2 : Implements IDisposable
|
||||
Protected WC As WebClient
|
||||
Protected RC As Responser
|
||||
Protected Client As IResponserClient
|
||||
Private ReadOnly RCERROR As New ErrorsDescriber(EDP.ThrowException)
|
||||
Protected UseResponserClient As Boolean
|
||||
Friend Sub New()
|
||||
Private _DelegateEvents As Boolean = False
|
||||
Friend Property DelegateEvents As Boolean
|
||||
Get
|
||||
Return _DelegateEvents
|
||||
End Get
|
||||
Set(ByVal d As Boolean)
|
||||
Dim b As Boolean = Not _DelegateEvents = d
|
||||
_DelegateEvents = d
|
||||
If b Then
|
||||
Try
|
||||
If Not Client Is Nothing Then
|
||||
If _DelegateEvents Then
|
||||
AddHandler Client.DownloadProgressChanged, AddressOf Client_DownloadProgressChanged
|
||||
AddHandler Client.DownloadFileCompleted, AddressOf Client_DownloadFileCompleted
|
||||
Else
|
||||
If UseResponserClient AndAlso TypeOf Client Is Responser Then
|
||||
With DirectCast(Client, Responser)
|
||||
If Not .ClientRWebClient Is Nothing Then .ClientRWebClient.AsyncMode = False
|
||||
End With
|
||||
ElseIf TypeOf Client Is RWebClient Then
|
||||
DirectCast(Client, RWebClient).AsyncMode = False
|
||||
End If
|
||||
RemoveHandler Client.DownloadProgressChanged, AddressOf Client_DownloadProgressChanged
|
||||
RemoveHandler Client.DownloadFileCompleted, AddressOf Client_DownloadFileCompleted
|
||||
End If
|
||||
End If
|
||||
Catch
|
||||
End Try
|
||||
End If
|
||||
End Set
|
||||
End Property
|
||||
Protected Sub New()
|
||||
End Sub
|
||||
Friend Sub New(ByVal Responser As Responser)
|
||||
If Not Responser Is Nothing Then
|
||||
RC = Responser
|
||||
UseResponserClient = True
|
||||
Client = Responser
|
||||
Else
|
||||
WC = New WebClient
|
||||
UseResponserClient = False
|
||||
Client = New RWebClient With {.UseNativeClient = True}
|
||||
End If
|
||||
End Sub
|
||||
Friend Sub DownloadFile(ByVal URL As String, ByVal File As String)
|
||||
If UseResponserClient Then
|
||||
RC.DownloadFile(URL, File, RCERROR)
|
||||
Else
|
||||
WC.DownloadFile(URL, File)
|
||||
End If
|
||||
Friend Overloads Sub DownloadFile(ByVal URL As String, ByVal File As SFile)
|
||||
Client.DownloadFile(URL, File, RCERROR)
|
||||
End Sub
|
||||
Friend Overloads Sub DownloadFile(ByVal URL As String, ByVal File As SFile, ByVal Token As Threading.CancellationToken)
|
||||
Client.DownloadFile(URL, File, Token, RCERROR)
|
||||
End Sub
|
||||
Protected Overridable Sub Client_DownloadProgressChanged(ByVal Sender As Object, ByVal e As DownloadProgressChangedEventArgs)
|
||||
End Sub
|
||||
Protected Overridable Sub Client_DownloadFileCompleted(ByVal Sender As Object, ByVal e As AsyncCompletedEventArgs)
|
||||
End Sub
|
||||
#Region "IDisposable Support"
|
||||
Private disposedValue As Boolean = False
|
||||
Protected Overridable Sub Dispose(ByVal disposing As Boolean)
|
||||
If Not disposedValue And disposing And Not WC Is Nothing Then WC.Dispose()
|
||||
If Not disposedValue Then
|
||||
If disposing Then
|
||||
DelegateEvents = False
|
||||
If Not UseResponserClient And Not Client Is Nothing Then Client.Dispose()
|
||||
End If
|
||||
Client = Nothing
|
||||
End If
|
||||
disposedValue = True
|
||||
End Sub
|
||||
Protected Overrides Sub Finalize()
|
||||
|
||||
Reference in New Issue
Block a user