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 #419 from WebTools-NG/#386

Browse source 
#386
This commit is contained in:
Tommy Mikkelsen 2021-12-01 22:55:24 +01:00 committed by GitHub
commit 7e3b54b7e4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 74 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -20,6 +20,7 @@
* [#407 Can't export libraries with a forward slash (/) in the name](https://github.com/WebTools-NG/WebTools-NG/issues/407) * [#407 Can't export libraries with a forward slash (/) in the name](https://github.com/WebTools-NG/WebTools-NG/issues/407)
* [#412 [RFE] ET: Export should allow us to export in smaller chunks](https://github.com/WebTools-NG/WebTools-NG/issues/412) * [#412 [RFE] ET: Export should allow us to export in smaller chunks](https://github.com/WebTools-NG/WebTools-NG/issues/412)
* [#413 Translations should be in it's own branch](https://github.com/WebTools-NG/WebTools-NG/issues/413) * [#413 Translations should be in it's own branch](https://github.com/WebTools-NG/WebTools-NG/issues/413)
* [#418 If selected qualifier in string things break](https://github.com/WebTools-NG/WebTools-NG/issues/418)
## V0.3.12 (20210709) ## V0.3.12 (20210709)

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

@ -1233,7 +1233,7 @@
"TMDB ID": "TMDB ID":
{ {
"key": "$.Guid[*]", "key": "$.Guid[*]",
"call": 1, "call": 2,
"type": "array", "type": "array",
"subtype": "string", "subtype": "string",
"subkey": "$.id", "subkey": "$.id",
@ -1242,7 +1242,7 @@
"TMDB Link": "TMDB Link":
{ {
"key": "$.Guid[*]", "key": "$.Guid[*]",
"call": 1, "call": 2,
"type": "array", "type": "array",
"subtype": "string", "subtype": "string",
"subkey": "$.id", "subkey": "$.id",

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

@ -13,7 +13,13 @@ const csv = new class CSV {
async addHeaderToTmp({ stream: stream, item: item}) async addHeaderToTmp({ stream: stream, item: item})
{ {
const strHeader = item.join(wtconfig.get('ET.ColumnSep', ',')); // Walk each item, and add Qualifier
let headerArray = [];
let x = 0;
for (x=0; x<item.length; x++) {
headerArray.push(wtconfig.get('ET.TextQualifierCSV', "\"") + item[x] + wtconfig.get('ET.TextQualifierCSV', "\""));
}
const strHeader = headerArray.join(wtconfig.get('ET.ColumnSep', ','));
// Add the header // Add the header
await stream.write( strHeader + "\n"); await stream.write( strHeader + "\n");
log.info(`Added CSV Header as: ${strHeader}`); log.info(`Added CSV Header as: ${strHeader}`);

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

@ -26,29 +26,35 @@ function isEmptyObj(obj) {
return !Object.keys(obj).length > 0; return !Object.keys(obj).length > 0;
} }
// Adds the String Qualifier if needed // Set Qualifier
function setStrSeperator( {str: str}) function setQualifier( {str:str})
{
const validQ = ["`", "'", "\""];
log.silly(`etHelper (setQualifier): String is: ${str}`);
if (str.indexOf(wtconfig.get('ET.TextQualifierCSV', 'N/A')) >= 0)
{ {
if ( wtconfig.get('ET.TextQualifierCSV') ) let selectedQ;
{ for(const val of validQ) {
if ( wtconfig.get('ET.TextQualifierCSV') != ' ') if ( val != wtconfig.get('ET.TextQualifierCSV', 'N/A'))
{ {
log.silly(`etHelper (setStrSeperator): Returning: ${wtconfig.get('ET.TextQualifierCSV')}${str}${wtconfig.get('ET.TextQualifierCSV')}`); selectedQ = val;
return wtconfig.get('ET.TextQualifierCSV') + str + wtconfig.get('ET.TextQualifierCSV'); break;
} }
else
{
log.silly(`etHelper (setStrSeperator) No sep, so returning ${str}`);
return str; }
}
else
{
log.error(`etHelper (setStrSeperator): UPS no qualifier, so returning nothing`);
} }
log.silly(`etHelper (setQualifier) string contained Qualifier`);
str = str.replaceAll(wtconfig.get('ET.TextQualifierCSV'), selectedQ);
} }
if (wtconfig.get('ET.TextQualifierCSV', 'N/A') == '"')
{
str = `"${str}"`
}
else
{
str = `${wtconfig.get('ET.TextQualifierCSV', 'N/A')}${str}${wtconfig.get('ET.TextQualifierCSV', 'N/A')}`
}
log.silly(`etHelper (setQualifier): Returning: ${str}`);
return str;
}
//#endregion //#endregion
@ -197,7 +203,9 @@ const etHelper = new class ETHELPER {
} }
async postProcess( {name, val, title=""} ){ async postProcess( {name, val, title=""} ){
log.silly(`ETHelper(postProcess): Val is: ${JSON.stringify(val)}`) log.silly(`ETHelper(postProcess): Val is: ${JSON.stringify(val)}`);
log.silly(`ETHelper(postProcess): name is: ${name}`);
log.silly(`ETHelper(postProcess): title is: ${title}`);
let retArray = []; let retArray = [];
let x, retVal, start, strStart, end, result; let x, retVal, start, strStart, end, result;
try { try {
@ -217,13 +225,13 @@ const etHelper = new class ETHELPER {
} }
case "Part File": case "Part File":
for (x=0; x<valArray.length; x++) { for (x=0; x<valArray.length; x++) {
retArray.push(path.basename(valArray[x])) retArray.push(setQualifier( {str:path.basename(valArray[x]).slice(0, -1)}));
} }
retVal = retArray.join(wtconfig.get('ET.ArraySep', ' * ')) retVal = retArray.join(wtconfig.get('ET.ArraySep', ' * '))
break; break;
case "Part File Path": case "Part File Path":
for (x=0; x<valArray.length; x++) { for (x=0; x<valArray.length; x++) {
retArray.push(path.dirname(valArray[x])); retArray.push(setQualifier( {str:path.dirname(valArray[x]).substring(1)}));
} }
retVal = retArray.join(wtconfig.get('ET.ArraySep', ' * ')); retVal = retArray.join(wtconfig.get('ET.ArraySep', ' * '));
break; break;
@ -241,7 +249,7 @@ const etHelper = new class ETHELPER {
log.error(`Error getting Part Size was ${error} for ${theSize}`); log.error(`Error getting Part Size was ${error} for ${theSize}`);
} }
} }
retVal = retArray.join(wtconfig.get('ET.ArraySep', ' * ')) retVal = setQualifier( {str:retArray.join(wtconfig.get('ET.ArraySep', ' * '))} );
break; break;
case "Original Title": case "Original Title":
if (wtconfig.get('ET.OrgTitleNull')) if (wtconfig.get('ET.OrgTitleNull'))
@ -254,7 +262,7 @@ const etHelper = new class ETHELPER {
// Override with title if not found // Override with title if not found
if (val == compNA) if (val == compNA)
{ {
retVal = title; retVal = setQualifier( {str:title} );
} }
else { retVal = val; } else { retVal = val; }
} }
@ -343,6 +351,8 @@ const etHelper = new class ETHELPER {
{ {
retVal = wtconfig.get('ET.NotAvail'); retVal = wtconfig.get('ET.NotAvail');
} }
retVal = retVal.slice(0, -1);
retVal = setQualifier( {str:retVal} );
break; break;
case "IMDB Link": case "IMDB Link":
if (val == wtconfig.get('ET.NotAvail')) if (val == wtconfig.get('ET.NotAvail'))
@ -400,8 +410,14 @@ const etHelper = new class ETHELPER {
if (end == -1) if (end == -1)
{ result = strStart.substring(7) } { result = strStart.substring(7) }
else else
{ result = strStart.substring(7, end) } {
retVal = result; result = strStart.substring(7, end)
}
if (result.endsWith(wtconfig.get('ET.TextQualifierCSV')))
{
result = result.slice(0,-1);
}
retVal = setQualifier( {str:result} );
break; break;
case "TVDB ID (Legacy)": case "TVDB ID (Legacy)":
if (val == wtconfig.get('ET.NotAvail')) if (val == wtconfig.get('ET.NotAvail'))
@ -453,10 +469,18 @@ const etHelper = new class ETHELPER {
end = strStart.indexOf(wtconfig.get('ET.ArraySep')); end = strStart.indexOf(wtconfig.get('ET.ArraySep'));
result = '' result = ''
if (end == -1) if (end == -1)
{ result = strStart.substring(7) } {
result = strStart.substring(7);
}
else else
{ result = strStart.substring(7, end) } {
retVal = result; result = strStart.substring(7, end)
}
if (result.endsWith(wtconfig.get('ET.TextQualifierCSV')))
{
result = result.slice(0,-1);
}
retVal = setQualifier( {str:result} );
break; break;
case "TMDB Link": case "TMDB Link":
if (val == wtconfig.get('ET.NotAvail')) if (val == wtconfig.get('ET.NotAvail'))
@ -472,8 +496,13 @@ const etHelper = new class ETHELPER {
{ result = strStart.substring(7) } { result = strStart.substring(7) }
else else
{ result = strStart.substring(7, end) } { result = strStart.substring(7, end) }
result = 'https://www.themoviedb.org/movie/' + result; result = 'https://www.themoviedb.org/movie/' + result;
retVal = result; if (result.endsWith(wtconfig.get('ET.TextQualifierCSV')))
{
result = result.slice(0,-1);
}
retVal = setQualifier( {str:result} );
break; break;
default: default:
log.error(`postProcess no hit for: ${name}`) log.error(`postProcess no hit for: ${name}`)
@ -520,11 +549,7 @@ const etHelper = new class ETHELPER {
val = wtconfig.get('ET.NotAvail', 'N/A'); val = wtconfig.get('ET.NotAvail', 'N/A');
} }
val = etHelper.isEmpty( { "val": val } ); val = etHelper.isEmpty( { "val": val } );
// Remove CR, LineFeed ' and " from the val = setQualifier( {str: val} );
// string if present, and replace with a space
val = val.replace(/'|"|\r|\n/g, ' ');
//val = val.replace(/\r|\n/g, ' ');
val = setStrSeperator( {str: val} );
break; break;
case "array": case "array":
array = JSONPath({path: key, json: data}); array = JSONPath({path: key, json: data});
@ -540,9 +565,6 @@ const etHelper = new class ETHELPER {
valArrayVal = String(JSONPath({path: String(subKey), json: array[i]})); valArrayVal = String(JSONPath({path: String(subKey), json: array[i]}));
// Make N/A if not found // Make N/A if not found
valArrayVal = this.isEmpty( { val: valArrayVal }); valArrayVal = this.isEmpty( { val: valArrayVal });
// Remove CR, LineFeed ' and " from the string if present
valArrayVal = valArrayVal.replace(/'|"|\r|\n/g, ' ');
valArrayVal = setStrSeperator( {str: valArrayVal});
break; break;
case "time": case "time":
valArrayVal = JSONPath({path: String(subKey), json: array[i]}); valArrayVal = JSONPath({path: String(subKey), json: array[i]});
@ -569,6 +591,7 @@ const etHelper = new class ETHELPER {
valArray.push(valArrayVal) valArray.push(valArrayVal)
} }
val = valArray.join(wtconfig.get('ET.ArraySep', ' * ')) val = valArray.join(wtconfig.get('ET.ArraySep', ' * '))
val = setQualifier( {str: val} );
/* if ( String(subType) == 'string') /* if ( String(subType) == 'string')
{ {
val = textSep + val + textSep; val = textSep + val + textSep;
@ -596,6 +619,7 @@ const etHelper = new class ETHELPER {
{ {
val = wtconfig.get('ET.NotAvail', 'N/A') val = wtconfig.get('ET.NotAvail', 'N/A')
} }
val = setQualifier( {str: val} );
break; break;
case "datetime": case "datetime":
//val = JSONPath({path: String(lookup), json: data}); //val = JSONPath({path: String(lookup), json: data});
@ -618,6 +642,7 @@ const etHelper = new class ETHELPER {
{ {
val = wtconfig.get('ET.NotAvail', 'N/A') val = wtconfig.get('ET.NotAvail', 'N/A')
} }
val = setQualifier( {str: val} );
break; break;
} }
if ( doPostProc ) if ( doPostProc )
@ -854,7 +879,6 @@ const etHelper = new class ETHELPER {
// Open a file stream // Open a file stream
this.Settings.csvFile = await etHelper.getFileName({ Type: 'csv' }); this.Settings.csvFile = await etHelper.getFileName({ Type: 'csv' });
this.Settings.csvStream = fs.createWriteStream(this.Settings.csvFile, {flags:'a'}); this.Settings.csvStream = fs.createWriteStream(this.Settings.csvFile, {flags:'a'});
//await this.getFileName({ Library: libName, Level: level, Type: 'tmp', Module: i18n.t('Modules.ET.Name'), exType: exType });
await csv.addHeaderToTmp({ stream: this.Settings.csvStream, item: this.Settings.fields}); await csv.addHeaderToTmp({ stream: this.Settings.csvStream, item: this.Settings.fields});
} }
try try
@ -1013,7 +1037,6 @@ const etHelper = new class ETHELPER {
getElement(){ getElement(){
let element let element
console.log('Ged 12 element sectype: ' + this.Settings.libTypeSec)
switch (this.Settings.libTypeSec) { switch (this.Settings.libTypeSec) {
case this.ETmediaType.Playlist_Photo: case this.ETmediaType.Playlist_Photo:
element = `/playlists/${this.Settings.selLibKey}/items`; element = `/playlists/${this.Settings.selLibKey}/items`;
@ -1153,6 +1176,8 @@ const etHelper = new class ETHELPER {
log.silly(`etHelper (getLevelFields) Custom level detected as: ${JSON.stringify(levels)}`); log.silly(`etHelper (getLevelFields) Custom level detected as: ${JSON.stringify(levels)}`);
} }
Object.keys(levels).forEach(function(key) { Object.keys(levels).forEach(function(key) {
//out.push(wtconfig.get(`ET.TextQualifierCSV`, "\"") + levels[key] + wtconfig.get(`ET.TextQualifierCSV`, "\""))
out.push(levels[key]) out.push(levels[key])
}); });
resolve(out); resolve(out);