Merge pull request #205 from AlexCSDev/release_26

Release 26

Author: AlexCSDev

PatreonDownloader.App/Properties/AssemblyInfo.cs

@@ -29,5 +29,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("25.0.0.0")]
-[assembly: AssemblyFileVersion("25.0.0.0")]
+[assembly: AssemblyVersion("26.0.0.0")]
+[assembly: AssemblyFileVersion("26.0.0.0")]

PatreonDownloader.Implementation/Models/PatreonDownloaderSettings.cs

@@ -50,7 +50,7 @@ public record PatreonDownloaderSettings : UniversalDownloaderPlatformSettings, I
         public bool IsUseLegacyFilenaming { get; init; }
 
         public string LoginPageAddress { get { return "https://www.patreon.com/login"; } }
-        public string LoginCheckAddress { get { return "https://www.patreon.com/api/current_user"; } }
+        public string LoginCheckAddress { get { return "https://www.patreon.com/api/badges?json-api-version=1.0&include=[]"; } }
         public string CaptchaCookieRetrievalAddress { get { return "https://www.patreon.com/home"; } }
         public Uri RemoteBrowserAddress { get; init; }
         public bool IsHeadlessBrowser { get; init; }

PatreonDownloader.Implementation/PatreonCrawlTargetInfoRetriever.cs

@@ -35,7 +35,7 @@ private async Task<long> GetCampaignId(string url)
             {
                 string pageHtml = await _webDownloader.DownloadString(url);
 
-                Regex regex = new Regex("\"self\": \"https:\\/\\/www\\.patreon\\.com\\/api\\/campaigns\\/(\\d+)\"");
+                Regex regex = new Regex("\"self\": ?\"https:\\/\\/www\\.patreon\\.com\\/api\\/campaigns\\/(\\d+)\"");
                 Match match = regex.Match(pageHtml);
                 if (!match.Success)
                 {

PatreonDownloader.Implementation/PatreonCrawledUrlProcessor.cs

@@ -4,6 +4,7 @@
 using System.IO;
 using System.Text;
 using System.Text.RegularExpressions;
+using System.Threading;
 using System.Threading.Tasks;
 using NLog;
 using PatreonDownloader.Implementation.Enums;
@@ -23,8 +24,9 @@ class PatreonCrawledUrlProcessor : ICrawledUrlProcessor
 
         private readonly IRemoteFilenameRetriever _remoteFilenameRetriever;
         private readonly Logger _logger = LogManager.GetCurrentClassLogger();
+        private readonly SemaphoreSlim _duplicateNamesCheckSemaphore;
 
-        private ConcurrentDictionary<string, int> _fileCountDict; //file counter for duplicate check
+        private Dictionary<string, int> _fileCountDict; //file counter for duplicate check
         private PatreonDownloaderSettings _patreonDownloaderSettings;
 
         private static readonly Regex _fileIdRegex = new Regex(
@@ -42,12 +44,14 @@ public PatreonCrawledUrlProcessor(IRemoteFilenameRetriever remoteFilenameRetriev
             _remoteFilenameRetriever = remoteFilenameRetriever ??
                                        throw new ArgumentNullException(nameof(remoteFilenameRetriever));
 
+            _duplicateNamesCheckSemaphore = new SemaphoreSlim(1, 1);
+
             _logger.Debug("KemonoCrawledUrlProcessor initialized");
         }
 
         public async Task BeforeStart(IUniversalDownloaderPlatformSettings settings)
         {
-            _fileCountDict = new ConcurrentDictionary<string, int>();
+            _fileCountDict = new Dictionary<string, int>();
             _patreonDownloaderSettings = (PatreonDownloaderSettings) settings;
             await _remoteFilenameRetriever.BeforeStart(settings);
         }
@@ -147,13 +151,30 @@ public async Task<bool> ProcessCrawledUrl(ICrawledUrl udpCrawledUrl)
 
                 string key = $"{crawledUrl.PostId}_{filename.ToLowerInvariant()}";
 
-                _fileCountDict.AddOrUpdate(key, 0, (key, oldValue) => oldValue + 1);
+                //Semaphore is required because of possible race condition between multiple threads
+                await _duplicateNamesCheckSemaphore.WaitAsync();
+
+                int count = -1;
+                try
+                {
+                    if(_fileCountDict.ContainsKey(key))
+                        _fileCountDict[key]++;
+                    else
+                        _fileCountDict[key] = 0;
+
+
+                    count = _fileCountDict[key];
+                }
+                finally
+                {
+                    _duplicateNamesCheckSemaphore.Release();
+                }
 
-                if (_fileCountDict[key] > 1)
+                if (count > 1)
                 {
                     _logger.Warn($"Found more than a single file with the name {filename} in the same folder in post {crawledUrl.PostId}, sequential number will be appended to its name.");
 
-                    string appendStr = _fileCountDict[key].ToString();
+                    string appendStr = count.ToString();
 
                     if (crawledUrl.UrlType != PatreonCrawledUrlType.ExternalUrl)
                     {