Update methods (#233)

* Remove importFresh from methods

* lint

* Remove importFresh

* Remove node_modules

* Add import-fresh to community plugins download

* Add import-fresh to actions and filters

* Add intermediate fresh library loader

Community/Tdarr_Plugin_Greg_MP3_FFMPEG_CPU.js

@@ -1,6 +1,5 @@
-// eslint-disable-next-line import/no-extraneous-dependencies
-const importFresh = require('import-fresh');
 const loadDefaultValues = require('../methods/loadDefaultValues');
+const lib = require('../methods/library.js');
 
 module.exports.dependencies = ['import-fresh'];
 const details = () => ({
@@ -34,7 +33,6 @@ module.exports.details = details;
 const plugin = (file, librarySettings, inputs, otherArguments) => {
   // eslint-disable-next-line no-unused-vars,no-param-reassign
   inputs = loadDefaultValues(inputs, details);
-  const library = importFresh('../methods/library.js');
   const response = {
     // 320K selected over 384k intentionally
     // https://en.m.wikipedia.org/wiki/MPEG-1#Part_3:_Audio
@@ -48,8 +46,8 @@ const plugin = (file, librarySettings, inputs, otherArguments) => {
 
   const { codecsToInclude } = inputs;
 
-  const filterByCodecInclude = library.filters.filterByCodec(file, 'include', codecsToInclude);
-  const filterByCodecExclude = library.filters.filterByCodec(file, 'exclude', 'mp3');
+  const filterByCodecInclude = lib.filters.filterByCodec(file, 'include', codecsToInclude);
+  const filterByCodecExclude = lib.filters.filterByCodec(file, 'exclude', 'mp3');
 
   response.infoLog += `${filterByCodecInclude.note} ${filterByCodecExclude.note}`;
 

Community/Tdarr_Plugin_O8O0dCTlb_Set_File_Permissions_For_UnRaid.js

@@ -1,63 +1,53 @@
-/* eslint-disable */
-var fs = require('fs');
-var path = require('path');
-const loadDefaultValues = require('../methods/loadDefaultValues');
-if (fs.existsSync(path.join(process.cwd(), '/npm'))) {
-    var rootModules = path.join(process.cwd(), '/npm/node_modules/')
-} else {
-    var rootModules = ''
-}
-
-const importFresh = require(rootModules + 'import-fresh');
-const library = importFresh('../methods/library.js')
-
-const details = () => {
-    return {
-        id: "Tdarr_Plugin_O8O0dCTlb_Set_File_Permissions_For_UnRaid",
-        Stage: 'Pre-processing',
-        Name: "Set file permissions for UnRaid",
-        Type: "Video",
-        Operation: "Transcode",
-        Description: "Sets file permissions using chown nobody:users to prevent lock from root. Use at end of stack. ",
-        Version: "",
-        Tags: "post-processing",
-        Inputs:[],
-    }
-}
-
-// eslint-disable-next-line no-unused-vars
-const plugin = (file, librarySettings, inputs, otherArguments) => {
-  // eslint-disable-next-line no-unused-vars,no-param-reassign
-  inputs = loadDefaultValues(inputs, details);
-
-    //Must return this object at some point
-    var response = {
-        processFile: false,
-        preset: '',
-        container: '.mkv',
-        handBrakeMode: false,
-        FFmpegMode: true,
-        reQueueAfter: true,
-        infoLog: '',
-
-    }
-
-    response.infoLog += ""
-
-    if ((true) || file.forceProcessing === true) {
-
-        require("child_process").execSync(`chown nobody:users "${file._id}"`)
-        response.preset = ''
-        response.container = '.mkv'
-        response.handBrakeMode = false
-        response.FFmpegMode = true
-        response.reQueueAfter = true;
-        response.processFile = false
-        response.infoLog += "File permissions set \n"
-        return response
-    }
-}
-
+/* eslint-disable */
+const loadDefaultValues = require('../methods/loadDefaultValues');
+
+const details = () => {
+    return {
+        id: "Tdarr_Plugin_O8O0dCTlb_Set_File_Permissions_For_UnRaid",
+        Stage: 'Pre-processing',
+        Name: "Set file permissions for UnRaid",
+        Type: "Video",
+        Operation: "Transcode",
+        Description: "Sets file permissions using chown nobody:users to prevent lock from root. Use at end of stack. ",
+        Version: "",
+        Tags: "post-processing",
+        Inputs:[],
+    }
+}
+
+// eslint-disable-next-line no-unused-vars
+const plugin = (file, librarySettings, inputs, otherArguments) => {
+  // eslint-disable-next-line no-unused-vars,no-param-reassign
+  inputs = loadDefaultValues(inputs, details);
+
+    //Must return this object at some point
+    var response = {
+        processFile: false,
+        preset: '',
+        container: '.mkv',
+        handBrakeMode: false,
+        FFmpegMode: true,
+        reQueueAfter: true,
+        infoLog: '',
+
+    }
+
+    response.infoLog += ""
+
+    if ((true) || file.forceProcessing === true) {
+
+        require("child_process").execSync(`chown nobody:users "${file._id}"`)
+        response.preset = ''
+        response.container = '.mkv'
+        response.handBrakeMode = false
+        response.FFmpegMode = true
+        response.reQueueAfter = true;
+        response.processFile = false
+        response.infoLog += "File permissions set \n"
+        return response
+    }
+}
+
 
 module.exports.details = details;
 module.exports.plugin = plugin;

methods/actions.js

@@ -1,15 +1,4 @@
-const fs = require('fs');
-const path = require('path');
-
-let rootModules;
-if (fs.existsSync(path.join(process.cwd(), '/npm'))) {
-  rootModules = path.join(process.cwd(), '/npm/node_modules/');
-} else {
-  rootModules = '';
-}
-
-// eslint-disable-next-line import/no-dynamic-require
-const importFresh = require(`${rootModules}import-fresh`);
+const importFresh = require('./node_modules/import-fresh');
 
 module.exports.remuxContainer = importFresh(
   './library/actions/remuxContainer.js',

methods/filters.js

@@ -1,22 +1,14 @@
-/* eslint-disable */
-var fs = require("fs");
-var path = require("path");
-if (fs.existsSync(path.join(process.cwd(), "/npm"))) {
-  var rootModules = path.join(process.cwd(), "/npm/node_modules/");
-} else {
-  var rootModules = "";
-}
-const importFresh = require(rootModules + "import-fresh");
+const importFresh = require('./node_modules/import-fresh');
 
-module.exports.filterByAge = importFresh("./library/filters/filterByAge.js");
+module.exports.filterByAge = importFresh('./library/filters/filterByAge.js');
 module.exports.filterByCodec = importFresh(
-  "./library/filters/filterByCodec.js"
+  './library/filters/filterByCodec.js',
 );
 module.exports.filterByMedium = importFresh(
-  "./library/filters/filterByMedium.js"
+  './library/filters/filterByMedium.js',
 );
 module.exports.filterByResolution = importFresh(
-  "./library/filters/filterByResolution.js"
+  './library/filters/filterByResolution.js',
 );
-module.exports.filterBySize = importFresh("./library/filters/filterBySize.js");
-module.exports.filterByBitrate = importFresh("./library/filters/filterByBitrate.js");
+module.exports.filterBySize = importFresh('./library/filters/filterBySize.js');
+module.exports.filterByBitrate = importFresh('./library/filters/filterByBitrate.js');

methods/lib.js

@@ -0,0 +1,3 @@
+const importFresh = require('./node_modules/import-fresh');
+// load library modules fresh so no Tdarr Server restart required between plugin updates
+module.exports = () => importFresh('./library.js');

methods/library.js

@@ -1,12 +1,5 @@
-/* eslint-disable */
-var fs = require("fs");
-var path = require("path");
-if (fs.existsSync(path.join(process.cwd(), "/npm"))) {
-  var rootModules = path.join(process.cwd(), "/npm/node_modules/");
-} else {
-  var rootModules = "";
-}
-const importFresh = require(rootModules + "import-fresh");
+const importFresh = require('./node_modules/import-fresh');
 
-module.exports.filters = importFresh("./filters.js");
-module.exports.actions = importFresh("./actions.js");
+module.exports.filters = importFresh('./filters.js');
+module.exports.actions = importFresh('./actions.js');
+module.exports.loadDefaultValues = importFresh('./loadDefaultValues.js');

methods/node_modules/callsites/package.json

@@ -21,7 +21,7 @@
   "_resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
   "_shasum": "b3630abd8943432f54b3f0519238e33cd7df2f73",
   "_spec": "callsites@^3.0.0",
-  "_where": "C:\\Users\\H\\Documents\\GitHub\\tdarr_express_node\\assets\\app\\plugins\\node_modules\\parent-module",
+  "_where": "C:\\Users\\H\\Documents\\GitHub\\Tdarr_Plugins\\methods\\node_modules\\parent-module",
   "author": {
     "name": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",

methods/node_modules/import-fresh/package.json

@@ -22,7 +22,7 @@
   "_resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
   "_shasum": "37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b",
   "_spec": "import-fresh",
-  "_where": "C:\\Users\\H\\Documents\\GitHub\\tdarr_express_node",
+  "_where": "C:\\Users\\H\\Documents\\GitHub\\Tdarr_Plugins\\methods",
   "author": {
     "name": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",

methods/node_modules/parent-module/package.json

@@ -21,7 +21,7 @@
   "_resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
   "_shasum": "691d2709e78c79fae3a156622452d00762caaaa2",
   "_spec": "parent-module@^1.0.0",
-  "_where": "C:\\Users\\H\\Documents\\GitHub\\tdarr_express_node\\assets\\app\\plugins\\node_modules\\import-fresh",
+  "_where": "C:\\Users\\H\\Documents\\GitHub\\Tdarr_Plugins\\methods\\node_modules\\import-fresh",
   "author": {
     "name": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",

methods/node_modules/resolve-from/package.json

@@ -21,7 +21,7 @@
   "_resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
   "_shasum": "4abcd852ad32dd7baabfe9b40e00a36db5f392e6",
   "_spec": "resolve-from@^4.0.0",
-  "_where": "C:\\Users\\H\\Documents\\GitHub\\tdarr_express_node\\assets\\app\\plugins\\node_modules\\import-fresh",
+  "_where": "C:\\Users\\H\\Documents\\GitHub\\Tdarr_Plugins\\methods\\node_modules\\import-fresh",
   "author": {
     "name": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",

methods/package-lock.json

@@ -0,0 +1,35 @@
+{
+  "name": "methods",
+  "version": "1.0.0",
+  "lockfileVersion": 1,
+  "requires": true,
+  "dependencies": {
+    "callsites": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="
+    },
+    "import-fresh": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
+      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
+      "requires": {
+        "parent-module": "^1.0.0",
+        "resolve-from": "^4.0.0"
+      }
+    },
+    "parent-module": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+      "requires": {
+        "callsites": "^3.0.0"
+      }
+    },
+    "resolve-from": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g=="
+    }
+  }
+}

methods/package.json

@@ -0,0 +1,12 @@
+{
+  "name": "methods",
+  "version": "1.0.0",
+  "description": "",
+  "main": "library.js",
+  "scripts": {},
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "import-fresh": "^3.3.0"
+  }
+}