2.0.0.1

Added download individual imgur media
Fixed missing file
Updated global settings form
Fixed incorrect filling user params

Author: AAndyProgram

Changelog.md

@@ -1,3 +1,11 @@
+# 2.0.0.1
+
+- Added
+  - Download individual Imgur media files (use the "Download video" form).
+- Fixed
+  - Incorrect filling of user parameters in the user creation form
+  - In some cases, the global settings cannot be saved.
+
 # 2.0.0.0
 
 - Added
@@ -6,7 +14,7 @@
   - Group for regular channels in the main window
   - Ability to change user/collection path
   - Imgur albums downloading
-  - NSFW Imgur content bypass (requires 'CilentID')
+  - NSFW Imgur content bypass (requires 'ClientID')
   - Special user folder
   - Remove user while keeping data
   - Disabled overriding user preferences when creating a new user if it already exists in the destination (in case of deleting a user with saving data).

SCrawler/API/Imgur/Envir.vb

@@ -10,6 +10,7 @@ Imports PersonalUtilities.Functions.XML
 Imports PersonalUtilities.Tools.WebDocuments.JSON
 Imports System.Net
 Imports SCrawler.API.Imgur.Declarations
+Imports SCrawler.API.Base
 Namespace API.Imgur.Declarations
     Friend Module Imgur_Declarations
         Friend ReadOnly PostRegex As New RegexStructure("/([\w\d]+?)(|\.[\w]{0,4})\Z", 1)
@@ -19,7 +20,7 @@ Namespace API.Imgur
     Friend NotInheritable Class Envir
         Private Sub New()
         End Sub
-        Friend Shared Function GetGallery(ByVal URL As String) As List(Of String)
+        Friend Shared Function GetGallery(ByVal URL As String, Optional ByVal e As ErrorsDescriber = Nothing) As List(Of String)
             Try
                 If Not Settings.ImgurClientID.IsEmptyString And Not URL.IsEmptyString Then
                     Dim __url$ = RegexReplace(URL, PostRegex)
@@ -45,10 +46,11 @@ Namespace API.Imgur
                 End If
                 Return Nothing
             Catch ex As Exception
-                Return ErrorsDescriber.Execute(EDP.ReturnValue + EDP.SendInLog, ex, $"[API.Imgur.Envir.GetGallery({URL})]", Nothing)
+                If Not e.Exists Then e = New ErrorsDescriber(EDP.ReturnValue + EDP.SendInLog)
+                Return ErrorsDescriber.Execute(e, ex, $"[API.Imgur.Envir.GetGallery({URL})]", Nothing)
             End Try
         End Function
-        Friend Shared Function GetImage(ByVal URL As String) As String
+        Friend Shared Function GetImage(ByVal URL As String, Optional ByVal e As ErrorsDescriber = Nothing) As String
             Try
                 If Not Settings.ImgurClientID.IsEmptyString And Not URL.IsEmptyString Then
                     Dim __url$ = RegexReplace(URL, PostRegex)
@@ -62,7 +64,23 @@ Namespace API.Imgur
                 End If
                 Return String.Empty
             Catch ex As Exception
-                Return ErrorsDescriber.Execute(EDP.ReturnValue + EDP.SendInLog, ex, $"[API.Imgur.Envir.GetImage({URL})]", String.Empty)
+                If Not e.Exists Then e = New ErrorsDescriber(EDP.ReturnValue + EDP.SendInLog)
+                Return ErrorsDescriber.Execute(e, ex, $"[API.Imgur.Envir.GetImage({URL})]", String.Empty)
+            End Try
+        End Function
+        Friend Shared Function GetVideoInfo(ByVal URL As String) As IEnumerable(Of UserMedia)
+            Try
+                If Not URL.IsEmptyString AndAlso URL.ToLower.Contains("imgur") AndAlso Not Settings.ImgurClientID.IsEmptyString Then
+                    Dim img$ = GetImage(URL, EDP.ReturnValue)
+                    If Not img.IsEmptyString Then
+                        Return {New UserMedia(img)}
+                    Else
+                        Return GetGallery(URL, EDP.ReturnValue).ListIfNothing.Select(Function(u) New UserMedia(u))
+                    End If
+                End If
+                Return Nothing
+            Catch ex As Exception
+                Return ErrorsDescriber.Execute(EDP.ShowMainMsg + EDP.SendInLog, ex, "Imgur standalone downloader: fetch media error")
             End Try
         End Function
     End Class

SCrawler/Editors/GlobalSettingsForm.Designer.vb

@@ -191,6 +191,15 @@
         AFuc5QFgn6ClHh5iOQVAKNixyucB8NY0vG9JOzzyhrdq5IRgAAAAAElFTkSuQmCC
 </value>
   </data>
+  <metadata name="TP_FILE_NAME.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="TP_FILE_PATTERNS.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="LBL_DATE_POS.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
   <metadata name="TT_MAIN.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>False</value>
   </metadata>
@@ -202,15 +211,6 @@
 This parameter specifies how the video will be stored in the users' download path.
 If checked, videos will be stored in separate folder; otherwise, videos will be stored along with images.</value>
   </data>
-  <metadata name="TP_FILE_NAME.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </metadata>
-  <metadata name="TP_FILE_PATTERNS.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </metadata>
-  <metadata name="LBL_DATE_POS.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </metadata>
   <metadata name="TP_CHANNELS_IMGS.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>False</value>
   </metadata>

SCrawler/Editors/GlobalSettingsForm.resx

@@ -139,7 +139,7 @@ Namespace Editors
                         End Select
                     End If
 
-                    If CH_FILE_NAME_CHANGE.Checked And (Not CH_FILE_DATE.Checked Or Not CH_FILE_TIME.Checked) Then
+                    If CH_FILE_NAME_CHANGE.Checked And (Not CH_FILE_DATE.Checked And Not CH_FILE_TIME.Checked) Then
                         MsgBoxE({"You must select at least one option (Date and/or Time) if you want to change file names by date or disable file names changes",
                                  "File name options"}, vbCritical)
                         Exit Sub
@@ -219,13 +219,13 @@ Namespace Editors
         Private Sub TXT_MAX_JOBS_CHANNELS_ActionOnButtonClick(ByVal Sender As ActionButton) Handles TXT_MAX_JOBS_CHANNELS.ActionOnButtonClick
             If Sender.DefaultButton = ActionButton.DefaultButtons.Refresh Then TXT_MAX_JOBS_CHANNELS.Value = SettingsCLS.DefaultMaxDownloadingTasks
         End Sub
-        Private Sub CH_FILE_NAME_CHANGE_CheckedChanged(sender As Object, e As EventArgs)
+        Private Sub CH_FILE_NAME_CHANGE_CheckedChanged(sender As Object, e As EventArgs) Handles CH_FILE_NAME_CHANGE.CheckedChanged
             ChangeFileNameChangersEnabling()
         End Sub
-        Private Sub OPT_FILE_NAME_REPLACE_CheckedChanged(sender As Object, e As EventArgs)
+        Private Sub OPT_FILE_NAME_REPLACE_CheckedChanged(sender As Object, e As EventArgs) Handles OPT_FILE_NAME_REPLACE.CheckedChanged
             ChangePositionControlsEnabling()
         End Sub
-        Private Sub OPT_FILE_NAME_ADD_DATE_CheckedChanged(sender As Object, e As EventArgs)
+        Private Sub OPT_FILE_NAME_ADD_DATE_CheckedChanged(sender As Object, e As EventArgs) Handles OPT_FILE_NAME_ADD_DATE.CheckedChanged
             ChangePositionControlsEnabling()
         End Sub
         Private Sub ChangePositionControlsEnabling()

SCrawler/Editors/GlobalSettingsForm.vb

@@ -120,6 +120,7 @@ Namespace Editors
                             Case Sites.Twitter : OPT_TWITTER.Checked = True
                             Case Sites.Instagram : OPT_INSTAGRAM.Checked = True
                         End Select
+                        SetParamsBySite()
                         OPT_REDDIT.Enabled = False
                         OPT_TWITTER.Enabled = False
                         OPT_INSTAGRAM.Enabled = False
@@ -153,7 +154,6 @@ Namespace Editors
                     .MyFieldsChecker = New FieldsChecker
                     .MyFieldsChecker.AddControl(Of String)(TXT_USER, TXT_USER.CaptionText)
                     .MyFieldsChecker.EndLoaderOperations()
-                    SetParamsBySite()
                     .AppendDetectors()
                     .EndLoaderOperations()
                 End With

SCrawler/Editors/UserCreatorForm.vb

@@ -7,6 +7,7 @@
 ' This program is distributed in the hope that it will be useful,
 ' but WITHOUT ANY WARRANTY
 Imports PersonalUtilities.Functions.XML
+Imports PersonalUtilities.Tools.WEB
 Imports SCrawler.API
 Imports SCrawler.API.Base
 Friend Module MainMod
@@ -225,6 +226,7 @@ Friend Module MainMod
             If Not URL.IsEmptyString Then
                 Dim um As IEnumerable(Of UserMedia) = Nothing
                 Dim site As Sites
+                Dim IsImgur As Boolean = False
                 If URL.Contains("twitter") Then
                     um = Twitter.UserData.GetVideoInfo(URL)
                     site = Sites.Twitter
@@ -234,6 +236,9 @@ Friend Module MainMod
                 ElseIf URL.Contains("instagram.com") Then
                     um = Instagram.UserData.GetVideoInfo(URL)
                     site = Sites.Instagram
+                ElseIf URL.Contains("imgur.com") Then
+                    um = Imgur.Envir.GetVideoInfo(URL)
+                    IsImgur = True
                 Else
                     MsgBoxE("Site of video URL does not recognized" & vbCr & "Operation canceled", MsgBoxStyle.Exclamation, e)
                     Return False
@@ -250,8 +255,8 @@ Friend Module MainMod
                                    Settings.LatestSavingPath.Value.Exists(SFO.Path, False) Then f.Path = Settings.LatestSavingPath.Value
                             If AskForPath OrElse Not f.Exists(SFO.Path, False) Then
 #Disable Warning BC40000
-                                If site = Sites.Instagram Then
-                                    ff = SFile.SaveAs(f, "Instagram files destination",,,, EDP.ReturnValue)
+                                If site = Sites.Instagram Or IsImgur Then
+                                    ff = SFile.SaveAs(f, "Files destination",,,, EDP.ReturnValue)
                                     If Not ff.IsEmptyString Then
                                         f.Path = ff.Path
                                     Else
@@ -395,4 +400,9 @@ Friend Module MainMod
         Return UserBanned({UserName}).ListExists
     End Function
 #End Region
+    Friend Sub CheckVersion(ByVal Force As Boolean)
+        If Settings.CheckUpdatesAtStart Or Force Then _
+            GitHub.DefaultVersionChecker(My.Application.Info.Version, "AAndyProgram", "SCrawler",
+                                         Settings.LatestVersion.Value, Settings.ShowNewVersionNotification.Value, Force)
+    End Sub
 End Module

SCrawler/MainMod.vb

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

SCrawler/My Project/AssemblyInfo.vb

@@ -197,7 +197,6 @@
     <Compile Include="Editors\UserCreatorForm.vb">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Info\InfoMod.vb" />
     <Compile Include="LabelsKeeper.vb" />
     <Compile Include="MainFrame.vb">
       <SubType>Form</SubType>