From af129f1de5c75e019fd88b415c51e623dd8a9901 Mon Sep 17 00:00:00 2001 From: UKDTOM Date: Tue, 4 May 2021 12:49:33 +0200 Subject: [PATCH] #359 WIP --- CHANGELOG.md | 4 +++ package.json | 2 +- src/components/modules/ExportTools/Export.vue | 3 +- .../modules/ExportTools/scripts/et.js | 35 +++++++++++++++++++ src/store/modules/et.js | 2 -- 5 files changed, 42 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a3e67b2..cf9a094 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.9 + +* [#359 ET: Log time it took](https://github.com/WebTools-NG/WebTools-NG/issues/359) + ## V0.3.8 * [#357 Default "Original Title" to "Title", if empty](https://github.com/WebTools-NG/WebTools-NG/issues/357) diff --git a/package.json b/package.json index d9a1a64..150f84b 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "webtools-ng", "productName": "WebTools-NG", - "version": "0.3.8", + "version": "0.3.9", "description": "WebTools Next Generation 4 Plex", "author": "dane22 & CPSO", "license": "MPL-2.0", diff --git a/src/components/modules/ExportTools/Export.vue b/src/components/modules/ExportTools/Export.vue index 9d3530c..00284d5 100644 --- a/src/components/modules/ExportTools/Export.vue +++ b/src/components/modules/ExportTools/Export.vue @@ -461,7 +461,8 @@ this.$store.commit("UPDATE_EXPORTLEVEL", this.selLevel); this.$store.commit("UPDATE_SELECTEDSECTION", this.selLibrary); this.$store.commit("UPDATE_EXPORTSTATUS", i18n.t("Modules.ET.Status.StartExport")); - this.$store.dispatch("exportMedias"); + et.exportMedias(); + //this.$store.dispatch("exportMedias"); }, async checkSrvSelected() { log.debug("checkSrvSelected started"); diff --git a/src/components/modules/ExportTools/scripts/et.js b/src/components/modules/ExportTools/scripts/et.js index 6e3d9d2..9f33ac4 100644 --- a/src/components/modules/ExportTools/scripts/et.js +++ b/src/components/modules/ExportTools/scripts/et.js @@ -133,6 +133,41 @@ const et = new class ET { ] } } + async exportMedias() { + var baseURL = store.getters.getSelectedServerAddress; + var accessToken = store.getters.getSelectedServerToken; + var libType = store.getters.getLibType; + var pListType = store.getters.getSelectedLibTypeSec; + + console.log('Ged 1', baseURL) + console.log('Ged 2', accessToken) + console.log('Ged 3', libType) + console.log('Ged 4', pListType) + + let levelName; + var libName = et.getLibDisplayName(store.getters.getSelectedSection, store.getters.getPmsSections); + if ([ et.ETmediaType.Libraries, et.ETmediaType.Playlists].indexOf(libType) > -1) + { + levelName = 'All' + } + else + { + levelName = et.getLevelDisplayName(store.getters.getSelectedExportLevel, libType); + } + console.log('Ged 7', levelName) + + + excel2.createOutFile( { + libName: libName, + level: levelName, + libType: libType, + baseURL: baseURL, + accessToken: accessToken, + exType: libType, + pListType: pListType, + libTypeSec: store.getSelectedLibTypeSec + } ); + } async getSectionData({sectionName, baseURL, accessToken, libType, libTypeSec}) { diff --git a/src/store/modules/et.js b/src/store/modules/et.js index a034a50..41cda49 100644 --- a/src/store/modules/et.js +++ b/src/store/modules/et.js @@ -52,10 +52,8 @@ const actions = { exportMedias({ getters }) { var baseURL = getters.getSelectedServerAddress; var accessToken = getters.getSelectedServerToken; - //var libType = (et.RevETmediaType[getters.getLibType]).toString().toLowerCase(); var libType = getters.getLibType; var pListType = getters.getSelectedLibTypeSec; - //var pListType = getters.getSelectedPListType; let levelName; var libName = et.getLibDisplayName(getters.getSelectedSection, getters.getPmsSections); if ([ et.ETmediaType.Libraries, et.ETmediaType.Playlists].indexOf(libType) > -1)