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
2026-03-14 15:52:18 +00:00 · 2023-04-28 10:13:46 +03:00
parent db9e2cfb88
commit b2a9b22478
270 changed files with 18120 additions and 3332 deletions
--- a/SCrawler.PluginProvider/Interfaces/IDownloadableMedia.vb
+++ b/SCrawler.PluginProvider/Interfaces/IDownloadableMedia.vb
@@ -0,0 +1,34 @@
+' 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
+Namespace Plugin
+    Public Interface IDownloadableMedia : Inherits IUserMedia, IDisposable
+        Event CheckedChange As EventHandler
+        Event ThumbnailChanged As EventHandler
+        Event StateChanged As EventHandler
+        ReadOnly Property SiteIcon As Drawing.Image
+        ReadOnly Property Site As String
+        ReadOnly Property SiteKey As String
+        Property ThumbnailUrl As String
+        Property ThumbnailFile As String
+        Property Title As String
+        Property Size As Integer
+        Property Duration As TimeSpan
+        Property Progress As Object
+        ReadOnly Property HasError As Boolean
+        ReadOnly Property Exists As Boolean
+        Property Checked As Boolean
+        Property Instance As IPluginContentProvider
+        Sub Download(ByVal UseCookies As Boolean, ByVal Token As Threading.CancellationToken)
+        Sub Delete(ByVal RemoveFiles As Boolean)
+        Sub Load(ByVal File As String)
+        Sub Save()
+        Overloads Function ToString() As String
+        Overloads Function ToString(ByVal ForMediaItem As Boolean) As String
+    End Interface
+End Namespace
--- a/SCrawler.PluginProvider/Interfaces/IPluginContentProvider.vb
+++ b/SCrawler.PluginProvider/Interfaces/IPluginContentProvider.vb
@@ -8,8 +8,8 @@
 ' but WITHOUT ANY WARRANTY
 Namespace Plugin
    Public Interface IPluginContentProvider : Inherits IDisposable
-        Event ProgressChanged(ByVal Count As Integer)
-        Event TotalCountChanged(ByVal Count As Integer)
+        Event ProgressChanged(ByVal Value As Integer)
+        Event ProgressMaximumChanged(ByVal Value As Integer, ByVal Add As Boolean)
        Property Thrower As IThrower
        Property LogProvider As ILogProvider
        Property Settings As ISiteSettings
@@ -32,7 +32,8 @@ Namespace Plugin
        Sub ExchangeOptionsSet(ByVal Obj As Object)
        Sub XmlFieldsSet(ByVal Fields As List(Of KeyValuePair(Of String, String)))
        Function XmlFieldsGet() As List(Of KeyValuePair(Of String, String))
-        Sub GetMedia()
-        Sub Download()
+        Sub GetMedia(ByVal Token As Threading.CancellationToken)
+        Sub Download(ByVal Token As Threading.CancellationToken)
+        Sub DownloadSingleObject(ByVal Data As IDownloadableMedia, ByVal Token As Threading.CancellationToken)
    End Interface
 End Namespace
--- a/SCrawler.PluginProvider/Interfaces/ISiteSettings.vb
+++ b/SCrawler.PluginProvider/Interfaces/ISiteSettings.vb
@@ -12,17 +12,17 @@ Namespace Plugin
        Enum Download As Integer
            Main = 0
            SavedPosts = 1
-            Channel = 2
+            SingleObject = 2
        End Enum
        ReadOnly Property Icon As Icon
        ReadOnly Property Image As Image
        ReadOnly Property Site As String
        Property Logger As ILogProvider
-        Function GetUserUrl(ByVal User As IPluginContentProvider, ByVal Channel As Boolean) As String
+        Function GetUserUrl(ByVal User As IPluginContentProvider) As String
        Function IsMyUser(ByVal UserURL As String) As ExchangeOptions
        Function IsMyImageVideo(ByVal URL As String) As ExchangeOptions
-        Function GetSpecialData(ByVal URL As String, ByVal Path As String, ByVal AskForPath As Boolean) As IEnumerable
        Function GetInstance(ByVal What As Download) As IPluginContentProvider
+        Function GetSingleMediaInstance(ByVal URL As String, ByVal OutputFile As String) As IDownloadableMedia
        Function GetUserPostUrl(ByVal User As IPluginContentProvider, ByVal Media As IUserMedia) As String
 #Region "XML Support"
        Sub Load(ByVal XMLValues As IEnumerable(Of KeyValuePair(Of String, String)))
--- a/SCrawler.PluginProvider/My
+++ b/SCrawler.PluginProvider/My
@@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")>

-<Assembly: AssemblyVersion("2023.2.5.0")>
-<Assembly: AssemblyFileVersion("2023.2.5.0")>
+<Assembly: AssemblyVersion("2023.4.28.0")>
+<Assembly: AssemblyFileVersion("2023.4.28.0")>
 <Assembly: NeutralResourcesLanguage("en")>
--- a/SCrawler.PluginProvider/Objects/ExchangeOptions.vb
+++ b/SCrawler.PluginProvider/Objects/ExchangeOptions.vb
@@ -11,15 +11,11 @@ Namespace Plugin
        Public UserName As String
        Public SiteName As String
        Public HostKey As String
-        Public IsChannel As Boolean
        Public Exists As Boolean
        Public Sub New(ByVal Site As String, ByVal Name As String)
            UserName = Name
            SiteName = Site
-        End Sub
-        Public Sub New(ByVal Site As String, ByVal Name As String, ByVal IsChannel As Boolean)
-            Me.New(Site, Name)
-            Me.IsChannel = IsChannel
+            Exists = Not String.IsNullOrEmpty(Name) And Not String.IsNullOrWhiteSpace(Name)
        End Sub
    End Structure
 End Namespace
--- a/SCrawler.PluginProvider/Objects/PluginUserMedia.vb
+++ b/SCrawler.PluginProvider/Objects/PluginUserMedia.vb
@@ -7,12 +7,15 @@
 ' This program is distributed in the hope that it will be useful,
 ' but WITHOUT ANY WARRANTY
 Namespace Plugin
+    Public Delegate Sub ProgressChange(ByVal Value As Double?, ByVal Maximum As Double?, ByVal Information As String)
    Public Enum UserMediaTypes As Integer
        Undefined = 0
-        [Picture] = 1
-        [Video] = 2
-        [Text] = 3
+        Picture = 1
+        Video = 2
+        Audio = 200
+        Text = 4
        VideoPre = 10
+        AudioPre = 215
        GIF = 50
        m3u8 = 100
    End Enum
@@ -24,12 +27,12 @@ Namespace Plugin
        Missing = 4
    End Enum
    Public Structure PluginUserMedia : Implements IUserMedia
-        Public Property ContentType As Integer Implements IUserMedia.ContentType
+        Public Property ContentType As UserMediaTypes Implements IUserMedia.ContentType
        Public Property URL As String Implements IUserMedia.URL
        Public Property URL_BASE As String Implements IUserMedia.URL_BASE
        Public Property MD5 As String Implements IUserMedia.MD5
        Public Property File As String Implements IUserMedia.File
-        Public Property DownloadState As Integer Implements IUserMedia.DownloadState
+        Public Property DownloadState As UserMediaStates Implements IUserMedia.DownloadState
        Public Property PostID As String Implements IUserMedia.PostID
        Public Property PostDate As Date? Implements IUserMedia.PostDate
        Public Property SpecialFolder As String Implements IUserMedia.SpecialFolder
@@ -37,12 +40,12 @@ Namespace Plugin
        Public Property [Object] As Object Implements IUserMedia.Object
    End Structure
    Public Interface IUserMedia
-        Property ContentType As Integer
+        Property ContentType As UserMediaTypes
        Property URL As String
        Property URL_BASE As String
        Property MD5 As String
        Property File As String
-        Property DownloadState As Integer
+        Property DownloadState As UserMediaStates
        Property PostID As String
        Property PostDate As Date?
        Property SpecialFolder As String
--- a/SCrawler.PluginProvider/SCrawler.PluginProvider.vbproj
+++ b/SCrawler.PluginProvider/SCrawler.PluginProvider.vbproj
@@ -102,6 +102,7 @@
  </ItemGroup>
  <ItemGroup>
    <Compile Include="Attributes\Attributes.vb" />
+    <Compile Include="Interfaces\IDownloadableMedia.vb" />
    <Compile Include="ObjectInterfaces\IPropertyProvider.vb" />
    <Compile Include="Objects\ExchangeOptions.vb" />
    <Compile Include="ObjectInterfaces\ILogProvider.vb" />