3.0.0.4

Changed XVIDEOS.M3U8 errors
Added TryCatch to XVIDEOS.UserData.Download
Removed old declarations in UserDataBase
Changed description replacement in UserDataHost

SCrawler/API/Base/UserDataBase.vb

@@ -941,16 +941,13 @@ BlockNullPicture:
 #End Region
 #Region "Delete, Move, Merge"
         Friend Overridable Function Delete() As Integer Implements IUserData.Delete
-            Return DeleteF(Me)
-        End Function
-        Friend Function DeleteF(ByVal Instance As IUserData) As Integer
             Dim f As SFile = SFile.GetPath(MyFile.CutPath.Path)
             If f.Exists(SFO.Path, False) AndAlso (User.Merged OrElse f.Delete(SFO.Path, Settings.DeleteMode)) Then
                 ImageHandler(Me, False)
                 Settings.UsersList.Remove(User)
                 Settings.UpdateUsersList()
-                Settings.Users.Remove(Instance)
-                Downloader.UserRemove(Instance)
+                Settings.Users.Remove(Me)
+                Downloader.UserRemove(Me)
                 Dispose(True)
                 Return 1
             Else
@@ -958,24 +955,22 @@ BlockNullPicture:
             End If
         End Function
         Friend Overridable Function MoveFiles(ByVal __CollectionName As String) As Boolean Implements IUserData.MoveFiles
-            Return MoveFilesF(Me, __CollectionName)
-        End Function
-        Friend Function MoveFilesF(ByRef Instance As IUserData, ByVal __CollectionName As String) As Boolean
             Dim UserBefore As UserInfo = User
             Dim Removed As Boolean = True
             Dim _TurnBack As Boolean = False
             Try
                 Dim f As SFile
                 If IncludedInCollection Then
-                    Settings.Users.Add(Instance)
+                    Settings.Users.Add(Me)
                     Removed = False
                     User.CollectionName = String.Empty
                     User.IncludedInCollection = False
                 Else
-                    Settings.Users.Remove(Instance)
+                    Settings.Users.Remove(Me)
                     Removed = True
                     User.CollectionName = __CollectionName
                     User.IncludedInCollection = True
+                    User.SpecialPath = Nothing
                 End If
                 _TurnBack = True
                 User.UpdateUserFile()
@@ -987,7 +982,7 @@ BlockNullPicture:
                                 "Destination directory is not empty!"}, MsgBoxStyle.Exclamation,,, {"Delete", "Cancel"}) = 1 Then
                         MsgBoxE("Operation canceled", MsgBoxStyle.Exclamation)
                         User = UserBefore
-                        If Removed Then Settings.Users.Add(Instance) Else Settings.Users.Remove(Instance)
+                        If Removed Then Settings.Users.Add(Me) Else Settings.Users.Remove(Me)
                         _TurnBack = False
                         Return False
                     End If
@@ -1003,7 +998,7 @@ BlockNullPicture:
                 ErrorsDescriber.Execute(EDP.LogMessageValue, ex, "Files moving error")
                 User = UserBefore
                 If _TurnBack Then
-                    If Removed Then Settings.Users.Add(Instance) Else Settings.Users.Remove(Instance)
+                    If Removed Then Settings.Users.Add(Me) Else Settings.Users.Remove(Me)
                 End If
                 Return False
             End Try

SCrawler/My Project/AssemblyInfo.vb

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

SCrawler/PluginsEnvironment/Hosts/UserDataHost.vb

@@ -6,10 +6,12 @@
 '
 ' This program is distributed in the hope that it will be useful,
 ' but WITHOUT ANY WARRANTY
-Imports SCrawler.API.Base
 Imports PersonalUtilities.Functions.XML
+Imports SCrawler.API.Base
 Imports System.Threading
 Imports System.Reflection
+Imports UStates = SCrawler.Plugin.PluginUserMedia.States
+Imports UTypes = SCrawler.Plugin.PluginUserMedia.Types
 Namespace Plugin.Hosts
     Friend Class UserDataHost : Inherits UserDataBase
         Private ReadOnly UseInternalDownloader As Boolean
@@ -67,7 +69,7 @@ Namespace Plugin.Hosts
 
                 If Not .Name = Name Then Name = .Name
                 ID = .ID
-                UserDescription = .UserDescription
+                UserDescriptionUpdate(.UserDescription)
                 UserExists = .UserExists
                 UserSuspended = .UserSuspended
             End With
@@ -84,7 +86,13 @@ Namespace Plugin.Hosts
                     .TempMediaList.ListAddList(_ContentNew.Select(Function(c) c.PluginUserMedia()))
                     .Download()
                     _ContentNew.Clear()
-                    If .TempMediaList.ListExists Then _ContentNew.ListAddList(.TempMediaList.Select(Function(c) New UserMedia(c)))
+                    If .TempMediaList.ListExists Then
+                        _ContentNew.ListAddList(.TempMediaList.Select(Function(c) New UserMedia(c)))
+                        DownloadedPictures(False) = .TempMediaList.LongCount(Function(m) m.DownloadState = UStates.Downloaded And
+                                                                                         (m.ContentType = UTypes.Picture Or m.ContentType = UTypes.GIF))
+                        DownloadedVideos(False) = .TempMediaList.LongCount(Function(m) m.DownloadState = UStates.Downloaded And
+                                                                                       (m.ContentType = UTypes.Video Or m.ContentType = UTypes.m3u8))
+                    End If
                 End With
             End If
         End Sub