Merge lp:~voluntatefaber/beat-box/multiple_selection into lp:beat-box/1.x

[Andrea Basso]

Multiple directories/playlists/stations can be imported at once. Fixes bug #792759

Multiple directories/playlists/stations can be imported at once.

[Andrea Basso (voluntatefaber)]

To me it's stable, but needs some testing before merging.

[Victor Martinez (victored)]

Hi Andrea, thanks for your work!

This looks fine to me. However, I don't think it's necessary to use a second array (other_names_list), since you could simply iterate through names[]. Could you please change that? :)

[Victor Martinez (victored)]

review: Approve

[Victor Martinez (victored)]

Any idea of why RabbitBot hasn't merged this yet?

=== modified file 'po/sv.po'
--- po/sv.po	2012-02-11 05:46:22 +0000
+++ po/sv.po	2012-02-20 20:24:26 +0000
@@ -14,7 +14,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-11 05:46+0000\n"
+"X-Launchpad-Export-Date: 2012-02-12 05:04+0000\n"
 "X-Generator: Launchpad (build 14771)\n"
 "X-Poedit-Language: Swedish\n"
 

=== modified file 'src/FileOperator.vala'
--- src/FileOperator.vala	2012-02-11 02:33:14 +0000
+++ src/FileOperator.vala	2012-02-20 20:24:26 +0000
@@ -46,6 +46,9 @@
 	LinkedList<Media> new_imports;
 	LinkedList<Media> all_new_imports;
 	LinkedList<string> import_errors;
+	private string[] other_names_list = {};
+	private LinkedList<string>[] other_paths_list;
+	private int other_playlists_added = 0;
 	
 	HashMap<string, string> art_locations = new HashMap<string, string>();
 	
@@ -446,12 +449,18 @@
 	}
 	
 	/* should be called from thread */
-	public void import_from_playlist_file_info(string name, LinkedList<string> paths) {
+	public void import_from_playlist_file_info(string[] names, LinkedList<string>[] paths) {
 		new_playlist = new Playlist();
+		if (names.length > 1) {
+    		other_names_list = names[1:paths.length];
+	    	other_paths_list = paths[1:paths.length];
+		}
 		var internals = new LinkedList<int>();
 		var externals = new LinkedList<string>();
 		
-		foreach(string path in paths) {
+		lm.start_file_operations("Importing <b>" + names[0] + "</b> to Library...");
+		
+		foreach(string path in paths[0]) {
 			Media s;
 			if( (s = lm.media_from_file(path)) != null)
 				internals.add(s.rowid);
@@ -459,7 +468,7 @@
 				externals.add(path);
 		}
 		
-		new_playlist.name = name;
+		new_playlist.name = names[0];
 		foreach(int i in internals)
 			new_playlist.addMedia(i);
 		
@@ -534,6 +543,12 @@
 			lm.music_added(import_type == ImportType.RESCAN ? new LinkedList<string>() : import_errors);
 			lm.finish_file_operations();
 		}
+		if (other_names_list.length > 0) {
+		    import_from_playlist_file_info({other_names_list[other_playlists_added]}, {other_paths_list[other_playlists_added]});
+		    other_playlists_added++;
+		    if (other_playlists_added == other_names_list.length)
+		        other_names_list = {};
+		}
 	}
 	
 	public void* copy_imports_thread() {

=== modified file 'src/LibraryManager.vala'
--- src/LibraryManager.vala	2012-02-17 19:00:36 +0000
+++ src/LibraryManager.vala	2012-02-20 20:24:26 +0000
@@ -148,6 +148,8 @@
 	}
 	
 	private string temp_add_folder;
+	private string[] temp_add_other_folders;
+	private int other_folders_added;
 	private LinkedList<string> temp_add_files;
 	bool _doing_file_operations;
 	bool in_fetch_thread;
@@ -331,6 +333,18 @@
 		catch(GLib.ThreadError err) {
 			warning("Could not create thread to load media pixbuf's: %s \n", err.message);
 		}
+		
+		other_folders_added = 0;
+		file_operations_done.connect ( ()=> {
+		    if (temp_add_other_folders != null) {
+    	        other_folders_added++;
+	            add_folder_to_library (temp_add_other_folders[other_folders_added-1]);
+	            if (other_folders_added == temp_add_other_folders.length) {
+	                other_folders_added = 0;
+	                temp_add_other_folders = null;
+	            }
+            }
+	    });
 	}
 
 	/************ Library/Collection management stuff ************/
@@ -410,7 +424,10 @@
 		return null;
 	}
 	
-	public void add_folder_to_library(string folder) {
+	public void add_folder_to_library(string folder, string[]? other_folders = null) {
+	    if (other_folders != null)
+	        temp_add_other_folders = other_folders;
+	        
 		if(start_file_operations("Adding music from <b>" + folder + "</b> to library...")) {
 			temp_add_folder = folder;
 			
@@ -431,7 +448,7 @@
 		fo.resetProgress(items);
 		Timeout.add(100, doProgressNotificationWithTimeout);
 		fo.import_files(files, FileOperator.ImportType.IMPORT);
-		
+
 		return null;
 	}
     

=== modified file 'src/LibraryWindow.vala'
--- src/LibraryWindow.vala	2012-02-18 07:31:16 +0000
+++ src/LibraryWindow.vala	2012-02-20 20:24:26 +0000
@@ -1021,26 +1021,38 @@
 				return;
 			}*/
 
-			string folder = "";
+			string folders_list = "";
+			string[] folders = {};
+			var _folders = new SList<string> ();
 			var file_chooser = new FileChooserDialog (_("Import Music"), this,
 									  FileChooserAction.SELECT_FOLDER,
 									  Gtk.Stock.CANCEL, ResponseType.CANCEL,
 									  Gtk.Stock.OPEN, ResponseType.ACCEPT);
+			file_chooser.set_select_multiple (true);
 			file_chooser.set_local_only(true);
 
 			if (file_chooser.run () == ResponseType.ACCEPT) {
-				folder = file_chooser.get_filename();
+				_folders = file_chooser.get_filenames();
 			}
 			file_chooser.destroy ();
-
-			if(folder != "" && folder != settings.getMusicFolder()) {
-				if(GLib.File.new_for_path(lm.settings.getMusicFolder()).query_exists()) {
-					topDisplay.set_label_markup(_("<b>Importing</b> music from <b>%s</b> to library.").printf(folder));
-					topDisplay.show_progressbar();
-
-					lm.add_folder_to_library(folder);
-					updateSensitivities();
-				}
+			
+			for (int i=0;i< (int)(_folders.length ());i++) {
+                folders += _folders.nth_data (i);
+            }
+
+            for (int i=0;i<folders.length;i++) {
+			    if(folders[i] == "" || folders[i] != settings.getMusicFolder()) {
+			        folders_list += folders[i];
+			        if (i + 1 != folders.length)
+			            folders_list += ", ";
+			    }
+			}
+			if(GLib.File.new_for_path(lm.settings.getMusicFolder()).query_exists()) {
+				topDisplay.set_label_markup(_("<b>Importing</b> music from <b>%s</b> to library.").printf(folders_list));
+				topDisplay.show_progressbar();
+
+				lm.add_folder_to_library(folders[0], folders[1:folders.length]);
+				updateSensitivities();
 			}
 		}
 		else {

=== modified file 'src/Widgets/SideTreeView.vala'
--- src/Widgets/SideTreeView.vala	2012-02-17 01:24:32 +0000
+++ src/Widgets/SideTreeView.vala	2012-02-20 20:24:26 +0000
@@ -112,9 +112,9 @@
 		CDMenu.show_all();
 		
 		radioMenu = new Gtk.Menu();
-		radioImportStations = new Gtk.MenuItem.with_label(_("Import Station"));
+		radioImportStations = new Gtk.MenuItem.with_label(_("Import Stations"));
 		radioMenu.append(radioImportStations);
-		radioImportStations.activate.connect(playlistImportClicked);
+		radioImportStations.activate.connect(()=> {playlistImportClicked ("Station");});
 		radioMenu.show_all();
 		
 		//playlist right click menu
@@ -125,7 +125,7 @@
 		playlistRemove = new Gtk.MenuItem.with_label(_("Remove"));
 		playlistSave = new Gtk.MenuItem.with_label(_("Save as Playlist"));
 		playlistExport = new Gtk.MenuItem.with_label(_("Export..."));
-		playlistImport = new Gtk.MenuItem.with_label(_("Import Playlist"));
+		playlistImport = new Gtk.MenuItem.with_label(_("Import Playlists"));
 		playlistMenu.append(playlistNew);
 		playlistMenu.append(smartPlaylistNew);
 		playlistMenu.append(playlistEdit);
@@ -139,7 +139,7 @@
 		playlistRemove.activate.connect(playlistMenuRemoveClicked);
 		playlistSave.activate.connect(playlistSaveClicked);
 		playlistExport.activate.connect(playlistExportClicked);
-		playlistImport.activate.connect(playlistImportClicked);
+		playlistImport.activate.connect(()=>{playlistImportClicked ();});
 		playlistMenu.show_all();
 		
 		this.button_press_event.connect(sideListClick);
@@ -945,16 +945,24 @@
 		p.name = original_name;
 	}
 	
-	void playlistImportClicked() {
+	void playlistImportClicked(string title = "Playlist") {
+        var files = new SList<string> ();
+		string[] names = {};	
+		var path = new LinkedList<string> ();
+		var stations = new LinkedList<Media> ();
+		LinkedList<string>[] paths = {};
+		LinkedList<string>[] filtered_paths = {};
+		bool success = false;
+		int i = 0;
+		
 		if(lm.doing_file_operations())
 			return;
-		
-		string file = "";
-		string name = "";
-		var file_chooser = new FileChooserDialog ("Import Playlist", lw,
+
+		var file_chooser = new FileChooserDialog ("Import " + title, lw,
 								  FileChooserAction.OPEN,
 								  Gtk.Stock.CANCEL, ResponseType.CANCEL,
 								  Gtk.Stock.OPEN, ResponseType.ACCEPT);
+		file_chooser.set_select_multiple (true);
 		
 		// filters for .m3u and .pls
 		var m3u_filter = new FileFilter();
@@ -968,45 +976,49 @@
 		file_chooser.add_filter(pls_filter);
 		
 		if (file_chooser.run () == ResponseType.ACCEPT) {
-			file = file_chooser.get_filename();
-			name = file.slice(file.last_index_of("/", 0) + 1, file.last_index_of(".", 0));
+			files = file_chooser.get_filenames();
+			files.foreach ( (file)=> {
+			    names += file.slice(file.last_index_of("/", 0) + 1, file.last_index_of(".", 0));
+			});
 		}
 		
 		file_chooser.destroy ();
 		
-		var paths = new LinkedList<string>();
-		var stations = new LinkedList<Media>();
-		bool success = false;
+		files.foreach ( (file)=> {
+	    	if(file != "") {
+	    	    path = new LinkedList<string> ();
+		    	if(file.has_suffix(".m3u")) {
+		    		success = Playlist.parse_paths_from_m3u(lm, file, ref path, ref stations);
+		    		paths += path;
+		    	}
+		    	else if(file.has_suffix(".pls")) {
+		    		success = Playlist.parse_paths_from_pls(lm, file, ref path, ref stations);
+		    		paths += path;
+		    	}
+		    	else {
+		    		success = false;
+		    		lw.doAlert("Invalid Playlist", "Unrecognized playlist file. Import failed.");
+		    		return;
+		    	}
+		    }
+		    i++;
+		});
 		
-		if(file != "") {
-			if(file.has_suffix(".m3u")) {
-				success = Playlist.parse_paths_from_m3u(lm, file, ref paths, ref stations);
-			}
-			else if(file.has_suffix(".pls")) {
-				success = Playlist.parse_paths_from_pls(lm, file, ref paths, ref stations);
-			}
-			else {
-				success = false;
-				lw.doAlert("Invalid Playlist", "Unrecognized playlist file. Import failed.");
-				return;
-			}
-		}
+		foreach (LinkedList l in paths)
+		    if (l.size > 0)
+		        filtered_paths += l;
 		
 		if(success) {
-			if(paths.size > 0) {
-				stdout.printf("paths size is %d\n", paths.size);
-				lm.start_file_operations("Importing <b>" + name + "</b> to Library...");
-				lm.fo.import_from_playlist_file_info(name, paths);
-				lw.updateSensitivities();
-			}
-			if(stations.size > 0) {
-				stdout.printf("stations size is %d\n", stations.size);
-				lm.add_medias(stations, true);
-				
-				//Widget w = getWidget(network_radio_iter);
-				//((ViewWrapper)w).doUpdate(((ViewWrapper)w).currentView, lm.station_ids(), true, true, false);
-			}
-		}
+	        if(filtered_paths.length > 0) {
+	            print ("I was called");
+			   	lm.fo.import_from_playlist_file_info(names, filtered_paths);
+		    	lw.updateSensitivities();
+		    }
+		    if(stations.size > 0) {
+		        stdout.printf("stations size is %d\n", stations.size);
+			    lm.add_medias(stations, true);
+			}
+    	}
 	}
 	
 	public virtual void dragReceived(Gdk.DragContext context, int x, int y, Gtk.SelectionData data, uint info, uint timestamp) {