From 02ce5b694944a28583a187558e38f1cd668470d5 Mon Sep 17 00:00:00 2001 From: jessop Date: Tue, 5 Feb 2019 02:38:49 -0500 Subject: [PATCH] adds extension mime utility to chainquery claim model --- package-lock.json | 42 +++++++++----------------- package.json | 1 + server/chainquery/models/ClaimModel.js | 25 ++------------- 3 files changed, 17 insertions(+), 51 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7fbffe40..bfd34b73 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5688,14 +5688,12 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, - "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -5710,20 +5708,17 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "core-util-is": { "version": "1.0.2", @@ -5840,8 +5835,7 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "ini": { "version": "1.3.5", @@ -5853,7 +5847,6 @@ "version": "1.0.0", "bundled": true, "dev": true, - "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -5868,7 +5861,6 @@ "version": "3.0.4", "bundled": true, "dev": true, - "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -5876,14 +5868,12 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "minipass": { "version": "2.2.4", "bundled": true, "dev": true, - "optional": true, "requires": { "safe-buffer": "^5.1.1", "yallist": "^3.0.0" @@ -5902,7 +5892,6 @@ "version": "0.5.1", "bundled": true, "dev": true, - "optional": true, "requires": { "minimist": "0.0.8" } @@ -5983,8 +5972,7 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "object-assign": { "version": "4.1.1", @@ -5996,7 +5984,6 @@ "version": "1.4.0", "bundled": true, "dev": true, - "optional": true, "requires": { "wrappy": "1" } @@ -6118,7 +6105,6 @@ "version": "1.0.2", "bundled": true, "dev": true, - "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -8519,16 +8505,16 @@ "integrity": "sha1-Eh+evEnjdm8xGnbh+hyAA8SwOqY=" }, "mime-db": { - "version": "1.36.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.36.0.tgz", - "integrity": "sha512-L+xvyD9MkoYMXb1jAmzI/lWYAxAMCPvIBSWur0PZ5nOf5euahRLVqH//FKW9mWp2lkqUgYiXPgkzfMUFi4zVDw==" + "version": "1.37.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.37.0.tgz", + "integrity": "sha512-R3C4db6bgQhlIhPU48fUtdVmKnflq+hRdad7IyKhtFj06VPNVdk2RhiYL3UjQIlso8L+YxAtFkobT0VK+S/ybg==" }, "mime-types": { - "version": "2.1.20", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.20.tgz", - "integrity": "sha512-HrkrPaP9vGuWbLK1B1FfgAkbqNjIuy4eHlIYnFi7kamZyLLrGlo2mpcx0bBmNpKqBtYtAfGbodDddIgddSJC2A==", + "version": "2.1.21", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.21.tgz", + "integrity": "sha512-3iL6DbwpyLzjR3xHSFNFeb9Nz/M8WDkX33t1GFQnFOllWk8pOrh/LSrB5OXlnlW5P9LH73X6loW/eogc+F5lJg==", "requires": { - "mime-db": "~1.36.0" + "mime-db": "~1.37.0" } }, "mimic-fn": { diff --git a/package.json b/package.json index f0b37f13..8698d893 100644 --- a/package.json +++ b/package.json @@ -51,6 +51,7 @@ "inquirer": "^5.2.0", "ip": "^1.1.5", "make-dir": "^1.3.0", + "mime-types": "^2.1.21", "module-alias": "^2.1.0", "mysql2": "^1.6.4", "npm": "^6.3.0", diff --git a/server/chainquery/models/ClaimModel.js b/server/chainquery/models/ClaimModel.js index 7d44d166..022656f9 100644 --- a/server/chainquery/models/ClaimModel.js +++ b/server/chainquery/models/ClaimModel.js @@ -1,30 +1,9 @@ const logger = require('winston'); - -const { - assetDefaults: { thumbnail: defaultThumbnail }, - details: { host }, -} = require('@config/siteConfig'); +const mime = require('mime-types'); const getterMethods = { generated_extension() { - switch (this.content_type) { - case 'image/jpeg': - case 'image/jpg': - return 'jpg'; - case 'image/png': - return 'png'; - case 'image/gif': - return 'gif'; - case 'image/svg+xml': - return 'svg'; - case 'video/mp4': - return 'mp4'; - case 'text/markdown': - return 'md'; - default: - logger.debug('setting unknown file type as file extension jpg'); - return 'jpg'; - } + return mime.extension(this.content_type) ? mime.extension(this.content_type) : 'jpg'; }, };