Merge lp:~artem-anufrij/noise/Bugfix-1357465 into lp:~elementary-apps/noise/trunk

[Artem Anufrij]

Check for duplicates before importing.

[Cody Garver (codygarver)]

We prefer to update the translation templates after a branch gets merged so that it does not pollute the diff

So please bzr revert -r 1673 po/

review: Needs Fixing

[lp:~artem-anufrij/noise/Bugfix-1357465]

1675. By artem-anufrij on 2014-10-01

bzr revert -r 1673 po/

[Artem Anufrij (artem-anufrij)]

done

[Corentin Noël (tintou)]

Please fix the codestyle, brackets should remain on the same line.
For example:
if () {

} else {

}

review: Needs Fixing

[lp:~artem-anufrij/noise/Bugfix-1357465]

1676. By artem-anufrij on 2014-10-01

fixed code style

[Artem Anufrij (artem-anufrij)]

Hey Corentin,

please check the code style.

[Corentin Noël (tintou)]

Only a small thing remaining and it's fine

[lp:~artem-anufrij/noise/Bugfix-1357465]

1677. By artem-anufrij on 2014-10-04

fixed 'if-else' code style

1678. By artem-anufrij on 2014-10-04

Remove unused code

1679. By artem-anufrij on 2014-10-04

fixed code style

[Corentin Noël (tintou)]

review: Approve

=== modified file 'src/LocalLibrary.vala'
--- src/LocalLibrary.vala	2014-07-03 19:01:33 +0000
+++ src/LocalLibrary.vala	2014-10-04 21:39:48 +0000
@@ -236,9 +236,21 @@
                 var file = File.new_for_path (folder);
                 FileUtils.count_music_files (file, files);
             }
-            fo.resetProgress (files.size - 1);
-            Timeout.add (100, doProgressNotificationWithTimeout);
-            fo.import_files (files, FileOperator.ImportType.IMPORT);
+
+            foreach (var m in get_medias ()) {
+                if (files.contains (m.uri))
+                    files.remove (m.uri);
+            }
+
+            if (!files.is_empty) {
+                fo.resetProgress (files.size - 1);
+                Timeout.add (100, doProgressNotificationWithTimeout);
+                fo.import_files (files, FileOperator.ImportType.IMPORT);
+            } else {
+                debug ("No new songs to import.\n");
+                finish_file_operations ();
+                App.main_window.show_notification (_("All music files are already in your library"), _("No files were imported."));
+            }
 
             Idle.add ((owned) callback);
         });
@@ -806,4 +818,4 @@
             return false;
         });
     }
-}
+}
\ No newline at end of file