Merge lp:~victored/beat-box/lp-914063 into lp:beat-box/1.x

[Victor Martinez]

Reflect actual free space on device piece bar (lp:914063)

Reflect actual free space on device piece bar (lp:914063)

[Danielle Foré (danrabbit)]

Hey Victor, this appears to be working, but for some reason the numbers are reported a little differently in iOS. My iPhone claims that I have "7.5 GB Free of 13.7 GB" but Beatbox claims I have 8.3 GB Free of 14.8 GB"

I'm not sure if maybe iOS reserves 1 GB for downloads or something but I thought I'd mention it. Otherwise it appears to be working :)

[Victor Martinez (victored)]

That sounds like a logical explanation since we're about 1.1 GB (blame iOS's approximations here) above what iOS shows. You've found another by the way: our approximations are wrong too. With the current code, 8.39 GB would be displayed at 8.3 GB. We could either improve the approximations or show a second digit.

review: Needs Fixing

[Victor Martinez (victored)]

I wonder if BeatBox would actually use that reserved gigabyte while syncing the libraries.

[Danielle Foré (danrabbit)]

IF that's what it actually is, we might have to respect that just in case having a full disk causes problems/prevents updates/etc.

I would probably vote for making BeatBox's approximations a little smarter, but I'm sure that would be more work than just showing the extra digit xD

[Victor Martinez (victored)]

review: Needs Resubmitting

[Victor Martinez (victored)]

review: Disapprove

Unmerged revisions

594. By Victor Martinez on 2012-03-20

Reflect actual free space on device piece bar (lp:914063)

=== modified file 'src/Views/DeviceSummaryWidget.vala'
--- src/Views/DeviceSummaryWidget.vala	2012-03-18 23:26:20 +0000
+++ src/Views/DeviceSummaryWidget.vala	2012-03-23 03:07:19 +0000
@@ -45,6 +45,7 @@
 	
 	int music_index;
 	int podcast_index;
+	int files_index;
 	//int audiobook_index;
 	
 	public DeviceSummaryWidget(LibraryManager lm, LibraryWindow lw, Device d) {
@@ -82,7 +83,8 @@
 
 		music_index = spaceWidget.add_item(_("Music"), 0.0, SpaceWidget.ItemColor.BLUE);
 		podcast_index = spaceWidget.add_item(_("Podcasts"), 0.0, SpaceWidget.ItemColor.PURPLE);
-		//audiobook_index = spaceWidget.add_item("Audiobooks", 0.0, SpaceWidget.ItemColor.GREEN);
+		files_index = spaceWidget.add_item(_("Other Files"), 0.0, SpaceWidget.ItemColor.GREEN);
+		//audiobook_index = spaceWidget.add_item("Audiobooks", 0.0, SpaceWidget.ItemColor.RED);
 		
 		refreshSpaceWidget();
 		
@@ -111,31 +113,22 @@
 		
 		var syncOptionsBox = new VBox(false, 0);
 		syncOptionsBox.pack_start(musicBox, false, false, 0);
-		if(dev.supports_podcasts()) 	syncOptionsBox.pack_start(podcastBox, false, false, 0);
-		//if(dev.supports_audiobooks()) 	syncOptionsBox.pack_start(audiobookBox, false, false, 0);
+
+		if(dev.supports_podcasts())
+			syncOptionsBox.pack_start(podcastBox, false, false, 0);
+		//if(dev.supports_audiobooks()) 
+		//	syncOptionsBox.pack_start(audiobookBox, false, false, 0);
 		
 		var syncHBox = new HBox(true, 6);
 		syncHBox.pack_start(syncOptionsLabel, false, true, 0);
 		syncHBox.pack_start(syncOptionsBox, false, true, 0);
-		
-		// create bottom section
-		//var syncBox = new VBox(false, 0);
-		//var syncButtonBox = new VButtonBox();
-		//syncButtonBox.set_layout(ButtonBoxStyle.END);
-		//syncButtonBox.pack_end(syncButton, false, false, 0);
-		//syncBox.pack_end(syncButton, false, false, 0);
-		
-		//var bottomBox = new HBox(false, 0);
-		//bottomBox.pack_start(deviceImage, false, true, 0);
-		//bottomBox.pack_start(spaceWidgetScroll, true, true, 0);
-		//bottomBox.pack_start(syncButtonBox, false, false, 0);
-		
+
 		// put it all together
 		content.pack_start(deviceNameBox, false, true, 0);
 		content.pack_start(autoSyncBox, false, true, 0);
 		content.pack_start(syncHBox, false, true, 0);
 		
-		/* put it in event box so we can color background white */
+		// put it in event box so we can add custom theming
 		EventBox eb = new EventBox();
 		
 		// add content-view styling
@@ -222,10 +215,10 @@
 	}
 	
 	void refreshSpaceWidget() {
-		double media_size = 0.0; double podcast_size = 0.0; /*double audiobook_size = 0.0;*/
+		double music_size = 0.0, podcast_size = 0.0, other_files_size = 0.0; /*double audiobook_size = 0.0;*/
 		
 		foreach(int i in dev.get_songs()) {
-			media_size += (double)(lm.media_from_id(i).file_size);
+			music_size += (double)(lm.media_from_id(i).file_size);
 		}
 		foreach(int i in dev.get_podcasts()) {
 			podcast_size += (double)(lm.media_from_id(i).file_size);
@@ -234,8 +227,12 @@
 		//	audiobook_size += (double)(lm.media_from_id(i).file_size);
 		//}
 		
-		spaceWidget.update_item_size(music_index, media_size);
+		// Get other used space
+		other_files_size = (double)dev.get_used_space()/1000000 - music_size - podcast_size;
+		
+		spaceWidget.update_item_size(music_index, music_size);
 		spaceWidget.update_item_size(podcast_index, podcast_size);
+		spaceWidget.update_item_size(files_index, other_files_size);
 		//spaceWidget.update_item_size(audiobook_index, audiobook_size);
 	}