Let's try this again

Author: undees

Classes/JustPlayedAppDelegate.m

@@ -8,6 +8,7 @@
 
 #import "JustPlayedAppDelegate.h"
 #import "JustPlayedViewController.h"
+#import "Snap.h"
 
 #ifdef BROMINET_ENABLED
 	#import "ScriptRunner.h"
@@ -78,17 +79,46 @@ - (NSString*)getTestData:(NSDictionary*)data {
 }
 
 
+- (NSDate*)dateFromClockTime:(NSString*)clockTime;
+{
+	NSDate* date = [NSDate date];
+	NSCalendar* calendar = [NSCalendar currentCalendar];
+	NSInteger dateUnits =
+	NSYearCalendarUnit |
+	NSMonthCalendarUnit |
+	NSDayCalendarUnit;
+	NSDateComponents* dateParts = [calendar components:dateUnits fromDate:date];
+	
+	NSDateFormatter* format = [[[NSDateFormatter alloc] init] autorelease];
+	[format setDateFormat:@"HH:mm"];
+	NSDate* time = [format dateFromString:clockTime];
+	
+	NSInteger timeUnits =
+	NSHourCalendarUnit |
+	NSMinuteCalendarUnit;
+	NSDateComponents* timeParts = [calendar components:timeUnits fromDate:time];
+	
+	NSInteger hour = [timeParts hour];
+	NSInteger minute = [timeParts minute];
+	
+	[dateParts setHour:hour];
+	[dateParts setMinute:minute];
+	
+	return [calendar dateFromComponents:dateParts];
+}
+
+
 - (NSString*)setTestData:(NSDictionary*)data {
 	NSArray* stations = [data objectForKey:@"stations"];
 	if (stations)
 	{
 		viewController.stations = stations;
 	}
 
-	NSArray* snaps = [data objectForKey:@"snaps"];
-	if (snaps)
+	NSArray* plists = [data objectForKey:@"snaps"];
+	if (plists)
 	{
-		[viewController setSnaps:snaps];
+		[viewController setSnaps:[Snap snapsFromPropertyLists:plists]];
 	}
 
 	NSString* lookupServer = [data objectForKey:@"lookupServer"];
@@ -100,31 +130,7 @@ - (NSString*)setTestData:(NSDictionary*)data {
 	NSString* testTime = [data objectForKey:@"testTime"];
 	if (testTime)
 	{
-		NSDate* date = [NSDate date];
-		NSCalendar* calendar = [NSCalendar currentCalendar];
-		NSInteger dateUnits =
-			NSYearCalendarUnit |
-			NSMonthCalendarUnit |
-			NSDayCalendarUnit;
-		NSDateComponents* dateParts = [calendar components:dateUnits fromDate:date];
-
-		NSDateFormatter* format = [[[NSDateFormatter alloc] init] autorelease];
-		[format setDateFormat:@"HH:mm"];
-		NSDate* time = [format dateFromString:testTime];
-
-		NSInteger timeUnits =
-			NSHourCalendarUnit |
-			NSMinuteCalendarUnit;
-		NSDateComponents* timeParts = [calendar components:timeUnits fromDate:time];
-
-		NSInteger hour = [timeParts hour];
-		NSInteger minute = [timeParts minute];
-
-		[dateParts setHour:hour];
-		[dateParts setMinute:minute];
-		NSDate* dateTime = [calendar dateFromComponents:dateParts];
-
-		viewController.testTime = dateTime;
+		viewController.testTime = [self dateFromClockTime:testTime];
 	}
 
 	[viewController refreshView];

Classes/JustPlayedViewController.h

@@ -8,7 +8,6 @@
 
 #import <UIKit/UIKit.h>
 
-@class SnapsController;
 @class ASINetworkQueue;
 
 @interface JustPlayedViewController :
@@ -18,7 +17,8 @@
 		 UIActionSheetDelegate>
 {
 	NSArray* stations;
-	SnapsController* snapsController;
+	NSMutableArray* snaps;
+
 	IBOutlet UITableView* snapsTable;
 	IBOutlet UIToolbar* toolbar;
 	IBOutlet UIProgressView* progressBar;
@@ -28,7 +28,7 @@
 }
 
 - (void)setStations:(NSArray*)newStations;
-- (void)setSnaps:(NSArray*)snaps;
+- (void)setSnaps:(NSArray*)newSnaps;
 
 - (void)setToFactoryDefaults;
 - (void)loadUserData;
@@ -40,7 +40,7 @@
 - (IBAction)deleteButtonPressed:(id)sender;
 
 @property (nonatomic, retain) NSArray* stations;
-@property (nonatomic, retain) SnapsController* snapsController;
+@property (nonatomic, copy) NSArray* snaps;
 
 @property (nonatomic, retain) UITableView* snapsTable;
 @property (nonatomic, retain) UIToolbar* toolbar;