transforms all resolution formats to xxxp notation

Author: TheBeastLT

index.js

@@ -1,5 +1,6 @@
 const Parser = require("./src/parser").Parser;
 const handlers = require("./src/handlers");
+const trasformers = require("./src/transformers");
 
 const defaultParser = new Parser();
 
@@ -9,3 +10,4 @@ exports.addDefaults = handlers.addDefaults;
 exports.addHandler = (handlerName, handler, options) => defaultParser.addHandler(handlerName, handler, options);
 exports.parse = title => defaultParser.parse(title);
 exports.Parser = Parser;
+exports.Transformers = trasformers;

src/handlers.js

@@ -3,13 +3,11 @@ const { value, integer, boolean, lowercase, date, range, yearRange, array } = re
 exports.addDefaults = /** @type Parser */ parser => {
 
     // Resolution
-    parser.addHandler("resolution", /[([]?1920x1080[)\]]?/i, value("1080p"), { remove: true });
-    parser.addHandler("resolution", /[([]?(?:1280|960)x720[)\]]?/i, value("720p"), { remove: true });
-    parser.addHandler("resolution", /[([]?640x480[)\]]?/i, value("480p"), { remove: true });
-    parser.addHandler("resolution", /[([]?(\d{3,4}x\d{3,4})[)\]]?/i, lowercase, { remove: true });
     parser.addHandler("resolution", /\b[([]?4k[)\]]?\b/i, value("4k"), { remove: true });
-    parser.addHandler("resolution", /(2160[pi])/i, value("4k"), { skipIfAlreadyFound: false, remove: true });
-    parser.addHandler("resolution", /([0-9]{3,4}[pi])/i, lowercase, { remove: true });
+    parser.addHandler("resolution", /2160[pi]/i, value("4k"), { skipIfAlreadyFound: false, remove: true });
+    parser.addHandler("resolution", /[([]?3840x2160[)\]]?/i, value("4k"), { remove: true });
+    parser.addHandler("resolution", /[([]?\d{3,4}x(\d{3,4})[)\]]?/i, value("$1p"), { remove: true });
+    parser.addHandler("resolution", /([0-9]{3,4})[pi]/i, value("$1p"), { remove: true });
 
     // Year
     parser.addHandler("date", /(?<=\W|^)([([]?(?:19[6-9]|20[012])[0-9][. -/\\](?:0[1-9]|1[012])[. -/\\](?:0[1-9]|[12][0-9]|3[01])[)\]]?)(?=\W|$)/, date("YYYY MM DD"), { remove: true });
@@ -161,8 +159,8 @@ exports.addDefaults = /** @type Parser */ parser => {
             const partTitle = title.slice(startIndex, endIndex);
 
             // try to match the episode inside the title with a separator, if not found include the start of the title as well
-            const matches = partTitle.match(/(?<!movie\W*|film\W*)[ .]?[([-][ .]?(\d{1,3})(?:a|b|v\d)?(?:\W|$)/i) ||
-                partTitle.match(/^[ .]?(\d{1,3})(?:a|b|v\d)?(?:\W|$)(?!movie|film)/i);
+            const matches = partTitle.match(/(?<!movie\W*|film\W*)[ .]?[([-][ .]?(\d{1,4})(?:a|b|v\d)?(?:\W|$)(?!movie|film)/i) ||
+                partTitle.match(/^[ .]?(\d{1,4})(?:a|b|v\d)?(?:\W|$)(?!movie|film)/i);
 
             if (matches) {
                 result.episodes = [matches[matches.length - 1]]

src/transformers.js

@@ -1,8 +1,8 @@
-const moment = require('moment');
+const moment = require("moment");
 
 exports.none = input => input;
 
-exports.value = staticValue => () => staticValue;
+exports.value = staticValue => input => staticValue.replace("$1", input);
 
 exports.integer = input => parseInt(input, 10);
 

test/resolution.js

@@ -34,6 +34,13 @@ describe("Parsing resolution", () => {
 
     it("should detect custom resolution correctly", () => {
         const releaseName = "[JacobSwaggedUp] Kizumonogatari I: Tekketsu-hen (BD 1280x544) [MP4 Movie]";
-        expect(parse(releaseName)).to.deep.include({ resolution: "1280x544" });
+
+        expect(parse(releaseName)).to.deep.include({ resolution: "544p" });
+    });
+
+    it("should detect 720i resolution and format as 720p", () => {
+        const releaseName = "UFC 187 PPV 720i HDTV X264-KYR";
+
+        expect(parse(releaseName)).to.deep.include({ resolution: "720p" });
     });
 });