diff --git a/CHANGELOG.md b/CHANGELOG.md index 4a2ce2e..90d6bd5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # ![Logo](https://github.com/WebTools-NG/WebTools-NG/blob/master/src/assets/WebTools-48x48.png) WebTools-ng Change log +## V0.3.5 + +* [#339 IMDB ID not available for movies](https://github.com/WebTools-NG/WebTools-NG/issues/339) + ## V0.3.4 * [#306 Export posters and Art](https://github.com/WebTools-NG/WebTools-NG/issues/306) diff --git a/docs/modules/ExportTools/Fields.ods b/docs/modules/ExportTools/Fields.ods index 45740c8..b4e01de 100644 Binary files a/docs/modules/ExportTools/Fields.ods and b/docs/modules/ExportTools/Fields.ods differ diff --git a/package.json b/package.json index 817c5fc..ab7eab2 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "webtools-ng", "productName": "WebTools-NG", - "version": "0.3.4", + "version": "0.3.5", "description": "WebTools Next Generation 4 Plex", "author": "dane22 & CPSO", "license": "MPL-2.0", diff --git a/src/components/modules/ExportTools/defs/def-Album.json b/src/components/modules/ExportTools/defs/def-Album.json index dcb9e7f..3c5d0a8 100644 --- a/src/components/modules/ExportTools/defs/def-Album.json +++ b/src/components/modules/ExportTools/defs/def-Album.json @@ -31,7 +31,6 @@ "Last Viewed at", "Locked Fields", "Loudness Analysis Version", - "MetaData Language", "Mood", "Poster url", "Rating", diff --git a/src/components/modules/ExportTools/defs/def-Artist.json b/src/components/modules/ExportTools/defs/def-Artist.json index 1f9012d..04fd076 100644 --- a/src/components/modules/ExportTools/defs/def-Artist.json +++ b/src/components/modules/ExportTools/defs/def-Artist.json @@ -36,7 +36,6 @@ "Last Viewed at", "Location", "Locked Fields", - "MetaData Language", "Mood", "Original Title", "Poster url", diff --git a/src/components/modules/ExportTools/defs/def-Episode.json b/src/components/modules/ExportTools/defs/def-Episode.json index 8710dc5..27979ac 100644 --- a/src/components/modules/ExportTools/defs/def-Episode.json +++ b/src/components/modules/ExportTools/defs/def-Episode.json @@ -89,7 +89,6 @@ "Media Video Profile", "Media Video Resolution", "Media Width", - "MetaData Language", "Original Title", "Part Accessible", "Part Container", @@ -130,6 +129,8 @@ "TMDB ID", "TMDB Link", "TVDB ID", + "TVDB ID (Legacy)", + "TVDB Language (Legacy)", "Updated", "User Rating", "Video Stream Anamorphic", diff --git a/src/components/modules/ExportTools/defs/def-Fields.json b/src/components/modules/ExportTools/defs/def-Fields.json index 0b88615..ec29d72 100644 --- a/src/components/modules/ExportTools/defs/def-Fields.json +++ b/src/components/modules/ExportTools/defs/def-Fields.json @@ -510,19 +510,40 @@ "call": 1, "type": "string" }, + "IMDB ID (Legacy)": + { + "key": "$.guid", + "call": 2, + "type": "string", + "postProcess": true + }, "IMDB ID": { "key": "$.Guid[*]", - "call": 1, + "call": 2, "type": "array", "subtype": "string", "subkey": "$.id", "postProcess": true }, + "IMDB Language (Legacy)": + { + "key": "$.guid", + "call": 2, + "type": "string", + "postProcess": true + }, + "IMDB Link (Legacy)": + { + "key": "$.guid", + "call": 2, + "type": "string", + "postProcess": true + }, "IMDB Link": { "key": "$.Guid[*]", - "call": 1, + "call": 2, "type": "array", "subtype": "string", "subkey": "$.id", @@ -1193,6 +1214,29 @@ "subkey": "$.id", "postProcess": true }, + "TVDB ID (Legacy)": + { + "key": "$.guid", + "call": 2, + "type": "string", + "postProcess": true + }, + "TVDB Language (Legacy)": + { + "key": "$.guid", + "call": 2, + "type": "string", + "postProcess": true + }, + "TMDB ID": + { + "key": "$.Guid[*]", + "call": 1, + "type": "array", + "subtype": "string", + "subkey": "$.id", + "postProcess": true + }, "TMDB Link": { "key": "$.Guid[*]", diff --git a/src/components/modules/ExportTools/defs/def-Movie.json b/src/components/modules/ExportTools/defs/def-Movie.json index 85ea00e..5cdae6d 100644 --- a/src/components/modules/ExportTools/defs/def-Movie.json +++ b/src/components/modules/ExportTools/defs/def-Movie.json @@ -77,7 +77,10 @@ "Extras-trailer", "Genre", "IMDB ID", + "IMDB ID (Legacy)", "IMDB Link", + "IMDB Link (Legacy)", + "IMDB Language (Legacy)", "Key", "Labels", "Last Viewed at", @@ -96,8 +99,6 @@ "Media Video Profile", "Media Video Resolution", "Media Width", - "MetaDB Link", - "MetaData Language", "Original Title", "Part Accessible", "Part Container", @@ -135,10 +136,11 @@ "Subtitle Stream Selected", "Subtitle Stream Title", "Summary", - "TMDB ID", - "TMDB Link", "Tagline", "Title", + "TMDB ID", + "TMDB Link", + "TVDB ID", "Updated", "User Rating", "Video Stream Anamorphic", diff --git a/src/components/modules/ExportTools/defs/def-Show.json b/src/components/modules/ExportTools/defs/def-Show.json index 77b675a..343b777 100644 --- a/src/components/modules/ExportTools/defs/def-Show.json +++ b/src/components/modules/ExportTools/defs/def-Show.json @@ -40,8 +40,6 @@ "Labels", "Location", "Locked Fields", - "MetaData Language", - "MetaDB Link", "Original Title", "Part Duration", "Poster url", @@ -54,8 +52,11 @@ "Summary", "Tagline", "Title", + "TMDB ID", "TMDB Link", "TVDB ID", + "TVDB ID (Legacy)", + "TVDB Language (Legacy)", "Updated", "Year" ] diff --git a/src/components/modules/ExportTools/scripts/et.js b/src/components/modules/ExportTools/scripts/et.js index 16c4380..79fab9c 100644 --- a/src/components/modules/ExportTools/scripts/et.js +++ b/src/components/modules/ExportTools/scripts/et.js @@ -206,6 +206,8 @@ const et = new class ET { subItem['title'] = JSONPath({path: '$..title', json: section})[0]; subItem['key'] = parseInt(JSONPath({path: '$..key', json: section})[0]); subItem['type'] = JSONPath({path: '$..type', json: section})[0]; + subItem['scanner'] = JSONPath({path: '$..scanner', json: section})[0]; + subItem['agent'] = JSONPath({path: '$..agent', json: section})[0]; result.push(subItem) } await Promise.resolve(result) @@ -679,37 +681,6 @@ const excel2 = new class Excel { let x, retVal, start, strStart, end, result; try { switch ( String(name) ){ - case "MetaDB Link": - // ["\"com.plexapp.agents.imdb://tt1291580?lang=en\""] - // ["\"com.plexapp.agents.thetvdb://73141/17/5?lang=en\""] - for (x=0; x { - log.debug('Response from setPMSSetting recieved') - response + .then((response) => { + log.debug('Response from setPMSSetting recieved') + response }) .catch(function (error) { - if (error.response) { + if (error.response) { log.error('setPMSSetting: ' + error.response.data) alert(error.response.data.errors[0].code + " " + error.response.data.errors[0].message) } else if (error.request) { log.error('setPMSSetting: ' + error.request) } else { log.error('setPMSSetting: ' + error.message) - } + } }); - + }, async fetchPMSSettings({ commit }, payload) { @@ -56,11 +56,11 @@ const actions = { const url = payload.Address + '/:/prefs'; await axios({ method: 'get', - url: url, + url: url, headers: header }) - .then((response) => { - log.debug('Response from fetchPlexServers recieved') + .then((response) => { + log.debug('Response from fetchPlexServers recieved') var filteredResult = {} // Filtered result based on hidden, adv or all var curFilter = wtconfig.get('PMS.FilterSetting', 'AllSettings'); @@ -71,54 +71,54 @@ const actions = { else if (curFilter == 'OnlyHidden'){ filteredResult = JSONPath({path: '$..Setting[?(@.hidden==true)]', json: response.data}); } - else { + else { filteredResult = JSONPath({path: '$..Setting[?(@.advanced==true)]', json: response.data}); } - // Reset PMSSettings + // Reset PMSSettings var PMSSettings = {}; // Create Array for undefined - PMSSettings[i18n.t('Modules.PMS.Settings.Undefined')] = []; + PMSSettings[i18n.t('Modules.PMS.Settings.Undefined')] = []; // Create Arrays for other categories filteredResult.forEach(group => { - group = JSONPath({path: '$.group', json: group})[0] + group = JSONPath({path: '$.group', json: group})[0] if (group !== "") { PMSSettings[group] = []; } }) - // Get the single items - filteredResult.forEach(element => { + // Get the single items + filteredResult.forEach(element => { var id = JSONPath({path: '$.id', json: element}); var itemGroup = JSONPath({path: '$.group', json: element}); if (itemGroup == "") { itemGroup = i18n.t('Modules.PMS.Settings.Undefined'); - } - var PMSSettingsItem = {} + } + var PMSSettingsItem = {} var jNode = {}; jNode['label'] = JSONPath({path: '$.label', json: element})[0]; jNode['summary'] = JSONPath({path: '$.summary', json: element})[0]; jNode['type'] = JSONPath({path: '$.type', json: element})[0]; jNode['default'] = JSONPath({path: '$.default', json: element})[0]; - jNode['value'] = JSONPath({path: '$.value', json: element})[0]; - PMSSettingsItem[id] = jNode; + jNode['value'] = JSONPath({path: '$.value', json: element})[0]; + PMSSettingsItem[id] = jNode; PMSSettings[itemGroup].push(PMSSettingsItem) - }); + }); // Remove undefined category, if empty - if (Object.keys(PMSSettings[i18n.t('Modules.PMS.Settings.Undefined')]).length === 0){ + if (Object.keys(PMSSettings[i18n.t('Modules.PMS.Settings.Undefined')]).length === 0){ delete PMSSettings[i18n.t('Modules.PMS.Settings.Undefined')]; } - log.verbose(`PMS Settings are: ${JSON.stringify(PMSSettings)}`) + log.verbose(`PMS Settings are: ${JSON.stringify(PMSSettings)}`) commit('UPDATE_PMS_SETTINGS', PMSSettings); }) .catch(function (error) { - if (error.response) { + if (error.response) { log.error('fetchPMSSettings: ' + error.response.data) alert(error.response.data.errors[0].code + " " + error.response.data.errors[0].message) } else if (error.request) { log.error('fetchPMSSettings: ' + error.request) } else { log.error('fetchPMSSettings: ' + error.message) - } + } }); } }; @@ -131,5 +131,5 @@ const serverModule = { actions, getters }; - + export default serverModule; \ No newline at end of file diff --git a/src/store/modules/poeditor.js b/src/store/modules/poeditor.js index 4fcbde7..6dccc3d 100644 --- a/src/store/modules/poeditor.js +++ b/src/store/modules/poeditor.js @@ -77,7 +77,7 @@ const actions = { const dwnlresp = await axios({ method: 'GET', url: link, - responseType: 'stream' + responseType: 'json' }) var json = JSON.stringify(dwnlresp.data); fs.writeFileSync(path, json);