Readded fixname to entire filename string
authorRemixDev <deezloaderremix@gmail.com>
Fri, 12 Apr 2019 09:19:03 +0000 (11:19 +0200)
committerRemixDev <deezloaderremix@gmail.com>
Fri, 12 Apr 2019 09:19:03 +0000 (11:19 +0200)
app/app.js

index 388f2348cebff79d533d7eacc843945958e9a0be..ea5db6f9be486529bf6ab72146f615a49458f8d2 100644 (file)
@@ -1447,6 +1447,8 @@ io.sockets.on('connection', function (s) {
                        filename = settingsRegex(track, settings.filename, settings.playlist, settings.saveFullArtists && settings.multitagSeparator != null, settings.paddingSize, settings.plName && !settings.numplaylistbyalbum);
                }
 
+               filename = antiDot(fixName(filename))
+
                // TODO: Move to a separate function
                // Generating file path
                let filepath = mainFolder;
@@ -1468,15 +1470,15 @@ io.sockets.on('connection', function (s) {
 
                        if (settings.createAlbumFolder) {
                                if(settings.artName){
-                                       filepath += antiDot(settingsRegexAlbum(settings.foldername,settings.artName,settings.albName,track.date.year,track.recordType,track.album.explicit,track.publisher,track.genre)) + path.sep;
+                                       filepath += antiDot(fixName(settingsRegexAlbum(settings.foldername,settings.artName,settings.albName,track.date.year,track.recordType,track.album.explicit,track.publisher,track.genre))) + path.sep;
                                }else{
-                                       filepath += antiDot(settingsRegexAlbum(settings.foldername,track.album.artist.name,track.album.title,track.date.year,track.recordType,track.album.explicit,track.publisher,track.genre)) + path.sep;
+                                       filepath += antiDot(fixName(settingsRegexAlbum(settings.foldername,track.album.artist.name,track.album.title,track.date.year,track.recordType,track.album.explicit,track.publisher,track.genre))) + path.sep;
                                }
                        }
                } else if (settings.plName) {
                        filepath += antiDot(fixName(settings.plName)) + path.sep;
                } else if (settings.artName) {
-                       filepath += antiDot(settingsRegexAlbum(settings.foldername,settings.artName,settings.albName,track.date.year,track.recordType,track.album.explicit,track.publisher,track.genre)) + path.sep;
+                       filepath += antiDot(fixName(settingsRegexAlbum(settings.foldername,settings.artName,settings.albName,track.date.year,track.recordType,track.album.explicit,track.publisher,track.genre))) + path.sep;
                }
                let coverpath = filepath;
                if (track.discTotal > 1 && (settings.artName || settings.createAlbumFolder) && settings.createCDFolder){