Fixes

Fixed typo
Added label icon to context menu
Fixed PornHub bug
Added 'Object' to IUserMedia

SCrawler.PluginProvider/Objects/PluginUserMedia.vb

@@ -34,6 +34,7 @@ Namespace Plugin
         Public Property PostDate As Date? Implements IUserMedia.PostDate
         Public Property SpecialFolder As String Implements IUserMedia.SpecialFolder
         Public Property Attempts As Integer Implements IUserMedia.Attempts
+        Public Property [Object] As Object Implements IUserMedia.Object
     End Structure
     Public Interface IUserMedia
         Property ContentType As Integer
@@ -46,5 +47,6 @@ Namespace Plugin
         Property PostDate As Date?
         Property SpecialFolder As String
         Property Attempts As Integer
+        Property [Object] As Object
     End Interface
 End Namespace

SCrawler/API/Base/Structures.vb

@@ -131,6 +131,14 @@ Namespace API.Base
                     Me.Attempts = Attempts
                 End Set
             End Property
+            Private Property IUserMedia_Object As Object Implements IUserMedia.Object
+                Get
+                    Return Me.Object
+                End Get
+                Set(ByVal Obj As Object)
+                    Me.Object = Obj
+                End Set
+            End Property
 #End Region
             Friend Sub New(ByVal URL As String)
                 Me.URL = URL
@@ -142,7 +150,7 @@ Namespace API.Base
                 Me.New(URL)
                 Me.Type = Type
             End Sub
-            Friend Sub New(ByVal m As Plugin.IUserMedia)
+            Friend Sub New(ByVal m As IUserMedia)
                 [Type] = m.ContentType
                 URL = m.URL
                 URL_BASE = m.URL_BASE
@@ -152,6 +160,7 @@ Namespace API.Base
                 State = m.DownloadState
                 SpecialFolder = m.SpecialFolder
                 Attempts = m.Attempts
+                Me.Object = m.Object
             End Sub
             Friend Sub New(ByVal e As EContainer, ByVal UserInstance As IUserData)
                 Type = e.Attribute(Name_MediaType).Value.FromXML(Of Integer)(CInt(Types.Undefined))

SCrawler/API/PornHub/UserData.vb

@@ -346,12 +346,12 @@ Namespace API.PornHub
                     If PhotoPageModel = PhotoPageModels.Undefined Then
                         If DownloadUserPhotos_ModelHub(Token) Then PhotoPageModel = PhotoPageModels.ModelHubPage
                         ThrowAny(Token)
-                        If PhotoPageModel = PhotoPageModels.Undefined AndAlso DownloadPhotoOnlyFromModelHub AndAlso
+                        If PhotoPageModel = PhotoPageModels.Undefined AndAlso Not DownloadPhotoOnlyFromModelHub AndAlso
                            DownloadUserPhotos_PornHub(Token) Then PhotoPageModel = PhotoPageModels.PornHubPage
                     Else
                         Select Case PhotoPageModel
                             Case PhotoPageModels.ModelHubPage : DownloadUserPhotos_ModelHub(Token)
-                            Case PhotoPageModels.PornHubPage : If DownloadPhotoOnlyFromModelHub Then DownloadUserPhotos_PornHub(Token)
+                            Case PhotoPageModels.PornHubPage : If Not DownloadPhotoOnlyFromModelHub Then DownloadUserPhotos_PornHub(Token)
                         End Select
                     End If
                 ElseIf Not DownloadPhotoOnlyFromModelHub Then

SCrawler/Download/Automation/AutoDownloader.vb

@@ -471,18 +471,25 @@ Namespace DownloadObjects
                 Dim DownloadedUsersCount% = 0
                 Dim simple As Boolean = ShowSimpleNotification And ShowNotifications
                 Dim notify As Action = Sub()
+                                           Try
                                                With Downloader.Downloaded
-                                               If ShowNotifications And .Count > 0 Then .ForEach(Sub(ByVal u As IUserData)
+                                                   If ShowNotifications And .Count > 0 Then
-                                                                                                     If Keys.Contains(u.Key) Then
+                                                       For indx% = 0 To .Count - 1
+                                                           With .Item(indx)
+                                                               If Keys.Contains(.Key) Then
                                                                    If simple Then
                                                                        DownloadedUsersCount += 1
                                                                    Else
-                                                                                                             ShowNotification(u)
+                                                                       ShowNotification(.Self)
                                                                    End If
-                                                                                                         Keys.Remove(u.Key)
+                                                                   Keys.Remove(.Key)
                                                                End If
-                                                                                                 End Sub)
                                                            End With
+                                                       Next
+                                                   End If
+                                               End With
+                                           Catch n_ex As Exception
+                                           End Try
                                        End Sub
                 Select Case Mode
                     Case Modes.All

SCrawler/MainFrame.Designer.vb

@@ -754,6 +754,7 @@ Partial Public Class MainFrame : Inherits System.Windows.Forms.Form
         '
         'BTT_CONTEXT_GROUPS
         '
+        Me.BTT_CONTEXT_GROUPS.Image = Global.SCrawler.My.Resources.Resources.TagPic_24
         Me.BTT_CONTEXT_GROUPS.Name = "BTT_CONTEXT_GROUPS"
         Me.BTT_CONTEXT_GROUPS.Size = New System.Drawing.Size(221, 22)
         Me.BTT_CONTEXT_GROUPS.Text = "Change labels"

SCrawler/MainFrame.vb

@@ -1452,8 +1452,8 @@ ResumeDownloadingOperation:
                         m.Text = "No one user deleted!"
                         m.Style = MsgBoxStyle.Critical
                     Else
-                        m.Text = $"The following users were deleted:{vbNewLine}{removedUsers.ListToStringE(vbNewLine, userProvider)}{vbNewLine.StringDup(2)}"
+                        m.Text = $"The following users were deleted:{vbNewLine}{removedUsers.ListToString(vbNewLine)}{vbNewLine.StringDup(2)}"
-                        m.Text &= $"The following users were NOT deleted:{vbNewLine}{leftUsers.ListToStringE(vbNewLine, userProvider)}"
+                        m.Text &= $"The following users were NOT deleted:{vbNewLine}{leftUsers.ListToString(vbNewLine)}"
                         m.Style = MsgBoxStyle.Exclamation
                     End If
                     If b Then Settings.UpdateBlackList()

SCrawler/My Project/Resources.Designer.vb

@@ -370,6 +370,16 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Looks up a localized resource of type System.Drawing.Bitmap.
+        '''</summary>
+        Friend ReadOnly Property TagPic_24() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("TagPic_24", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
         '''</summary>

SCrawler/My Project/Resources.resx

@@ -214,4 +214,7 @@
   <data name="TagIcon_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Content\Icons\TagIcon_32.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="TagPic_24" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Content\Pictures\TagPic_24.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>

SCrawler/SCrawler.vbproj

@@ -584,6 +584,7 @@
     <None Include="Content\Icons\SiteIcons\XhamsterIcon_32.ico" />
     <None Include="Content\Pictures\SitePictures\PornHubPic_16.png" />
     <None Include="Content\Icons\SiteIcons\PornHubIcon_16.ico" />
+    <None Include="Content\Pictures\TagPic_24.png" />
     <Content Include="cURL\curl.exe">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>

SCrawler/UserFinder.vb

@@ -158,7 +158,7 @@ Friend Class UserFinder : Implements IDisposable
         Const MsgTitle$ = "Import users"
         Const DesignNode$ = "ImportUserSelector"
         Try
-            Dim uStr As Func(Of UserInfo, String) = Function(u) $"{IIf(u.CollectionName.IsEmptyString, String.Empty, $"[{u.CollectionName}]: ")} {u.Site} - {u.Name}"
+            Dim uStr As Func(Of UserInfo, String) = Function(u) $"{IIf(u.CollectionName.IsEmptyString, String.Empty, $"[{u.CollectionName}]: ")}{u.Site} - {u.Name}"
             Dim uc As Comparison(Of UserInfo) = Function(ByVal x As UserInfo, ByVal y As UserInfo) As Integer
                                                     If Not x.CollectionName.IsEmptyString And Not y.CollectionName.IsEmptyString Then
                                                         Return x.CollectionName.CompareTo(y.CollectionName)
@@ -296,7 +296,7 @@ Friend Class UserFinder : Implements IDisposable
                 AddHandler f.AddClick, __add
                 If f.ShowDialog() = DialogResult.OK Then
                     l.Clear()
-                    l.AddRange(f.DataResult)
+                    l.ListAddList(f.DataResult, LAP.NotContainsOnly)
                     Return l
                 End If
             End Using