mirror of
https://github.com/AAndyProgram/SCrawler.git
synced 2026-03-14 15:52:18 +00:00
2023.1.24.0
Imgur albums not downloading Collections: users in the collection are not banned
This commit is contained in:
@@ -1,3 +1,11 @@
|
|||||||
|
# 2023.1.24.0
|
||||||
|
|
||||||
|
*2023-01-24*
|
||||||
|
|
||||||
|
- Fixed
|
||||||
|
- (Issue #100) Imgur albums not downloading
|
||||||
|
- When deleting a collection with the 'ban' option, users in the collection are not banned
|
||||||
|
|
||||||
# 2023.1.2.0
|
# 2023.1.2.0
|
||||||
|
|
||||||
*2023-01-02*
|
*2023-01-02*
|
||||||
|
|||||||
@@ -70,11 +70,12 @@ Namespace API.Imgur
|
|||||||
Friend Shared Function GetVideoInfo(ByVal URL As String, Optional ByVal e As ErrorsDescriber = Nothing) As IEnumerable(Of UserMedia)
|
Friend Shared Function GetVideoInfo(ByVal URL As String, Optional ByVal e As ErrorsDescriber = Nothing) As IEnumerable(Of UserMedia)
|
||||||
Try
|
Try
|
||||||
If Not URL.IsEmptyString AndAlso URL.ToLower.Contains("imgur") AndAlso Not Settings.ImgurClientID.IsEmptyString Then
|
If Not URL.IsEmptyString AndAlso URL.ToLower.Contains("imgur") AndAlso Not Settings.ImgurClientID.IsEmptyString Then
|
||||||
Dim img$ = GetImage(URL, EDP.ReturnValue)
|
Dim imgList As List(Of String) = GetGallery(URL, EDP.ReturnValue)
|
||||||
If Not img.IsEmptyString Then
|
If imgList.ListExists Then
|
||||||
Return {New UserMedia(img)}
|
Return imgList.Select(Function(u) New UserMedia(u))
|
||||||
Else
|
Else
|
||||||
Return GetGallery(URL, EDP.ReturnValue).ListIfNothing.Select(Function(u) New UserMedia(u))
|
Dim img$ = GetImage(URL, EDP.ReturnValue)
|
||||||
|
If Not img.IsEmptyString Then Return {New UserMedia(img)}
|
||||||
End If
|
End If
|
||||||
End If
|
End If
|
||||||
Return Nothing
|
Return Nothing
|
||||||
|
|||||||
@@ -1396,6 +1396,7 @@ ResumeDownloadingOperation:
|
|||||||
If result < 6 Then
|
If result < 6 Then
|
||||||
Dim collectionResult% = -1
|
Dim collectionResult% = -1
|
||||||
Dim tmpResult%
|
Dim tmpResult%
|
||||||
|
Dim tmpUserNames As New List(Of String)
|
||||||
Dim IsMultiple As Boolean = users.Count > 1
|
Dim IsMultiple As Boolean = users.Count > 1
|
||||||
Dim removedUsers As New List(Of String)
|
Dim removedUsers As New List(Of String)
|
||||||
Dim keepData As Boolean = Not (result Mod 2) = 0
|
Dim keepData As Boolean = Not (result Mod 2) = 0
|
||||||
@@ -1430,10 +1431,18 @@ ResumeDownloadingOperation:
|
|||||||
removedUsers.Add(ugn(user))
|
removedUsers.Add(ugn(user))
|
||||||
user.Dispose()
|
user.Dispose()
|
||||||
Else
|
Else
|
||||||
|
If banUser Then
|
||||||
|
tmpUserNames.Clear()
|
||||||
|
If user.IsCollection Then
|
||||||
|
tmpUserNames.ListAddList(DirectCast(user, UserDataBind).Collections.Select(Function(u) u.Name), l)
|
||||||
|
Else
|
||||||
|
tmpUserNames.Add(user.Name)
|
||||||
|
End If
|
||||||
|
End If
|
||||||
tmpResult = user.Delete(IsMultiple, collectionResult)
|
tmpResult = user.Delete(IsMultiple, collectionResult)
|
||||||
If user.IsCollection And collectionResult = -1 Then collectionResult = tmpResult
|
If user.IsCollection And collectionResult = -1 Then collectionResult = tmpResult
|
||||||
If tmpResult > 0 Then
|
If tmpResult > 0 Then
|
||||||
If banUser Then Settings.BlackList.ListAddValue(New UserBan(user.Name, reason), l) : b = True
|
If banUser And tmpUserNames.Count > 0 Then Settings.BlackList.ListAddList(tmpUserNames.Select(Function(u) New UserBan(u, reason)), l) : b = True
|
||||||
RemoveUserFromList(user)
|
RemoveUserFromList(user)
|
||||||
removedUsers.Add(ugn(user))
|
removedUsers.Add(ugn(user))
|
||||||
Else
|
Else
|
||||||
|
|||||||
@@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices
|
|||||||
' by using the '*' as shown below:
|
' by using the '*' as shown below:
|
||||||
' <Assembly: AssemblyVersion("1.0.*")>
|
' <Assembly: AssemblyVersion("1.0.*")>
|
||||||
|
|
||||||
<Assembly: AssemblyVersion("2023.1.2.0")>
|
<Assembly: AssemblyVersion("2023.1.24.0")>
|
||||||
<Assembly: AssemblyFileVersion("2023.1.2.0")>
|
<Assembly: AssemblyFileVersion("2023.1.24.0")>
|
||||||
<Assembly: NeutralResourcesLanguage("en")>
|
<Assembly: NeutralResourcesLanguage("en")>
|
||||||
|
|||||||
Reference in New Issue
Block a user