2022.8.22.0

Cleaned up the code Replace some old functions with new ones Adapted to the new library environment Enable/Disable display user/downloaded image Autodownloader option 'Show notification' not saved Separate thread for standalone video downloader Expanded the description of some errors with additional information Fixed date/time renaming issue Fixed internal library bugs Fixed minor bugs
2026-03-14 15:52:18 +00:00 · 2022-08-22 02:42:36 +03:00
parent e0dc66e0da
commit 54ffe10f71
88 changed files with 1155 additions and 1066 deletions
--- a/SCrawler.Plugin.XVIDEOS/M3U8.vb
+++ b/SCrawler.Plugin.XVIDEOS/M3U8.vb
@@ -47,8 +47,7 @@ Friend NotInheritable Class M3U8
            CachePath.Delete(SFO.Path, SFODelete.None, EDP.None)
        End Try
    End Function
-    Friend Shared Function Download(ByVal URL As String, ByVal Appender As String, ByVal ffmpegFile As SFile, ByVal f As SFile,
-                                    ByRef Logger As ILogProvider) As SFile
+    Friend Shared Function Download(ByVal URL As String, ByVal Appender As String, ByVal ffmpegFile As SFile, ByVal f As SFile, ByRef Logger As ILogProvider) As SFile
        Try
            If Not URL.IsEmptyString Then
                Using w As New WebClient
@@ -62,7 +61,7 @@ Friend NotInheritable Class M3U8
            End If
            Return Nothing
        Catch ex As Exception
-            If Not ex.HelpLink = 1 Then Logger.Add(ex, "[M3U8.Download]")
+            If Not ex.HelpLink = 1 Then Logger.Add(ex, $"[M3U8.Download({URL}, {Appender}, {ffmpegFile}, {f})]")
            Throw ex
        End Try
    End Function
--- a/SCrawler.Plugin.XVIDEOS/My
+++ b/SCrawler.Plugin.XVIDEOS/My
@@ -13,7 +13,7 @@ Imports System.Runtime.InteropServices
 <Assembly: AssemblyDescription("XVIDEOS plugin for SCrawler")>
 <Assembly: AssemblyCompany("AndyProgram")>
 <Assembly: AssemblyProduct("XVIDEOS")>
-<Assembly: AssemblyCopyright("Copyright ©  2022")>
+<Assembly: AssemblyCopyright("Copyright © 2022")>
 <Assembly: AssemblyTrademark("AndyProgram")>

 <Assembly: ComVisible(False)>
@@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")>

-<Assembly: AssemblyVersion("2022.7.7.0")>
-<Assembly: AssemblyFileVersion("2022.7.7.0")>
+<Assembly: AssemblyVersion("2022.8.22.0")>
+<Assembly: AssemblyFileVersion("2022.8.22.0")>
 <Assembly: NeutralResourcesLanguage("en")>
--- a/SCrawler.Plugin.XVIDEOS/SettingsForm.vb
+++ b/SCrawler.Plugin.XVIDEOS/SettingsForm.vb
@@ -17,19 +17,15 @@ Public Class SettingsForm
        MyDefs = New DefaultFormOptions(Me, Design)
    End Sub
    Private Sub SettingsForm_Load(sender As Object, e As EventArgs) Handles Me.Load
-        Try
-            With MyDefs
-                .MyViewInitialize(True)
-                .AddEditToolbar({EditToolbar.ControlItem.Add, EditToolbar.ControlItem.Delete})
-                .AddOkCancelToolbar()
-                If Settings.Domains.Count > 0 Then Settings.Domains.ForEach(Sub(d) LIST_DOMAINS.Items.Add(d))
-                .EndLoaderOperations()
-            End With
-        Catch ex As Exception
-            MyDefs.InvokeLoaderError(ex)
-        End Try
+        With MyDefs
+            .MyViewInitialize(True)
+            .AddEditToolbar({EditToolbar.ControlItem.Add, EditToolbar.ControlItem.Delete})
+            .AddOkCancelToolbar()
+            If Settings.Domains.Count > 0 Then Settings.Domains.ForEach(Sub(d) LIST_DOMAINS.Items.Add(d))
+            .EndLoaderOperations()
+        End With
    End Sub
-    Private Sub MyDefs_ButtonOkClick() Handles MyDefs.ButtonOkClick
+    Private Sub MyDefs_ButtonOkClick(ByVal Sender As Object, ByVal e As KeyHandleEventArgs) Handles MyDefs.ButtonOkClick
        Settings.Domains.Clear()
        With LIST_DOMAINS
            If .Items.Count > 0 Then
@@ -39,7 +35,7 @@ Public Class SettingsForm
        Settings.UpdateDomains()
        MyDefs.CloseForm()
    End Sub
-    Private Sub MyDefs_ButtonAddClick() Handles MyDefs.ButtonAddClick
+    Private Sub MyDefs_ButtonAddClick(ByVal Sender As Object, ByVal e As EditToolbar.EditToolbarEventArgs) Handles MyDefs.ButtonAddClick
        Dim nd$ = InputBoxE("Enter a new domain using the pattern [xvideos.com]:", "New domain")
        If Not nd.IsEmptyString Then
            If Not LIST_DOMAINS.Items.Contains(nd) Then
@@ -49,11 +45,10 @@ Public Class SettingsForm
            End If
        End If
    End Sub
-    Private Sub MyDefs_ButtonDeleteClick() Handles MyDefs.ButtonDeleteClickE
+    Private Sub MyDefs_ButtonDeleteClickE(ByVal Sender As Object, ByVal e As EditToolbar.EditToolbarEventArgs) Handles MyDefs.ButtonDeleteClickE
        If _LatestSelected.ValueBetween(0, LIST_DOMAINS.Items.Count - 1) Then
            Dim n$ = LIST_DOMAINS.Items(_LatestSelected)
-            If MsgBoxE({$"Are you sure you want to delete the [{n}] domain?",
-                        "Removing domains"}, MsgBoxStyle.YesNo) = MsgBoxResult.Yes Then
+            If MsgBoxE({$"Are you sure you want to delete the [{n}] domain?", "Removing domains"}, MsgBoxStyle.YesNo) = MsgBoxResult.Yes Then
                LIST_DOMAINS.Items.RemoveAt(_LatestSelected)
                MsgBoxE($"Domain [{n}] removed")
            Else
--- a/SCrawler.Plugin.XVIDEOS/SiteSettings.vb
+++ b/SCrawler.Plugin.XVIDEOS/SiteSettings.vb
@@ -26,7 +26,7 @@ Public Class SiteSettings : Implements ISiteSettings
    Public Property Logger As ILogProvider Implements ISiteSettings.Logger
 #Region "M3U8"
    Private ReadOnly OS64 As Boolean
-    Private ReadOnly FfmpegExists As Boolean
+    Friend ReadOnly FfmpegExists As Boolean
    Friend ReadOnly FfmpegFile As SFile
    Friend ReadOnly Property UseM3U8 As Boolean
        Get
--- a/SCrawler.Plugin.XVIDEOS/UserData.vb
+++ b/SCrawler.Plugin.XVIDEOS/UserData.vb
@@ -14,8 +14,8 @@ Imports UStates = SCrawler.Plugin.PluginUserMedia.States
 Imports UTypes = SCrawler.Plugin.PluginUserMedia.Types
 Public Class UserData : Implements IPluginContentProvider
 #Region "Interface declarations"
-    Public Event ProgressChanged(Count As Integer) Implements IPluginContentProvider.ProgressChanged
-    Public Event TotalCountChanged(Count As Integer) Implements IPluginContentProvider.TotalCountChanged
+    Public Event ProgressChanged(ByVal Count As Integer) Implements IPluginContentProvider.ProgressChanged
+    Public Event TotalCountChanged(ByVal Count As Integer) Implements IPluginContentProvider.TotalCountChanged
    Public Property Thrower As IThrower Implements IPluginContentProvider.Thrower
    Public Property LogProvider As ILogProvider Implements IPluginContentProvider.LogProvider
    Public Property ESettings As ISiteSettings Implements IPluginContentProvider.Settings
@@ -56,7 +56,14 @@ Public Class UserData : Implements IPluginContentProvider
    Private Property Responser As Response
    Public Sub GetMedia() Implements IPluginContentProvider.GetMedia
        Try
-            If Not Settings.UseM3U8 Then LogProvider.Add("File [ffmpeg.exe] not found") : Exit Sub
+            If Not Settings.UseM3U8 Then
+                If Settings.FfmpegExists Then
+                    LogProvider.Add($"XVIDEOS [{Name}]: The plugin only works with x64 OS.")
+                Else
+                    LogProvider.Add($"XVIDEOS [{Name}]: File [ffmpeg.exe] not found")
+                End If
+                Exit Sub
+            End If
            If Not Responser Is Nothing Then Responser.Dispose()
            Responser = New Response
            Responser.Copy(Settings.Responser)
@@ -105,9 +112,7 @@ Public Class UserData : Implements IPluginContentProvider
            If TempMediaList.Count > 0 Then
                For i% = 0 To TempMediaList.Count - 1
                    Thrower.ThrowAny()
-                    With TempMediaList(i)
-                        TempMediaList(i) = GetVideoData(.URL, Responser, Settings.DownloadUHD.Value, .PostID, LogProvider)
-                    End With
+                    With TempMediaList(i) : TempMediaList(i) = GetVideoData(.URL, Responser, Settings.DownloadUHD.Value, .PostID, LogProvider) : End With
                Next
                TempMediaList.RemoveAll(Function(m) m.URL.IsEmptyString)
            End If
@@ -149,7 +154,7 @@ Public Class UserData : Implements IPluginContentProvider
                        Dim t$ = RegexReplace(r, VideoTitleRegex)
                        r = resp.GetResponse(m,, EDP.ThrowException)
                        If Not r.IsEmptyString Then
-                            Dim ls As List(Of VSize) = FNF.RegexFields(Of VSize)(r, {M3U8Reparse}, {1, 2})
+                            Dim ls As List(Of VSize) = RegexFields(Of VSize)(r, {M3U8Reparse}, {1, 2})
                            If ls.ListExists And Not DownloadUHD Then ls.RemoveAll(Function(v) v.Size > 1080)
                            If ls.ListExists Then
                                ls.Sort()