From 406f1d078a56298ce95e4a8feca324dfc7bbbe8d Mon Sep 17 00:00:00 2001 From: Koushik Dutta Date: Wed, 16 Mar 2022 10:44:03 -0700 Subject: [PATCH] server: fix converter weighting --- server/package-lock.json | 4 ++-- server/package.json | 2 +- server/src/plugin/media.ts | 6 +++++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/server/package-lock.json b/server/package-lock.json index a80814b4a..356556862 100644 --- a/server/package-lock.json +++ b/server/package-lock.json @@ -1,12 +1,12 @@ { "name": "@scrypted/server", - "version": "0.0.156", + "version": "0.0.157", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@scrypted/server", - "version": "0.0.156", + "version": "0.0.157", "license": "ISC", "dependencies": { "@mapbox/node-pre-gyp": "^1.0.8", diff --git a/server/package.json b/server/package.json index efc79fb80..b4d565cec 100644 --- a/server/package.json +++ b/server/package.json @@ -1,6 +1,6 @@ { "name": "@scrypted/server", - "version": "0.0.156", + "version": "0.0.157", "description": "", "dependencies": { "@mapbox/node-pre-gyp": "^1.0.8", diff --git a/server/src/plugin/media.ts b/server/src/plugin/media.ts index 7fe9c271d..23c7f29a3 100644 --- a/server/src/plugin/media.ts +++ b/server/src/plugin/media.ts @@ -320,9 +320,13 @@ export abstract class MediaManagerBase implements MediaManager { } } + // edge matches if (mimeMatches(mediaMime, inputMime)) { - mediaNode[targetId] = 1; + // catch all converters should be heavily weighted so as not to use them. + mediaNode[targetId] = inputMime.essence === '*/*' ? 1000 : 1; } + + // target output matches if (mimeMatches(outputMime, convertedMime) || converter.toMimeType === ScryptedMimeTypes.MediaObject) { node['output'] = 1; }