From 5beea8cc696e8031682745e4f6033540af13eb42 Mon Sep 17 00:00:00 2001
From: neobooru <50623835+neobooru@users.noreply.github.com>
Date: Wed, 5 Jul 2023 13:04:41 +0200
Subject: [PATCH] Small fixes and add extra test

---
 src/engines/Philomena.test.ts | 16 ++++++++++++++++
 src/engines/Philomena.ts      | 15 +++++++++------
 2 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/src/engines/Philomena.test.ts b/src/engines/Philomena.test.ts
index 9586ade..155a6e9 100644
--- a/src/engines/Philomena.test.ts
+++ b/src/engines/Philomena.test.ts
@@ -9,6 +9,22 @@ test("get derpibooru.org post 3153524", async () => {
   expect(res.posts[0]).toHaveTag("yay");
   expect(res.posts[0]).toHaveTag("flutteryay");
   expect(res.posts[0]).toHaveSource("https://twitter.com/Confetti_Cakez/status/1674145455666544640");
+  expect(res.posts[0]).toHaveResolution([4000, 4000]);
   expect(res.posts[0].pageUrl).toBe(pageUrl);
   expect(res.posts[0].contentUrl).toBe("https://derpicdn.net/img/download/2023/6/29/3153524.jpg");
 });
+
+test("get derpibooru.org post 3157356", async () => {
+  const pageUrl = "https://derpibooru.org/images/3157356?q=oc";
+  const res = await scrapeUrl(pageUrl);
+  expect(res.posts.length).toBe(1);
+  expect(res.posts[0].rating).toBe("safe");
+  expect(res.posts[0]).not.toHaveTag("safe");
+  expect(res.posts[0]).toHaveTag("oc");
+  expect(res.posts[0]).toHaveTag("serra20", "artist");
+  expect(res.posts[0]).toHaveTag("pony", "species");
+  expect(res.posts[0]).toHaveTag("eris_(oc)", "character");
+  expect(res.posts[0]).toHaveResolution([960, 960]);
+  expect(res.posts[0].pageUrl).toBe(pageUrl);
+  expect(res.posts[0].contentUrl).toBe("https://derpicdn.net/img/download/2023/7/5/3157356.png");
+});
diff --git a/src/engines/Philomena.ts b/src/engines/Philomena.ts
index 5d21949..a8d5c87 100644
--- a/src/engines/Philomena.ts
+++ b/src/engines/Philomena.ts
@@ -1,5 +1,6 @@
 import { ScrapeEngineBase, ScrapeResult, ScrapedPost, ScrapedTag, ScrapeEngineFeature } from "../ScrapeEngine.js";
 import { SafetyRating, TagCategory } from "../BooruTypes.js";
+import { parseResolutionString } from "../Utility.js";
 
 export default class Philomena extends ScrapeEngineBase {
   name = "Philomena";
@@ -15,7 +16,7 @@ export default class Philomena extends ScrapeEngineBase {
     "twibooru.org",
   ];
   removePrefixes = ["artist", "editor", "character", "species", "oc", "ship"];
-  removeprefixesSuffix = new Map([["oc", "_(oc)"]]);
+  removePrefixesSuffix = new Map([["oc", "_(oc)"]]);
   artistPrefixes = ["artist", "editor"];
   safetyMap = new Map<string, SafetyRating>([
     ["safe", "safe"],
@@ -48,10 +49,12 @@ export default class Philomena extends ScrapeEngineBase {
     post.rating = "unsafe";
 
     // Set resolution
-    const resolutionEl = ((<HTMLElement>document.querySelector("span[class='image-size']"))?.innerText).split(" ")[0];
-    const [width, height] = (resolutionEl?.replace("&nbsp;", "").split("x") || []).map(Number);
-    if (!isNaN(width) && !isNaN(height)) {
-      post.resolution = [width, height];
+    const resStr = (<HTMLElement>document.querySelector("span[class='image-size']"))?.innerText?.split(" ")[0];
+    if (resStr) {
+      const res = parseResolutionString(resStr);
+      if (res) {
+        post.resolution = res;
+      }
     }
 
     // Set tags
@@ -95,7 +98,7 @@ export default class Philomena extends ScrapeEngineBase {
           tagName = tagName.replace(prefix + ":", "").trim();
 
           // Add suffix if configured
-          const suffix = this.removeprefixesSuffix.get(prefix);
+          const suffix = this.removePrefixesSuffix.get(prefix);
           if (suffix) {
             tagName = tagName + suffix;
           }