Merge pull request #93 from goodtrailer/fix-falseknees-2025.111.0

FalseKnees: Fix regex patterns
goodtrailer · Jan 11, 2025 · 07f79fa · 07f79fa
2 parents 0e849cc + 71aa2c0
commit 07f79fa
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/DailyDesktop.Providers.FalseKnees/FalseKneesProvider.cs b/DailyDesktop.Providers.FalseKnees/FalseKneesProvider.cs
@@ -15,7 +15,7 @@ public class FalseKneesProvider : IProvider
         private const string AUTHOR = "Joshua Barkman";
         private const string AUTHOR_URI = "https://falseknees.com/about.html";
         private const string IMAGE_RELATIVE_URI_PATTERN = "imgs/[0-9]*?\\.[a-zA-Z]+";
-        private const string TITLE_RELATIVE_URI_PATTERN = "(?<=URL=)[0-9]+\\.[a-zA-Z]+";
+        private const string TITLE_RELATIVE_URI_PATTERN = "(?<=URL=).*?(?=\")";
         private const string DESCRIPTION_PATTERN = "(?<=<img.*title=\").*?(?=\")";
         private const string TITLE_PATTERN = "(?<=<p class=\"div-overflow\">.*?- ).*?(?=</p>)";
 
@@ -32,9 +32,13 @@ public async Task ConfigureWallpaperAsync(HttpClient client, IPublicWallpaperCon
 
             string pageHtml = await client.GetStringAsync(SourceUri, cancellationToken);
 
-            string imageUri = SourceUri + "/comics/" + Regex.Match(pageHtml, IMAGE_RELATIVE_URI_PATTERN).Value;
             string titleUri = SourceUri + "/" + Regex.Match(pageHtml, TITLE_RELATIVE_URI_PATTERN).Value;
-            string description = Regex.Match(pageHtml, DESCRIPTION_PATTERN).Value;
+
+            // Scrape info from image (title) page
+
+            string titleHtml = await client.GetStringAsync(titleUri, cancellationToken);
+            string imageUri = SourceUri + "/comics/" + Regex.Match(titleHtml, IMAGE_RELATIVE_URI_PATTERN).Value;
+            string description = Regex.Match(titleHtml, DESCRIPTION_PATTERN).Value;
 
             // Scrape title from archive page
 

diff --git a/DailyDesktop.Tests/TestProviders.cs b/DailyDesktop.Tests/TestProviders.cs
@@ -82,12 +82,10 @@ public async Task TestFalseKnees()
             var wallpaperConfig = new WallpaperConfiguration();
             await new FalseKneesProvider().ConfigureWallpaperAsync(wallpaperConfig, AsyncUtils.LongCancel());
 
-            TestContext.WriteLine("Description: " + wallpaperConfig.Description);
             TestContext.WriteLine("Image URI: " + wallpaperConfig.ImageUri);
             TestContext.WriteLine("Title: " + wallpaperConfig.Title);
             TestContext.WriteLine("Title URI: " + wallpaperConfig.TitleUri);
 
-            Assert.IsFalse(string.IsNullOrWhiteSpace(wallpaperConfig.Description), "Null/whitespace description.");
             Assert.IsFalse(string.IsNullOrWhiteSpace(wallpaperConfig.ImageUri), "Null/whitespace image URI!");
             Assert.IsFalse(string.IsNullOrWhiteSpace(wallpaperConfig.Title), "Null/whitespace title.");
             Assert.IsFalse(string.IsNullOrWhiteSpace(wallpaperConfig.TitleUri), "Null/whitespace title URI.");