more relevant status text while downloading reviews

epatel · Nov 24, 2009 · b1e8ed7 · b1e8ed7
1 parent 7792f1e
commit b1e8ed7
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 7 deletions.
diff --git a/Classes/AppCell.m b/Classes/AppCell.m
@@ -91,7 +91,11 @@ - (void)drawRect:(CGRect)rect
 
 	[((cell.highlighted) ? [UIColor whiteColor] : [UIColor darkGrayColor]) set];
 	int numberOfReviews = [app.reviewsByUser count];
-	NSString *numberOfReviewsDescription = [NSString stringWithFormat:NSLocalizedString(@"%i Reviews (%i new)",nil), numberOfReviews, app.newReviewsCount];
+	NSString *numberOfReviewsDescription = [NSString stringWithFormat:NSLocalizedString(@"%i Reviews",nil), numberOfReviews];
+	if (app.newReviewsCount) {
+		numberOfReviewsDescription = [numberOfReviewsDescription stringByAppendingFormat:
+									  NSLocalizedString(@" (%i new)",nil), app.newReviewsCount];
+	}
 	[numberOfReviewsDescription drawInRect:CGRectMake(50, 25, 140, 15) withFont:[UIFont systemFontOfSize:12.0]];
 }	
 

diff --git a/Classes/ReportManager.m b/Classes/ReportManager.m
@@ -527,7 +527,6 @@ - (void)downloadReviews
 	[UIApplication sharedApplication].idleTimerDisabled = YES;
 
 	isDownloadingReviews = YES;
-	[self updateReviewDownloadProgress:NSLocalizedString(@"Downloading reviews...",nil)];
 
 	NSMutableDictionary *appIDs = [NSMutableDictionary dictionary];
 	for (NSString *appID in [self.appsByID allKeys]) {

diff --git a/Classes/ReviewUpdater.h b/Classes/ReviewUpdater.h
@@ -4,8 +4,9 @@
 
 @interface ReviewUpdater : NSObject {
 	NSDictionary *appsByID;
+	NSUInteger numberOfStores; // for presentation
 
-	id callback; // FIXME.  Ugly hack, used to update the GUI status
+	id callback; // FIXME  Ugly hack, used to update the GUI status
 
 	// used by worker threads
 	NSCondition *condition;

diff --git a/Classes/ReviewUpdater.m b/Classes/ReviewUpdater.m
@@ -54,13 +54,19 @@ - (void) dealloc {
 
 - (NSDictionary*) getNextStoreToFetch {
 	NSDictionary *storeInfo;
+	NSString *status = nil;
 	@synchronized (storeInfos) {
 		storeInfo = [storeInfos lastObject];
 		if (storeInfo) {
+			const NSUInteger percentComplete = 100 * (1 - (storeInfos.count / (float)numberOfStores));
+			status = [NSString stringWithFormat:@"%2d complete", percentComplete];
 			[storeInfos removeLastObject];
 		}
 	}
-	return storeInfo; // gcc is retarded and warns if returning inside synchronized block
+	if (status) {
+		[callback performSelectorOnMainThread:@selector(updateReviewDownloadProgress:) withObject:status waitUntilDone:NO]; // FIXME
+	}
+	return storeInfo;
 }
 
 - (void) workerDone {
@@ -101,10 +107,7 @@ - (void) workerThreadFetch { // called by worker threads
 
 	while ((storeInfo = [self getNextStoreToFetch]) != nil) {
 		NSAutoreleasePool *innerPool = [NSAutoreleasePool new];
-		NSString *countryName = [storeInfo objectForKey:@"countryName"];
 		NSString *countryCode = [storeInfo objectForKey:@"countryCode"];
-		NSString *status = [NSString stringWithFormat:@"%@", countryName];
-		[callback performSelectorOnMainThread:@selector(updateReviewDownloadProgress:) withObject:status waitUntilDone:NO]; // FIXME
 
 		for (NSString *appID in [appsByID keyEnumerator]) {
 			//NSLog(@"Downloading reviews for app %@ in %@", [appIDs objectForKey:appID], countryName);
@@ -536,16 +539,20 @@ - (void) updateReviews {
 						   @"143462", @"storeFrontID", 
 						   nil]];
 
+	numberOfStores = storeInfos.count;
+
 	condition = [[NSCondition alloc] init];
 	numThreadsActive = NUMBER_OF_FETCHING_THREADS;
 
 	for (int i=0; i < NUMBER_OF_FETCHING_THREADS; i++) {
 		[self performSelectorInBackground:@selector(workerThreadFetch) withObject:nil];
 	}
 
+	NSDate *start = [NSDate date];
 	[condition lock];
 	[condition wait]; // wait for workers to finish
 	[condition unlock];
+	NSLog(@"update took %f sec", -1*[start timeIntervalSinceNow]);
 
 	[condition release];
 	condition = nil;