From 3bb0aa43544096bdb5a1c0010d41d3bfd1eb1249 Mon Sep 17 00:00:00 2001 From: HaveAGitGat <43864057+HaveAGitGat@users.noreply.github.com> Date: Sat, 19 Mar 2022 16:46:26 +0100 Subject: [PATCH] Lint filters (#281) --- methods/library/filters/filterByBitrate.js | 22 ++++----- methods/library/filters/filterByCodec.js | 48 +++++++++---------- methods/library/filters/filterByMedium.js | 16 +++---- methods/library/filters/filterByResolution.js | 39 ++++++++------- methods/library/filters/filterBySize.js | 22 ++++----- 5 files changed, 69 insertions(+), 78 deletions(-) diff --git a/methods/library/filters/filterByBitrate.js b/methods/library/filters/filterByBitrate.js index 51b9067..a269b66 100644 --- a/methods/library/filters/filterByBitrate.js +++ b/methods/library/filters/filterByBitrate.js @@ -1,24 +1,22 @@ -/* eslint-disable */ function filterByBitrate(file, lowerBound, upperBound) { try { if ( - file.bit_rate >= lowerBound && - file.bit_rate <= upperBound + file.bit_rate >= lowerBound + && file.bit_rate <= upperBound ) { - var response = { + const response = { outcome: true, - note: `☑File bitrate is within filter limits. \n`, - }; - return response; - } else { - var response = { - outcome: false, - note: `☒File bitrate is not within filter limits. \n`, + note: '☑File bitrate is within filter limits. \n', }; return response; } + const response = { + outcome: false, + note: '☒File bitrate is not within filter limits. \n', + }; + return response; } catch (err) { - var response = { + const response = { outcome: false, note: `library.filters.filterByBitrate error: ${err} \n`, }; diff --git a/methods/library/filters/filterByCodec.js b/methods/library/filters/filterByCodec.js index ddbec13..3e6b1cc 100644 --- a/methods/library/filters/filterByCodec.js +++ b/methods/library/filters/filterByCodec.js @@ -1,56 +1,54 @@ -/* eslint-disable */ function filterByCodec(file, mode, codecs) { try { // console.log(file,mode,codecs) - var allCodecs = file.ffProbeData.streams.map((row) => row.codec_name); + const allCodecs = file.ffProbeData.streams.map((row) => row.codec_name); - var included = false; + let included = false; - for (var i = 0; i < allCodecs.length; i++) { + for (let i = 0; i < allCodecs.length; i += 1) { if (codecs.toLowerCase().includes(allCodecs[i])) { included = true; } } - if (mode === "include") { + if (mode === 'include') { if (included) { - var response = { + const response = { outcome: true, - note: `☑Codec included \n`, - }; - return response; - } else { - var response = { - outcome: false, - note: `☒Codec excluded \n`, + note: '☑Codec included \n', }; return response; } - } else if (mode === "exclude") { + const response = { + outcome: false, + note: '☒Codec excluded \n', + }; + return response; + } if (mode === 'exclude') { if (included) { - var response = { + const response = { outcome: false, - note: `☒Codec excluded \n`, - }; - return response; - } else { - var response = { - outcome: true, - note: `☑Codec not excluded \n`, + note: '☒Codec excluded \n', }; return response; } + const response = { + outcome: true, + note: '☑Codec not excluded \n', + }; + return response; } - var response = { + const response = { outcome: false, - note: `library.filters.filterByCodec error: ${err} \n`, + note: 'library.filters.filterByCodec error, no include/exclude specified \n', }; return response; } catch (err) { + // eslint-disable-next-line no-console console.log(err); - var response = { + const response = { outcome: false, note: `Filter error hello! ${err}\n`, }; diff --git a/methods/library/filters/filterByMedium.js b/methods/library/filters/filterByMedium.js index 0d04019..35703f1 100644 --- a/methods/library/filters/filterByMedium.js +++ b/methods/library/filters/filterByMedium.js @@ -1,21 +1,19 @@ -/* eslint-disable */ function filterByMedium(file, medium) { try { if (file.fileMedium !== medium) { - var response = { + const response = { outcome: false, note: `☒File is not ${medium} \n`, }; return response; - } else { - var response = { - outcome: true, - note: `☑File is ${medium} \n`, - }; - return response; } + const response = { + outcome: true, + note: `☑File is ${medium} \n`, + }; + return response; } catch (err) { - var response = { + const response = { outcome: false, note: `library.filters.filterByMedium error: ${err} \n`, }; diff --git a/methods/library/filters/filterByResolution.js b/methods/library/filters/filterByResolution.js index 73b2b34..a3a0cfc 100644 --- a/methods/library/filters/filterByResolution.js +++ b/methods/library/filters/filterByResolution.js @@ -1,46 +1,45 @@ -/* eslint-disable */ function filterByResolution(file, mode, resolution) { try { - if (mode === "exclude") { + if (mode === 'exclude') { if ( resolution.toLowerCase().includes(file.video_resolution.toLowerCase()) ) { - var response = { + const response = { outcome: false, - note: `☒File is in excluded resolution. \n`, - }; - return response; - } else { - var response = { - outcome: true, - note: `☑File is not in excluded resolution. \n`, + note: '☒File is in excluded resolution. \n', }; return response; } - } else if (mode === "include") { + const response = { + outcome: true, + note: '☑File is not in excluded resolution. \n', + }; + return response; + } if (mode === 'include') { if ( resolution.toLowerCase().includes(file.video_resolution.toLowerCase()) ) { - var response = { + const response = { outcome: true, - note: `☑File is in included resolution. \n`, - }; - return response; - } else { - var response = { - outcome: false, - note: `☒File is not in included resolution. \n`, + note: '☑File is in included resolution. \n', }; return response; } + const response = { + outcome: false, + note: '☒File is not in included resolution. \n', + }; + return response; } } catch (err) { - var response = { + const response = { outcome: false, note: `library.filters.filterByResolution error: ${err} \n`, }; return response; } + + throw new Error('Plugin error, no filter mode specified'); } module.exports = filterByResolution; diff --git a/methods/library/filters/filterBySize.js b/methods/library/filters/filterBySize.js index 1ca5f39..ebd35f0 100644 --- a/methods/library/filters/filterBySize.js +++ b/methods/library/filters/filterBySize.js @@ -1,24 +1,22 @@ -/* eslint-disable */ function filterBySize(file, lowerBound, upperBound) { try { if ( - file.file_size / 1000 >= lowerBound && - file.file_size / 1000 <= upperBound + file.file_size / 1000 >= lowerBound + && file.file_size / 1000 <= upperBound ) { - var response = { + const response = { outcome: true, - note: `☑File size is within filter limits. \n`, - }; - return response; - } else { - var response = { - outcome: false, - note: `☒File size is not within filter limits. \n`, + note: '☑File size is within filter limits. \n', }; return response; } + const response = { + outcome: false, + note: '☒File size is not within filter limits. \n', + }; + return response; } catch (err) { - var response = { + const response = { outcome: false, note: `library.filters.filterBySize error: ${err} \n`, };