Mirrors/WebTools-NG
2
0
Fork 0
mirror of https://github.com/WebTools-NG/WebTools-NG synced 2024-11-26 04:50:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #516 from WebTools-NG/#508-No-timestamp-in-output-file

Browse source 
Fix #508
This commit is contained in:
Tommy Mikkelsen 2022-07-03 00:19:39 +02:00 committed by GitHub
commit 83a2d70bdf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -17,6 +17,7 @@
* [#509 Refactor Settings](https://github.com/WebTools-NG/WebTools-NG/issues/509)
* [#512 ET Intro Start/End isn't exported](https://github.com/WebTools-NG/WebTools-NG/issues/512)
* [#514 Bring back EN translations from Romain](https://github.com/WebTools-NG/WebTools-NG/issues/514)
* [#508 No timestamp in output file](https://github.com/WebTools-NG/WebTools-NG/issues/508)
## V0.3.17 (20220601)

3
public/locales/en.json
View file

@ -231,7 +231,8 @@
"ttShowsUseId": "If exporting Suggested Filename or Folder for shows, default to selected naming if available. Fallback to TMDB if not",
"Name": "@:Modules.ET.Name Settings",
"Note": "Note: * Click here for general settings regarding export *",
"Return": "Return to @:Modules.ET.Name"
"Return": "Return to @:Modules.ET.Name",
"NoTimeStamp": "Don't add a timestamp to export file name"
},
"LevelInfo": "Export level determines which data are going to be exported.",
"SelectLevel": "Select level",

7
src/components/modules/ExportTools/Settings/settings.vue
View file

@ -74,7 +74,8 @@
{ text: i18n.t('Modules.ET.Settings.OrgTitleNull'), value: 'OrgTitleNull' },
{ text: i18n.t('Modules.ET.Settings.SortTitleNull'), value: 'SortTitleNull' },
{ text: i18n.t('Modules.ET.Settings.suggestedFileNoExtra'), value: 'suggestedFileNoExtra' },
{ text: i18n.t('Modules.ET.Settings.suggestedUseOrigenTitle'), value: 'suggestedUseOrigenTitle' }
{ text: i18n.t('Modules.ET.Settings.suggestedUseOrigenTitle'), value: 'suggestedUseOrigenTitle' },
{ text: i18n.t('Modules.ET.Settings.NoTimeStamp'), value: 'NoTimeStamp' }
],
SelectedMoviesIDOptions: ['imdb', 'tmdb'],
SelectedMoviesID: '',
@ -91,7 +92,7 @@
dialog.ShowMsg( i18n.t("Modules.ET.Name"), i18n.t("Common.Ok"), i18n.t("Common.AppName"), 'For this version, export to XLSX is currently disabled', 'info');
},
getDefaults(){
const cbItems = ["ExpCSV","ExpXLSX", "OrgTitleNull", "SortTitleNull", "suggestedFileNoExtra", "suggestedUseOrigenTitle"];
const cbItems = ["ExpCSV","ExpXLSX", "OrgTitleNull", "SortTitleNull", "suggestedFileNoExtra", "suggestedUseOrigenTitle", "NoTimeStamp"];
for(let i = 0; i < cbItems.length; i++){
if (wtconfig.get("ET." + cbItems[i], false)){
this.cbSelected.push(cbItems[i]);
@ -104,7 +105,7 @@
},
filterTable(){
this.$nextTick(()=>{console.log(this.cbSelected);})
for( var cbItem of ["ExpCSV","ExpXLSX","OrgTitleNull", "SortTitleNull", "AutoXLSCol", "AutoXLSRow", "suggestedFileNoExtra", "suggestedUseOrigenTitle"]){
for( var cbItem of ["ExpCSV","ExpXLSX","OrgTitleNull", "SortTitleNull", "AutoXLSCol", "AutoXLSRow", "suggestedFileNoExtra", "suggestedUseOrigenTitle", "NoTimeStamp"]){
wtconfig.set("ET." + cbItem, (this.cbSelected.includes(cbItem)))
}
},

6
src/components/modules/ExportTools/scripts/ethelper.js
View file

@ -1649,8 +1649,10 @@ const etHelper = new class ETHELPER {
arrFile.push(this.Settings.fileMinor);
arrFile.push(this.Settings.levelName);
arrFile.push('Item ' + this.Settings.startItem + '-' + this.Settings.endItem);
arrFile.push(timeStamp + '.' + Type + '.tmp');
this.Settings.outFile = arrFile.join('_');
if (!wtconfig.get('ET.NoTimeStamp', false)){
arrFile.push(timeStamp);
}
this.Settings.outFile = arrFile.join('_') + '.' + Type + '.tmp';
// Remove unwanted chars from outfile name
const targetDir = path.join(
OutDir, wtutils.AppName, i18n.t('Modules.ET.Name'));