mirror of
https://github.com/AAndyProgram/SCrawler.git
synced 2026-11-10 05:35:25 +00:00
2023.11.9.0
ADD MULTI-ACCOUNT PluginProvider IDownloadableMedia: added 'AccountName' property IPluginContentProvider: added 'AccountName' property ISiteSettings: added properties: 'AccountName', 'Temporary', 'AvailableText', 'DefaultInstance'; added functions: 'Clone', 'Update', 'Delete'; removed 'Load' function; implement 'IDisposable' interface PropertyValue: added functions: 'BeginInit', 'EndInit', 'Clone' YT YouTubeSettings: make the class compatible for multi-acc YouTubeMediaContainerBase: add 'AccountName' property SCrawler IUserData: add properties: 'HostStatic', 'AccountName' ProfileSaved: add the ability to download saved posts from all accounts SiteSettingsBase: add multi-acc support; add 'UserOptionsType' for future purposes; update initializers; update responser initializing; add 'CLONE_PROPERTIES' and 'CloneGetEmptySettingsInstance' functions; 'IDisposable' support UserDataBase: add multi-acc support; change host retrieval method DomainsContainer: implements 'IDisposable' interface API.All sites: add multi-acc support; move the Icon and Image setting to the initializer; update initializer API.Instagram: change some property types API.Reddit: set 'AvailableText'; update 'UpdateRedGifsToken' and 'UserOptions' functions API.Mastodon: remove 'MastodonDomains' class and 'SettingsForm' form; replace 'MastodonDomains' with 'DomainsContainer'; update functions 'IsMyUser' and 'IsMyImageVideo'; update to 'DefaultInstance' environment; update 'UserData.ResetCredentials' function API.XVIDEOS: update to 'DefaultInstance' environment API.Xhamster: update to 'DefaultInstance' environment STDownloader: add multi-acc compatibility SiteEditorForm: add option 'Download saved posts'; update providers; add additional providers; add multi-acc support PluginsEnvironment: add 'PClonableAttribute'; add multi-acc support
This commit is contained in:
@@ -166,16 +166,19 @@ Namespace API.RedGifs
|
||||
End If
|
||||
End Function
|
||||
Friend Shared Function GetDataFromUrlId(ByVal Obj As String, ByVal ObjIsID As Boolean, ByVal Responser As Responser,
|
||||
ByVal Host As Plugin.Hosts.SettingsHost) As UserMedia
|
||||
ByVal Host As Plugin.Hosts.SettingsHost, ByVal AccountName As String) As UserMedia
|
||||
Dim URL$ = String.Empty
|
||||
Try
|
||||
If Obj.IsEmptyString Then Return Nothing
|
||||
If Not ObjIsID Then
|
||||
Obj = GetVideoIdFromUrl(Obj)
|
||||
If Not Obj.IsEmptyString Then Return GetDataFromUrlId(Obj, True, Responser, Host)
|
||||
If Not Obj.IsEmptyString Then Return GetDataFromUrlId(Obj, True, Responser, Host, AccountName)
|
||||
Else
|
||||
If Host Is Nothing Then Host = Settings(RedGifsSiteKey)
|
||||
If Host.Source.Available(Plugin.ISiteSettings.Download.Main, True) Then
|
||||
If Host Is Nothing Then
|
||||
Host = Settings(RedGifsSiteKey, AccountName)
|
||||
If Host Is Nothing Then Host = Settings(RedGifsSiteKey).Default
|
||||
End If
|
||||
If Not Host Is Nothing AndAlso Host.Source.Available(Plugin.ISiteSettings.Download.Main, True) Then
|
||||
If Responser Is Nothing Then Responser = Host.Responser.Copy
|
||||
URL = String.Format(PostDataUrl, Obj.ToLower)
|
||||
Dim r$ = Responser.GetResponse(URL,, EDP.ThrowException)
|
||||
@@ -220,7 +223,7 @@ Namespace API.RedGifs
|
||||
#End Region
|
||||
#Region "Single data downloader"
|
||||
Protected Overrides Sub DownloadSingleObject_GetPosts(ByVal Data As IYouTubeMediaContainer, ByVal Token As CancellationToken)
|
||||
Dim m As UserMedia = GetDataFromUrlId(Data.URL, False, Responser, HOST)
|
||||
Dim m As UserMedia = GetDataFromUrlId(Data.URL, False, Responser, HOST, AccountName)
|
||||
If Not m.State = UStates.Missing And Not m.State = DataGone And (m.Type = UTypes.Picture Or m.Type = UTypes.Video) Then
|
||||
m.URL_BASE = MySettings.GetUserPostUrl(Me, m)
|
||||
_TempMediaList.Add(m)
|
||||
|
||||
Reference in New Issue
Block a user