Fixed #186
authorRemixDev <deezloaderremix@gmail.com>
Sun, 24 Feb 2019 10:28:43 +0000 (11:28 +0100)
committerRemixDev <deezloaderremix@gmail.com>
Sun, 24 Feb 2019 10:28:43 +0000 (11:28 +0100)
app/app.js
app/default.json
app/public/index.html
app/public/js/frontend.js

index 23021f136e6e19475ef9d43cbbe38c0c85da7b9e..e0b4222edba6980363678348d88f42b046500cd8 100644 (file)
@@ -1230,37 +1230,37 @@ io.sockets.on('connection', function (s) {
                        if(track.contributor){
                                if(track.contributor.composer){
                                        track.composerString = []
-                                       uniqueArray(track.contributor.composer, track.composerString, settings.removeDupedTags)
+                                       uniqueArray(track.contributor.composer, track.composerString)
                                        if (!(track.selectedFormat == 9 && separator==String.fromCharCode(parseInt("\u0000",16)))) track.composerString = track.composerString.join(separator)
                                }
                                if(track.contributor.musicpublisher){
                                        track.musicpublisherString = []
-                                       uniqueArray(track.contributor.musicpublisher, track.musicpublisherString, settings.removeDupedTags)
+                                       uniqueArray(track.contributor.musicpublisher, track.musicpublisherString)
                                        if (!(track.selectedFormat == 9 && separator==String.fromCharCode(parseInt("\u0000",16)))) track.musicpublisherString = track.musicpublisherString.join(separator)
                                }
                                if(track.contributor.producer){
                                        track.producerString = []
-                                       uniqueArray(track.contributor.producer, track.producerString, settings.removeDupedTags)
+                                       uniqueArray(track.contributor.producer, track.producerString)
                                        if (!(track.selectedFormat == 9 && separator==String.fromCharCode(parseInt("\u0000",16)))) track.producerString = track.producerString.join(separator)
                                }
                                if(track.contributor.engineer){
                                        track.engineerString = []
-                                       uniqueArray(track.contributor.engineer, track.engineerString, settings.removeDupedTags)
+                                       uniqueArray(track.contributor.engineer, track.engineerString)
                                        if (!(track.selectedFormat == 9 && separator==String.fromCharCode(parseInt("\u0000",16)))) track.engineerString = track.engineerString.join(separator)
                                }
                                if(track.contributor.writer){
                                        track.writerString = []
-                                       uniqueArray(track.contributor.writer, track.writerString, settings.removeDupedTags)
+                                       uniqueArray(track.contributor.writer, track.writerString)
                                        if (!(track.selectedFormat == 9 && separator==String.fromCharCode(parseInt("\u0000",16)))) track.writerString = track.writerString.join(separator)
                                }
                                if(track.contributor.author){
                                        track.authorString = []
-                                       uniqueArray(track.contributor.author, track.authorString, settings.removeDupedTags)
+                                       uniqueArray(track.contributor.author, track.authorString)
                                        if (!(track.selectedFormat == 9 && separator==String.fromCharCode(parseInt("\u0000",16)))) track.authorString = track.authorString.join(separator)
                                }
                                if(track.contributor.mixer){
                                        track.mixerString = [];
-                                       uniqueArray(track.contributor.mixer, track.mixerString, settings.removeDupedTags)
+                                       uniqueArray(track.contributor.mixer, track.mixerString)
                                        if (!(track.selectedFormat == 9 && separator==String.fromCharCode(parseInt("\u0000",16)))) track.mixerString = track.mixerString.join(separator)
                                }
                        }
@@ -1278,9 +1278,9 @@ io.sockets.on('connection', function (s) {
                                        }
                                        artistArray = track.artistsString
                                }
-                               uniqueArray(artistArray, track.artistsString, settings.removeDupedTags)
+                               uniqueArray(artistArray, track.artistsString)
                                let posMainArtist = track.artistsString.indexOf(track.album.artist.name)
-                               if (posMainArtist !== -1 && posMainArtist !== 0 && settings.removeDupedTags){
+                               if (posMainArtist !== -1 && posMainArtist !== 0){
                                        let element = track.artistsString[posMainArtist]
                                track.artistsString.splice(posMainArtist, 1)
                                track.artistsString.splice(0, 0, element)
index 032c6efaa0e7472a4b27fcba2f8375ec37d241c5..861e775b3a6c0ac5dc8a07ce1fee0416ba316919 100644 (file)
@@ -34,7 +34,6 @@
                "dateFormatYear": "4",
                "fallbackBitrate": true,
                "saveFullArtists": false,
-               "removeDupedTags":false,
                "tags": {
                        "title": true,
                        "artist": true,
index db45b927a5cb43c9a08dc8d302669c0239e960e7..b98c2e27298112993ee88b0d3177f844e98479b8 100644 (file)
                                <input type="checkbox" id="modal_settings_cbox_saveFullArtists" class="filled-in"/>
                                <span>Save file with full artists</span>
         </label>
-      </p>
-      <p class="col s12 m4">
-        <label>
-                               <input type="checkbox" id="modal_settings_cbox_removeDupedTags" class="filled-in"/>
-                               <span>Better removal of duplicates (BETA)</span>
-        </label>
       </p>
                </div>
     <div class="row">
index 3c9f6cfb79b607dc4d3bcdc15ba2b16d33ea17a4..dc42e97303fd1921e2e27c06641c02550da2570f 100644 (file)
@@ -264,7 +264,6 @@ $('#modal_settings_btn_saveSettings').click(function () {
                fallbackBitrate : $('#modal_settings_cbox_fallbackBitrate').is(':checked'),
                minimizeToTray : $('#modal_settings_cbox_minimizeToTray').is(':checked'),
                saveFullArtists : $('#modal_settings_cbox_saveFullArtists').is(':checked'),
-               removeDupedTags : $('#modal_settings_cbox_removeDupedTags').is(':checked'),
                tags: {
                        title: $('#modal_tags_title').is(':checked'),
                        artist: $('#modal_tags_artist').is(':checked'),
@@ -368,7 +367,6 @@ function fillSettingsModal(settings) {
        $('#modal_settings_cbox_fallbackBitrate').prop('checked', settings.fallbackBitrate)
        $('#modal_settings_cbox_minimizeToTray').prop('checked', settings.minimizeToTray)
        $('#modal_settings_cbox_saveFullArtists').prop('checked', settings.saveFullArtists)
-       $('#modal_settings_cbox_removeDupedTags').prop('checked', settings.removeDupedTags)
 
        $('#modal_tags_title').prop('checked', settings.tags.title)
        $('#modal_tags_artist').prop('checked', settings.tags.artist)