Merge branch 'master' into #553-Tooltips-revisited

This commit is contained in:
Tommy Mikkelsen 2022-08-15 01:19:35 +02:00
commit c9a71cafe4
5 changed files with 13 additions and 6 deletions

View file

@ -9,13 +9,15 @@
[![CodeQL](https://github.com/WebTools-NG/WebTools-NG/workflows/CodeQL/badge.svg)](https://github.com/WebTools-NG/WebTools-NG/actions?query=workflow%3ACodeQL) [![CodeQL](https://github.com/WebTools-NG/WebTools-NG/workflows/CodeQL/badge.svg)](https://github.com/WebTools-NG/WebTools-NG/actions?query=workflow%3ACodeQL)
[![Build/release](https://github.com/WebTools-NG/WebTools-NG/actions/workflows/release.yml/badge.svg)](https://github.com/WebTools-NG/WebTools-NG/actions/workflows/release.yml) [![Build/release](https://github.com/WebTools-NG/WebTools-NG/actions/workflows/release.yml/badge.svg)](https://github.com/WebTools-NG/WebTools-NG/actions/workflows/release.yml)
## Please see the [Wiki](https://github.com/WebTools-NG/WebTools-NG/wiki) for futher information. ### WebTools-NG is designed to help users of Plex Media Server, maintain their server/s and media. The software is free for anyone to download and use.
## For installation and usage instructions, please see the WebTools-NG [Wiki](https://github.com/WebTools-NG/WebTools-NG/wiki).
### Special thanks goes to: ### Special thanks go to the following:
<a href="https://plex.tv/"> <a href="https://plex.tv/">
<img alt="Plex" src="https://github.com/WebTools-NG/WebTools-NG/blob/master/wiki/icons/plex-logo-full-color-on-black.png" width="50"> <img alt="Plex" src="https://github.com/WebTools-NG/WebTools-NG/blob/master/wiki/icons/Plex_logo_2022-03.png" width="50">
</a> </a>
<br> <br>
<a href="https://plex.tv/"> <a href="https://plex.tv/">
@ -28,7 +30,7 @@
</a> </a>
<br> <br>
<a href="https://poeditor.com/"> <a href="https://poeditor.com/">
For providing translations for free, since we are Open Source For providing translations for free, since we are a non profit Open Source project
</a> </a>
<br> <br>
<br> <br>
@ -37,8 +39,7 @@
</a> </a>
<br> <br>
<a href="https://www.themoviedb.org/"> <a href="https://www.themoviedb.org/">
For providing a beautiful API for free, since we are a non profit project For providing a beautiful API for free, since we are a non profit Open Source project
</a>

View file

@ -342,11 +342,15 @@ const findMedia = new class FINDMEDIA {
var files = JSONPath({path: `$..Part[*].file`, json: metaData[parseInt(idxMetaData)]}); var files = JSONPath({path: `$..Part[*].file`, json: metaData[parseInt(idxMetaData)]});
for (var idxFiles in files){ for (var idxFiles in files){
const pmsFile = files[idxFiles].replaceAll('\\', '/'); const pmsFile = files[idxFiles].replaceAll('\\', '/');
log.silly(`[FindMedia.js] (scanPMSLibrary) - pmsFile is: ${pmsFile}`);
log.silly(`[FindMedia.js] (scanPMSLibrary) - pmsFile compare: ${this.validExt.includes(path.extname(pmsFile).toLowerCase().slice(1))}`);
if (this.validExt.includes(path.extname(pmsFile).toLowerCase().slice(1))){ if (this.validExt.includes(path.extname(pmsFile).toLowerCase().slice(1))){
const libPathFound = this.getLibPath( files[idxFiles] ); const libPathFound = this.getLibPath( files[idxFiles] );
var lookup = pmsFile.slice(libPathFound.length + 1); var lookup = pmsFile.slice(libPathFound.length + 1);
log.silly(`[FindMedia.js] (scanPMSLibrary) - lookup is: ${lookup}`);
if ( Object.prototype.hasOwnProperty.call(this.filesFound, lookup)) { if ( Object.prototype.hasOwnProperty.call(this.filesFound, lookup)) {
// We need to remove from detected files, since we found it // We need to remove from detected files, since we found it
log.silly(`[FindMedia.js] (scanPMSLibrary) - Removing ${this.filesFound[lookup]}`);
delete this.filesFound[lookup]; delete this.filesFound[lookup];
} }
else { else {
@ -354,6 +358,8 @@ const findMedia = new class FINDMEDIA {
let entry = {} let entry = {}
entry['title'] = title; entry['title'] = title;
entry['file'] = files[idxFiles] entry['file'] = files[idxFiles]
log.silly(`[FindMedia.js] (scanPMSLibrary) - Not found, so only in PMS. We add ${JSON.stringify(entry)}`);
log.silly(`[FindMedia.js] (scanPMSLibrary) - filesFound are: ${JSON.stringify(this.filesFound)}`);
this.libFiles.push(entry); this.libFiles.push(entry);
} }
} }

Binary file not shown.

After

Width:  |  Height:  |  Size: 27 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 26 KiB