diff --git a/Changelog.md b/Changelog.md index 237dd55..2fd4299 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,13 +2,24 @@ - [ffmpeg](https://github.com/AAndyProgram/SCrawler/wiki/Settings#ffmpeg) - x64 version - [release](https://github.com/GyanD/codexffmpeg/releases/tag/5.1.2); [zip](https://github.com/GyanD/codexffmpeg/releases/download/5.1.2/ffmpeg-5.1.2-full_build.zip); **version `5.1.2-full_build-www.gyan.dev`** - x86 version - [release](https://github.com/yt-dlp/FFmpeg-Builds/releases/tag/autobuild-2022-11-30-12-57); [zip](https://github.com/yt-dlp/FFmpeg-Builds/releases/download/autobuild-2022-11-30-12-57/ffmpeg-N-109274-gd7a5f068c2-win32-gpl.zip); **version `N-109457-geeb280f351-20221226`** -- [Gallery-dl](https://github.com/AAndyProgram/SCrawler/wiki/Settings#gallery-dl) - **1.32.18** +- [Gallery-dl](https://github.com/AAndyProgram/SCrawler/wiki/Settings#gallery-dl) - **1.32.19** - [YT-DLP](https://github.com/AAndyProgram/SCrawler/wiki/Settings#yt-dlp) - **2026.10.26** - [Deno](https://github.com/AAndyProgram/SCrawler/wiki/Settings#deno) - latest *(`2.0.0` or higher)* - [OF-Scraper](https://github.com/AAndyProgram/SCrawler/wiki/Settings#of-scraper) - **3.12.9** ([release](https://github.com/datawhores/OF-Scraper/releases/tag/3.12.9)) # 2026 +## 2026.11.8.0 + +*2026-11-08* + +- Updated + - gallery-dl up to version **1.32.19** +- Fixed + - Sites: + - PornHub: subscriptions don't load photos + - **Reddit: channels are not downloading** + ## 2026.10.29.0 *2026-10-29* diff --git a/SCrawler/API/PornHub/UserData.vb b/SCrawler/API/PornHub/UserData.vb index 62f700e..4d67117 100644 --- a/SCrawler/API/PornHub/UserData.vb +++ b/SCrawler/API/PornHub/UserData.vb @@ -428,7 +428,7 @@ Namespace API.PornHub 'Debug.WriteLineIf(l.Count > 0, l.Select(Function(ll) ll.Title).ListToString(vbNewLine)) If prevPostsFound And Not pageRepeatSet And Not newPostsFound Then pageRepeatSet = True : _PageVideosRepeat += 1 If prevPostsFound And newPostsFound And pageRepeatSet Then _PageVideosRepeat -= 1 - If l.Count > 0 Then _TempMediaList.ListAddList(l.Select(Function(uv) uv.ToUserMedia(specFolder, useYtdlp))) + If l.Count > 0 Then _TempMediaList.ListAddList(l.Select(Function(uv) uv.ToUserMedia(specFolder, useYtdlp And Not IsSubscription))) SessionPosts.ListAddList(newLastPageIDs, LNC) newLastPageIDs.Clear() diff --git a/SCrawler/API/Reddit/Channel.vb b/SCrawler/API/Reddit/Channel.vb index 7ea305a..f18956a 100644 --- a/SCrawler/API/Reddit/Channel.vb +++ b/SCrawler/API/Reddit/Channel.vb @@ -91,20 +91,12 @@ Namespace API.Reddit Friend Property DownloadText As Boolean = False Implements IRedditView.DownloadText Friend Property DownloadTextPosts As Boolean = False Implements IRedditView.DownloadTextPosts Friend Property DownloadTextSpecialFolder As Boolean = False Implements IRedditView.DownloadTextSpecialFolder + Friend Property UserExists As Boolean Implements IRedditView.UserExists + Friend Property UserSuspended As Boolean Implements IRedditView.UserSuspended Friend Property RedGifsAccount As String = String.Empty Implements IRedditView.RedGifsAccount Friend Property RedditAccount As String = String.Empty Implements IRedditView.RedditAccount Friend Sub SetView(ByVal Options As IRedditView) Implements IRedditView.SetView - If Not Options Is Nothing Then - With Options - ViewMode = .ViewMode - ViewPeriod = .ViewPeriod - DownloadText = .DownloadText - DownloadTextPosts = .DownloadTextPosts - DownloadTextSpecialFolder = .DownloadTextSpecialFolder - RedditAccount = .RedditAccount - RedGifsAccount = .RedGifsAccount - End With - End If + RedditViewExchange.SetView(Me, Options) End Sub #Region "Statistics support" Private ReadOnly CountOfAddedUsers As List(Of Integer) diff --git a/SCrawler/API/Reddit/IRedditView.vb b/SCrawler/API/Reddit/IRedditView.vb index 547ba9a..678819b 100644 --- a/SCrawler/API/Reddit/IRedditView.vb +++ b/SCrawler/API/Reddit/IRedditView.vb @@ -28,6 +28,8 @@ Namespace API.Reddit Property DownloadText As Boolean Property DownloadTextPosts As Boolean Property DownloadTextSpecialFolder As Boolean + Property UserExists As Boolean + Property UserSuspended As Boolean Property RedGifsAccount As String Property RedditAccount As String Sub SetView(ByVal Options As IRedditView) @@ -42,6 +44,8 @@ Namespace API.Reddit Friend Overrides Property DownloadText As Boolean Implements IRedditView.DownloadText Friend Overrides Property DownloadTextPosts As Boolean Implements IRedditView.DownloadTextPosts Friend Overrides Property DownloadTextSpecialFolder As Boolean Implements IRedditView.DownloadTextSpecialFolder + Friend Overrides Property UserExists As Boolean Implements IRedditView.UserExists + Friend Overrides Property UserSuspended As Boolean Implements IRedditView.UserSuspended Friend Property RedGifsAccount As String Implements IRedditView.RedGifsAccount Friend Property RedditAccount As String Implements IRedditView.RedditAccount Friend Sub New(ByVal Options As IRedditView) @@ -54,16 +58,19 @@ Namespace API.Reddit _ApplyBase_Name = False End Sub Friend Sub SetView(ByVal Options As IRedditView) Implements IRedditView.SetView - If Not Options Is Nothing Then - With Options - ViewMode = .ViewMode - ViewPeriod = .ViewPeriod - DownloadText = .DownloadText - DownloadTextPosts = .DownloadTextPosts - DownloadTextSpecialFolder = .DownloadTextSpecialFolder - RedGifsAccount = .RedGifsAccount - RedditAccount = .RedditAccount - End With + SetView(Me, Options) + End Sub + Friend Shared Sub SetView(ByVal Dest As IRedditView, ByVal Source As IRedditView) + If Not Dest Is Nothing And Not Source Is Nothing Then + Dest.ViewMode = Source.ViewMode + Dest.ViewPeriod = Source.ViewPeriod + Dest.DownloadText = Source.DownloadText + Dest.DownloadTextPosts = Source.DownloadTextPosts + Dest.DownloadTextSpecialFolder = Source.DownloadTextSpecialFolder + Dest.UserExists = Source.UserExists + Dest.UserSuspended = Source.UserSuspended + Dest.RedGifsAccount = Source.RedGifsAccount + Dest.RedditAccount = Source.RedditAccount End If End Sub End Class diff --git a/SCrawler/API/Reddit/RedditViewSettingsForm.Designer.vb b/SCrawler/API/Reddit/RedditViewSettingsForm.Designer.vb index 8493196..2961eff 100644 --- a/SCrawler/API/Reddit/RedditViewSettingsForm.Designer.vb +++ b/SCrawler/API/Reddit/RedditViewSettingsForm.Designer.vb @@ -27,10 +27,11 @@ Namespace API.Reddit Dim TP_VIEW_MODE As System.Windows.Forms.TableLayoutPanel Dim LBL_VIEW_MODE As System.Windows.Forms.Label Dim LBL_PERIOD As System.Windows.Forms.Label - Dim ActionButton3 As PersonalUtilities.Forms.Controls.Base.ActionButton = New PersonalUtilities.Forms.Controls.Base.ActionButton() + Dim ActionButton7 As PersonalUtilities.Forms.Controls.Base.ActionButton = New PersonalUtilities.Forms.Controls.Base.ActionButton() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(RedditViewSettingsForm)) - Dim ActionButton4 As PersonalUtilities.Forms.Controls.Base.ActionButton = New PersonalUtilities.Forms.Controls.Base.ActionButton() + Dim ActionButton8 As PersonalUtilities.Forms.Controls.Base.ActionButton = New PersonalUtilities.Forms.Controls.Base.ActionButton() Dim TP_TEXT As System.Windows.Forms.TableLayoutPanel + Dim TP_USER_ES As System.Windows.Forms.TableLayoutPanel Me.TP_MAIN = New System.Windows.Forms.TableLayoutPanel() Me.OPT_VIEW_MODE_NEW = New System.Windows.Forms.RadioButton() Me.OPT_VIEW_MODE_HOT = New System.Windows.Forms.RadioButton() @@ -48,13 +49,16 @@ Namespace API.Reddit Me.CMB_REDDIT_ACC = New PersonalUtilities.Forms.Controls.ComboBoxExtended() Me.CH_TXT_DOWN_TXT = New System.Windows.Forms.CheckBox() Me.CH_TXT_DOWN_POSTS = New System.Windows.Forms.CheckBox() - Me.TT_MAIN = New System.Windows.Forms.ToolTip(Me.components) Me.CH_TXT_DOWN_SPEC_FOLDER = New System.Windows.Forms.CheckBox() + Me.CH_USER_EXISTS = New System.Windows.Forms.CheckBox() + Me.CH_USER_SUSPENDED = New System.Windows.Forms.CheckBox() + Me.TT_MAIN = New System.Windows.Forms.ToolTip(Me.components) CONTAINER_MAIN = New System.Windows.Forms.ToolStripContainer() TP_VIEW_MODE = New System.Windows.Forms.TableLayoutPanel() LBL_VIEW_MODE = New System.Windows.Forms.Label() LBL_PERIOD = New System.Windows.Forms.Label() TP_TEXT = New System.Windows.Forms.TableLayoutPanel() + TP_USER_ES = New System.Windows.Forms.TableLayoutPanel() CONTAINER_MAIN.ContentPanel.SuspendLayout() CONTAINER_MAIN.SuspendLayout() Me.TP_MAIN.SuspendLayout() @@ -63,6 +67,7 @@ Namespace API.Reddit CType(Me.CMB_REDGIFS_ACC, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.CMB_REDDIT_ACC, System.ComponentModel.ISupportInitialize).BeginInit() TP_TEXT.SuspendLayout() + TP_USER_ES.SuspendLayout() Me.SuspendLayout() ' 'CONTAINER_MAIN @@ -71,13 +76,13 @@ Namespace API.Reddit 'CONTAINER_MAIN.ContentPanel ' CONTAINER_MAIN.ContentPanel.Controls.Add(Me.TP_MAIN) - CONTAINER_MAIN.ContentPanel.Size = New System.Drawing.Size(477, 222) + CONTAINER_MAIN.ContentPanel.Size = New System.Drawing.Size(477, 247) CONTAINER_MAIN.Dock = System.Windows.Forms.DockStyle.Fill CONTAINER_MAIN.LeftToolStripPanelVisible = False CONTAINER_MAIN.Location = New System.Drawing.Point(0, 0) CONTAINER_MAIN.Name = "CONTAINER_MAIN" CONTAINER_MAIN.RightToolStripPanelVisible = False - CONTAINER_MAIN.Size = New System.Drawing.Size(477, 222) + CONTAINER_MAIN.Size = New System.Drawing.Size(477, 247) CONTAINER_MAIN.TabIndex = 0 CONTAINER_MAIN.TopToolStripPanelVisible = False ' @@ -88,20 +93,22 @@ Namespace API.Reddit Me.TP_MAIN.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100.0!)) Me.TP_MAIN.Controls.Add(TP_VIEW_MODE, 0, 0) Me.TP_MAIN.Controls.Add(Me.TP_PERIOD, 0, 1) - Me.TP_MAIN.Controls.Add(Me.CMB_REDGIFS_ACC, 0, 4) - Me.TP_MAIN.Controls.Add(Me.CMB_REDDIT_ACC, 0, 3) + Me.TP_MAIN.Controls.Add(Me.CMB_REDGIFS_ACC, 0, 5) + Me.TP_MAIN.Controls.Add(Me.CMB_REDDIT_ACC, 0, 4) Me.TP_MAIN.Controls.Add(TP_TEXT, 0, 2) + Me.TP_MAIN.Controls.Add(TP_USER_ES, 0, 3) Me.TP_MAIN.Dock = System.Windows.Forms.DockStyle.Fill Me.TP_MAIN.Location = New System.Drawing.Point(0, 0) Me.TP_MAIN.Name = "TP_MAIN" - Me.TP_MAIN.RowCount = 6 + Me.TP_MAIN.RowCount = 7 Me.TP_MAIN.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 56.0!)) Me.TP_MAIN.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 56.0!)) Me.TP_MAIN.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25.0!)) + Me.TP_MAIN.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25.0!)) Me.TP_MAIN.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 28.0!)) Me.TP_MAIN.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 28.0!)) Me.TP_MAIN.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100.0!)) - Me.TP_MAIN.Size = New System.Drawing.Size(477, 222) + Me.TP_MAIN.Size = New System.Drawing.Size(477, 247) Me.TP_MAIN.TabIndex = 0 ' 'TP_VIEW_MODE @@ -220,7 +227,7 @@ Namespace API.Reddit Me.TP_PERIOD.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50.0!)) Me.TP_PERIOD.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50.0!)) Me.TP_PERIOD.Size = New System.Drawing.Size(475, 56) - Me.TP_PERIOD.TabIndex = 2 + Me.TP_PERIOD.TabIndex = 1 ' 'LBL_PERIOD ' @@ -307,38 +314,38 @@ Namespace API.Reddit ' 'CMB_REDGIFS_ACC ' - ActionButton3.BackgroundImage = CType(resources.GetObject("ActionButton3.BackgroundImage"), System.Drawing.Image) - ActionButton3.Name = "ArrowDown" - ActionButton3.Tag = PersonalUtilities.Forms.Controls.Base.ActionButton.DefaultButtons.ArrowDown - Me.CMB_REDGIFS_ACC.Buttons.Add(ActionButton3) + ActionButton7.BackgroundImage = CType(resources.GetObject("ActionButton7.BackgroundImage"), System.Drawing.Image) + ActionButton7.Name = "ArrowDown" + ActionButton7.Tag = PersonalUtilities.Forms.Controls.Base.ActionButton.DefaultButtons.ArrowDown + Me.CMB_REDGIFS_ACC.Buttons.Add(ActionButton7) Me.CMB_REDGIFS_ACC.CaptionMode = PersonalUtilities.Forms.Controls.Base.ICaptionControl.Modes.Label Me.CMB_REDGIFS_ACC.CaptionSizeType = System.Windows.Forms.SizeType.Percent Me.CMB_REDGIFS_ACC.CaptionText = "RedGifs account" Me.CMB_REDGIFS_ACC.CaptionVisible = True Me.CMB_REDGIFS_ACC.CaptionWidth = 26.0R Me.CMB_REDGIFS_ACC.Dock = System.Windows.Forms.DockStyle.Fill - Me.CMB_REDGIFS_ACC.Location = New System.Drawing.Point(4, 173) + Me.CMB_REDGIFS_ACC.Location = New System.Drawing.Point(4, 199) Me.CMB_REDGIFS_ACC.Name = "CMB_REDGIFS_ACC" Me.CMB_REDGIFS_ACC.Size = New System.Drawing.Size(469, 22) - Me.CMB_REDGIFS_ACC.TabIndex = 4 + Me.CMB_REDGIFS_ACC.TabIndex = 5 Me.CMB_REDGIFS_ACC.TextBoxBorderStyle = System.Windows.Forms.BorderStyle.FixedSingle ' 'CMB_REDDIT_ACC ' - ActionButton4.BackgroundImage = CType(resources.GetObject("ActionButton4.BackgroundImage"), System.Drawing.Image) - ActionButton4.Name = "ArrowDown" - ActionButton4.Tag = PersonalUtilities.Forms.Controls.Base.ActionButton.DefaultButtons.ArrowDown - Me.CMB_REDDIT_ACC.Buttons.Add(ActionButton4) + ActionButton8.BackgroundImage = CType(resources.GetObject("ActionButton8.BackgroundImage"), System.Drawing.Image) + ActionButton8.Name = "ArrowDown" + ActionButton8.Tag = PersonalUtilities.Forms.Controls.Base.ActionButton.DefaultButtons.ArrowDown + Me.CMB_REDDIT_ACC.Buttons.Add(ActionButton8) Me.CMB_REDDIT_ACC.CaptionMode = PersonalUtilities.Forms.Controls.Base.ICaptionControl.Modes.Label Me.CMB_REDDIT_ACC.CaptionSizeType = System.Windows.Forms.SizeType.Percent Me.CMB_REDDIT_ACC.CaptionText = "Reddit account" Me.CMB_REDDIT_ACC.CaptionVisible = True Me.CMB_REDDIT_ACC.CaptionWidth = 26.0R Me.CMB_REDDIT_ACC.Dock = System.Windows.Forms.DockStyle.Fill - Me.CMB_REDDIT_ACC.Location = New System.Drawing.Point(4, 144) + Me.CMB_REDDIT_ACC.Location = New System.Drawing.Point(4, 170) Me.CMB_REDDIT_ACC.Name = "CMB_REDDIT_ACC" Me.CMB_REDDIT_ACC.Size = New System.Drawing.Size(469, 22) - Me.CMB_REDDIT_ACC.TabIndex = 3 + Me.CMB_REDDIT_ACC.TabIndex = 4 Me.CMB_REDDIT_ACC.TextBoxBorderStyle = System.Windows.Forms.BorderStyle.FixedSingle ' 'TP_TEXT @@ -357,7 +364,7 @@ Namespace API.Reddit TP_TEXT.RowCount = 1 TP_TEXT.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100.0!)) TP_TEXT.Size = New System.Drawing.Size(475, 25) - TP_TEXT.TabIndex = 5 + TP_TEXT.TabIndex = 2 ' 'CH_TXT_DOWN_TXT ' @@ -395,19 +402,58 @@ Namespace API.Reddit Me.TT_MAIN.SetToolTip(Me.CH_TXT_DOWN_SPEC_FOLDER, "If checked, text files will be saved to a separate folder") Me.CH_TXT_DOWN_SPEC_FOLDER.UseVisualStyleBackColor = True ' + 'TP_USER_ES + ' + TP_USER_ES.ColumnCount = 2 + TP_USER_ES.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50.0!)) + TP_USER_ES.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50.0!)) + TP_USER_ES.Controls.Add(Me.CH_USER_EXISTS, 0, 0) + TP_USER_ES.Controls.Add(Me.CH_USER_SUSPENDED, 1, 0) + TP_USER_ES.Dock = System.Windows.Forms.DockStyle.Fill + TP_USER_ES.Location = New System.Drawing.Point(1, 141) + TP_USER_ES.Margin = New System.Windows.Forms.Padding(0) + TP_USER_ES.Name = "TP_USER_ES" + TP_USER_ES.RowCount = 1 + TP_USER_ES.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100.0!)) + TP_USER_ES.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25.0!)) + TP_USER_ES.Size = New System.Drawing.Size(475, 25) + TP_USER_ES.TabIndex = 3 + ' + 'CH_USER_EXISTS + ' + Me.CH_USER_EXISTS.AutoSize = True + Me.CH_USER_EXISTS.Dock = System.Windows.Forms.DockStyle.Fill + Me.CH_USER_EXISTS.Location = New System.Drawing.Point(3, 3) + Me.CH_USER_EXISTS.Name = "CH_USER_EXISTS" + Me.CH_USER_EXISTS.Size = New System.Drawing.Size(231, 19) + Me.CH_USER_EXISTS.TabIndex = 0 + Me.CH_USER_EXISTS.Text = "User exists" + Me.CH_USER_EXISTS.UseVisualStyleBackColor = True + ' + 'CH_USER_SUSPENDED + ' + Me.CH_USER_SUSPENDED.AutoSize = True + Me.CH_USER_SUSPENDED.Dock = System.Windows.Forms.DockStyle.Fill + Me.CH_USER_SUSPENDED.Location = New System.Drawing.Point(240, 3) + Me.CH_USER_SUSPENDED.Name = "CH_USER_SUSPENDED" + Me.CH_USER_SUSPENDED.Size = New System.Drawing.Size(232, 19) + Me.CH_USER_SUSPENDED.TabIndex = 1 + Me.CH_USER_SUSPENDED.Text = "User suspended" + Me.CH_USER_SUSPENDED.UseVisualStyleBackColor = True + ' 'RedditViewSettingsForm ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(477, 222) + Me.ClientSize = New System.Drawing.Size(477, 247) Me.Controls.Add(CONTAINER_MAIN) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle Me.Icon = Global.SCrawler.My.Resources.SiteResources.RedditIcon_128 Me.KeyPreview = True Me.MaximizeBox = False - Me.MaximumSize = New System.Drawing.Size(493, 261) + Me.MaximumSize = New System.Drawing.Size(493, 286) Me.MinimizeBox = False - Me.MinimumSize = New System.Drawing.Size(493, 261) + Me.MinimumSize = New System.Drawing.Size(493, 286) Me.Name = "RedditViewSettingsForm" Me.ShowInTaskbar = False Me.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide @@ -424,6 +470,8 @@ Namespace API.Reddit CType(Me.CMB_REDDIT_ACC, System.ComponentModel.ISupportInitialize).EndInit() TP_TEXT.ResumeLayout(False) TP_TEXT.PerformLayout() + TP_USER_ES.ResumeLayout(False) + TP_USER_ES.PerformLayout() Me.ResumeLayout(False) End Sub @@ -446,5 +494,7 @@ Namespace API.Reddit Private WithEvents TT_MAIN As ToolTip Private WithEvents CH_TXT_DOWN_POSTS As CheckBox Private WithEvents CH_TXT_DOWN_SPEC_FOLDER As CheckBox + Private WithEvents CH_USER_EXISTS As CheckBox + Private WithEvents CH_USER_SUSPENDED As CheckBox End Class End Namespace \ No newline at end of file diff --git a/SCrawler/API/Reddit/RedditViewSettingsForm.resx b/SCrawler/API/Reddit/RedditViewSettingsForm.resx index 435ba91..34387d4 100644 --- a/SCrawler/API/Reddit/RedditViewSettingsForm.resx +++ b/SCrawler/API/Reddit/RedditViewSettingsForm.resx @@ -130,7 +130,7 @@ False - + iVBORw0KGgoAAAANSUhEUgAAAgAAAAIACAYAAAD0eNT6AAAABGdBTUEAALGPC/xhBQAAE0xJREFUeF7t 3X2MZWddB/BZSkspUFsoXZidOc/vnOfsTmGgARaaBgK2VkFBsIAEgkAQsX8QNJFEq39oMMEoSDREElOB @@ -218,7 +218,7 @@ AAAAAAAAAAAAYIj+H5YGIizEb/aEAAAAAElFTkSuQmCC - + iVBORw0KGgoAAAANSUhEUgAAAgAAAAIACAYAAAD0eNT6AAAABGdBTUEAALGPC/xhBQAAE0xJREFUeF7t 3X2MZWddB/BZSkspUFsoXZidOc/vnOfsTmGgARaaBgK2VkFBsIAEgkAQsX8QNJFEq39oMMEoSDREElOB @@ -309,11 +309,8 @@ False - - 17, 17 - - - 17, 17 + + False False @@ -321,4 +318,10 @@ False + + 17, 17 + + + 17, 17 + \ No newline at end of file diff --git a/SCrawler/API/Reddit/RedditViewSettingsForm.vb b/SCrawler/API/Reddit/RedditViewSettingsForm.vb index c5b34d6..170950f 100644 --- a/SCrawler/API/Reddit/RedditViewSettingsForm.vb +++ b/SCrawler/API/Reddit/RedditViewSettingsForm.vb @@ -56,11 +56,14 @@ Namespace API.Reddit CH_TXT_DOWN_POSTS.Checked = MyOptions.DownloadTextPosts CH_TXT_DOWN_SPEC_FOLDER.Checked = MyOptions.DownloadTextSpecialFolder + CH_USER_EXISTS.Checked = MyOptions.UserExists + CH_USER_SUSPENDED.Checked = MyOptions.UserSuspended + PopulateCMB(Settings(RedditSiteKey), CMB_REDDIT_ACC, MyOptions.RedditAccount) PopulateCMB(Settings(RedGifs.RedGifsSiteKey), CMB_REDGIFS_ACC, MyOptions.RedGifsAccount) If IsUserSettings Then TP_MAIN.Controls.Remove(CMB_REDDIT_ACC) - TP_MAIN.RowStyles(3).Height = 0 + TP_MAIN.RowStyles(4).Height = 0 TP_MAIN.Refresh() Dim s As Size = Size s.Height -= 28 @@ -121,6 +124,8 @@ Namespace API.Reddit .DownloadText = CH_TXT_DOWN_TXT.Checked .DownloadTextPosts = CH_TXT_DOWN_POSTS.Checked .DownloadTextSpecialFolder = CH_TXT_DOWN_SPEC_FOLDER.Checked + .UserExists = CH_USER_EXISTS.Checked + .UserSuspended = CH_USER_SUSPENDED.Checked .RedGifsAccount = CMB_REDGIFS_ACC.Text If Not IsUserSettings Then .RedditAccount = CMB_REDDIT_ACC.Text End With diff --git a/SCrawler/API/Reddit/UserData.vb b/SCrawler/API/Reddit/UserData.vb index 74f7220..83a28a5 100644 --- a/SCrawler/API/Reddit/UserData.vb +++ b/SCrawler/API/Reddit/UserData.vb @@ -128,16 +128,8 @@ Namespace API.Reddit Friend Property ViewPeriod As CPeriod Implements IRedditView.ViewPeriod Friend Sub SetView(ByVal Options As IRedditView) Implements IRedditView.SetView If Not Options Is Nothing Then - With Options - ViewMode = .ViewMode - ViewPeriod = .ViewPeriod - DownloadText = .DownloadText - DownloadTextPosts = .DownloadTextPosts - DownloadTextSpecialFolder = .DownloadTextSpecialFolder - RedGifsAccount = .RedGifsAccount - RedditAccount = .RedditAccount - If TypeOf Options Is RedditViewExchange Then DirectCast(Options, RedditViewExchange).Apply(Me) - End With + RedditViewExchange.SetView(Me, Options) + If TypeOf Options Is RedditViewExchange Then DirectCast(Options, RedditViewExchange).Apply(Me) End If End Sub Private ReadOnly Property View As String @@ -168,8 +160,45 @@ Namespace API.Reddit End Get End Property Friend Overrides Property DownloadText As Boolean Implements IRedditView.DownloadText + Get + Return MyBase.DownloadText + End Get + Set(ByVal d As Boolean) + MyBase.DownloadText = d + End Set + End Property Friend Overrides Property DownloadTextPosts As Boolean Implements IRedditView.DownloadTextPosts + Get + Return MyBase.DownloadTextPosts + End Get + Set(ByVal d As Boolean) + MyBase.DownloadTextPosts = d + End Set + End Property Friend Overrides Property DownloadTextSpecialFolder As Boolean Implements IRedditView.DownloadTextSpecialFolder + Get + Return MyBase.DownloadTextSpecialFolder + End Get + Set(ByVal d As Boolean) + MyBase.DownloadTextSpecialFolder = d + End Set + End Property + Friend Overrides Property UserExists As Boolean Implements IRedditView.UserExists + Get + Return MyBase.UserExists + End Get + Set(ByVal e As Boolean) + MyBase.UserExists = e + End Set + End Property + Friend Overrides Property UserSuspended As Boolean Implements IRedditView.UserSuspended + Get + Return MyBase.UserSuspended + End Get + Set(ByVal s As Boolean) + MyBase.UserSuspended = s + End Set + End Property #End Region #Region "Initializer" Friend Sub New() @@ -451,6 +480,8 @@ Namespace API.Reddit If IsSavedPosts Then URL = $"https://www.reddit.com/user/{NameTrue}/saved.json?after={POST}" If Not POST.IsEmptyString Then Thread.Sleep(savedPostsSleepTimer) + ElseIf MySiteSettings.CredentialsExists Then + URL = $"https://oauth.reddit.com/r/{NameTrue}/{View}.json?allow_quarantined=true&allow_over18=1&include=identity&after={POST}&dist=25&sort={View}&t={Period}&layout=classic" Else URL = $"https://reddit.com/r/{NameTrue}/{View}.json?allow_quarantined=true&allow_over18=1&include=identity&after={POST}&dist=25&sort={View}&t={Period}&layout=classic" End If diff --git a/SCrawler/My Project/AssemblyInfo.vb b/SCrawler/My Project/AssemblyInfo.vb index b73a125..16e7db9 100644 --- a/SCrawler/My Project/AssemblyInfo.vb +++ b/SCrawler/My Project/AssemblyInfo.vb @@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices ' by using the '*' as shown below: ' - - + +