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

Merge pull request #344 from WebTools-NG/#342-Rename-"Export-Arts"

Browse source 
#342 rename "export arts"
This commit is contained in:
Tommy Mikkelsen 2021-04-16 23:54:32 +02:00 committed by GitHub
commit beebdbce53
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 25 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -3,6 +3,7 @@
## V0.3.5 ## V0.3.5
* [#339 IMDB ID not available for movies](https://github.com/WebTools-NG/WebTools-NG/issues/339) * [#339 IMDB ID not available for movies](https://github.com/WebTools-NG/WebTools-NG/issues/339)
* [#342 Rename "Export Arts"](https://github.com/WebTools-NG/WebTools-NG/issues/342)
## V0.3.4 ## V0.3.4

4
public/locales/en.json
View file

@ -154,8 +154,8 @@
"QualifierCSV": "Qualifier to use with a text based field for CSV (Use space for none)", "QualifierCSV": "Qualifier to use with a text based field for CSV (Use space for none)",
"Posters_Dimensions": "Poster height * width", "Posters_Dimensions": "Poster height * width",
"Posters_Dimensions_TT": "Poster height*width, If 'Export Posters' is a field in the export. Can be seperated by a comma, for multiple exports, like `75*75, 1024*768`. Note: dimensions might be altered slightly in order to preserve the aspect ratio of the poster", "Posters_Dimensions_TT": "Poster height*width, If 'Export Posters' is a field in the export. Can be seperated by a comma, for multiple exports, like `75*75, 1024*768`. Note: dimensions might be altered slightly in order to preserve the aspect ratio of the poster",
"Arts_Dimensions": "Art height * width", "Art_Dimensions": "Art height * width",
"Arts_Dimensions_TT": "Art height*width, If 'Export Arts' is a field in the export. Can be seperated by a comma, for multiple exports, like `75*75, 1024*768`. Note: dimensions might be altered slightly in order to preserve the aspect ratio of the art" "Art_Dimensions_TT": "Art height*width, If 'Export Art' is a field in the export. Can be seperated by a comma, for multiple exports, like `75*75, 1024*768`. Note: dimensions might be altered slightly in order to preserve the aspect ratio of the art"
}, },
"LevelInfo": "Export level determines which data are going to be exported.", "LevelInfo": "Export level determines which data are going to be exported.",
"ExportLevel": "Export Level", "ExportLevel": "Export Level",

14
src/components/modules/ExportTools/Custom/custom.vue
View file

@ -169,10 +169,10 @@
{ {
custLevel.push("Export Posters"); custLevel.push("Export Posters");
} }
// Do we need to export arts? // Do we need to export art?
if ( wtconfig.get(`ET.CustomLevels.${this.selMediaType}.Arts.${this.selCustLevel}`, false) ) if ( wtconfig.get(`ET.CustomLevels.${this.selMediaType}.Art.${this.selCustLevel}`, false) )
{ {
custLevel.push("Export Arts"); custLevel.push("Export Art");
} }
// Add to resultList // Add to resultList
this.resultList = custLevel.map((name, index) => { this.resultList = custLevel.map((name, index) => {
@ -298,7 +298,7 @@
}, },
saveCustomLevel() { saveCustomLevel() {
let result = [] let result = []
let bExportArts = false; let bExportArt = false;
let bExportPosters = false; let bExportPosters = false;
for(var k in this.resultList) { for(var k in this.resultList) {
@ -306,9 +306,9 @@
{ {
bExportPosters = true; bExportPosters = true;
} }
else if (this.resultList[k].name == 'Export Arts') else if (this.resultList[k].name == 'Export Art')
{ {
bExportArts = true; bExportArt = true;
} }
else else
{ {
@ -316,7 +316,7 @@
} }
} }
wtconfig.set(`ET.CustomLevels.${this.selMediaType}.Posters.${this.selCustLevel}`, bExportPosters); wtconfig.set(`ET.CustomLevels.${this.selMediaType}.Posters.${this.selCustLevel}`, bExportPosters);
wtconfig.set(`ET.CustomLevels.${this.selMediaType}.Arts.${this.selCustLevel}`, bExportArts); wtconfig.set(`ET.CustomLevels.${this.selMediaType}.Art.${this.selCustLevel}`, bExportArt);
// Get current level names // Get current level names
let curLevel = wtconfig.get(`ET.CustomLevels.${this.selMediaType}.level`); let curLevel = wtconfig.get(`ET.CustomLevels.${this.selMediaType}.level`);
// Add new level to JSON // Add new level to JSON

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

@ -24,11 +24,11 @@
</b-tooltip> </b-tooltip>
<b-form-input id="PosterDim" name="PosterDim" type="text" class="form-control" v-model="PosterDim" :disabled=false @change="setPosters_Dimensions()"></b-form-input> <b-form-input id="PosterDim" name="PosterDim" type="text" class="form-control" v-model="PosterDim" :disabled=false @change="setPosters_Dimensions()"></b-form-input>
</b-input-group> </b-input-group>
<b-input-group id="ArtsGrp" :prepend="$t('Modules.ET.Settings.Arts_Dimensions')" class="mt-3"> <b-input-group id="ArtGrp" :prepend="$t('Modules.ET.Settings.Art_Dimensions')" class="mt-3">
<b-tooltip target="ArtsGrp" triggers="hover"> <b-tooltip target="ArtGrp" triggers="hover">
{{ $t('Modules.ET.Settings.Arts_Dimensions_TT') }} {{ $t('Modules.ET.Settings.Art_Dimensions_TT') }}
</b-tooltip> </b-tooltip>
<b-form-input id="ArtsDim" name="ArtsDim" type="text" class="form-control" v-model="ArtsDim" :disabled=false @change="setArts_Dimensions()"></b-form-input> <b-form-input id="ArtDim" name="ArtDim" type="text" class="form-control" v-model="ArtDim" :disabled=false @change="setArt_Dimensions()"></b-form-input>
</b-input-group> </b-input-group>
<b-form-group id="b-form-group"> <b-form-group id="b-form-group">
<b-form-checkbox-group <b-form-checkbox-group
@ -67,7 +67,7 @@
NotAvailIndicator: wtconfig.get('ET.NotAvail', 'N/A'), NotAvailIndicator: wtconfig.get('ET.NotAvail', 'N/A'),
ColumnSep: '', ColumnSep: '',
PosterDim: wtconfig.get('ET.Posters_Dimensions', '75*75'), PosterDim: wtconfig.get('ET.Posters_Dimensions', '75*75'),
ArtsDim: wtconfig.get('ET.Arts_Dimensions', '75*75'), ArtDim: wtconfig.get('ET.Art_Dimensions', '75*75'),
TimeOut: wtconfig.get('PMS.TimeOut'), TimeOut: wtconfig.get('PMS.TimeOut'),
cbSelected: [], cbSelected: [],
cbOptions: [ cbOptions: [
@ -133,8 +133,8 @@
setPosters_Dimensions: function(){ setPosters_Dimensions: function(){
wtconfig.set('ET.Posters_Dimensions', this.PosterDim); wtconfig.set('ET.Posters_Dimensions', this.PosterDim);
}, },
setArts_Dimensions: function(){ setArt_Dimensions: function(){
wtconfig.set('ET.Arts_Dimensions', this.ArtsDim); wtconfig.set('ET.Art_Dimensions', this.ArtDim);
} }
} }
}; };

2
src/components/modules/ExportTools/defs/def-Episode.json
View file

@ -67,7 +67,7 @@
"Directors", "Directors",
"Duration", "Duration",
"Episode", "Episode",
"Export Arts", "Export Art",
"Export Posters", "Export Posters",
"Extras", "Extras",
"IMDB ID", "IMDB ID",

2
src/components/modules/ExportTools/defs/def-Fields.json
View file

@ -418,7 +418,7 @@
"call": 1, "call": 1,
"type": "string" "type": "string"
}, },
"Export Arts": "Export Art":
{ {
"key": "$.ratingKey", "key": "$.ratingKey",
"call": 1, "call": 1,

2
src/components/modules/ExportTools/defs/def-Movie.json
View file

@ -64,7 +64,7 @@
"Country", "Country",
"Directors", "Directors",
"Duration", "Duration",
"Export Arts", "Export Art",
"Export Posters", "Export Posters",
"Extras", "Extras",
"Extras-behindthescenes", "Extras-behindthescenes",

2
src/components/modules/ExportTools/defs/def-Show.json
View file

@ -22,7 +22,7 @@
"Content Rating", "Content Rating",
"Deleted", "Deleted",
"Duration", "Duration",
"Export Arts", "Export Art",
"Export Posters", "Export Posters",
"Extras", "Extras",
"Extras-behindthescenes", "Extras-behindthescenes",

8
src/components/modules/ExportTools/scripts/et.js
View file

@ -983,11 +983,11 @@ const excel2 = new class Excel {
else else
{ {
picUrl = String(JSONPath({path: '$.art', json: data})[0]); picUrl = String(JSONPath({path: '$.art', json: data})[0]);
resolutions = wtconfig.get('ET.Arts_Dimensions', '75*75').split(','); resolutions = wtconfig.get('ET.Art_Dimensions', '75*75').split(',');
ExpDir = path.join( ExpDir = path.join(
wtconfig.get('General.ExportPath'), wtconfig.get('General.ExportPath'),
wtutils.AppName, wtutils.AppName,
'ExportTools', 'Arts'); 'ExportTools', 'Art');
} }
// Create export dir // Create export dir
var fs = require('fs'); var fs = require('fs');
@ -1272,7 +1272,7 @@ const excel2 = new class Excel {
{ {
await this.exportPics( { type: 'posters', data: item, baseURL: baseURL, accessToken: accessToken } ) await this.exportPics( { type: 'posters', data: item, baseURL: baseURL, accessToken: accessToken } )
} }
if (wtconfig.get(`ET.CustomLevels.${libType}.Arts.${level}`, false)) if (wtconfig.get(`ET.CustomLevels.${libType}.Art.${level}`, false))
{ {
await this.exportPics( { type: 'arts', data: item, baseURL: baseURL, accessToken: accessToken } ) await this.exportPics( { type: 'arts', data: item, baseURL: baseURL, accessToken: accessToken } )
} }
@ -1297,7 +1297,7 @@ const excel2 = new class Excel {
{ {
await this.exportPics( { type: 'posters', data: item, baseURL: baseURL, accessToken: accessToken } ) await this.exportPics( { type: 'posters', data: item, baseURL: baseURL, accessToken: accessToken } )
} }
if (wtconfig.get(`ET.CustomLevels.${libType}.Arts.${level}`, false)) if (wtconfig.get(`ET.CustomLevels.${libType}.Art.${level}`, false))
{ {
await this.exportPics( { type: 'arts', data: item, baseURL: baseURL, accessToken: accessToken } ) await this.exportPics( { type: 'arts', data: item, baseURL: baseURL, accessToken: accessToken } )
} }