(WIP) V3

Play Client/PLAController.h

@@ -7,39 +7,31 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "PTPusher.h"
 
 extern NSString *const PLANowPlayingUpdated;
 
 @class PLATrack;
 
-@interface PLAController : NSObject <PTPusherDelegate>{
+@interface PLAController : NSObject{
   NSArray *queuedTracks;
   PLATrack *currentlyPlayingTrack;
-  PTPusher *pusherClient;
-  NSString *pusherKey;
-  NSString *streamUrl;
-  PTPusherEventBinding *updateNowPlayingPusherChannelBinding;
+  NSTimer *queuePoller;
 }
 
 @property (nonatomic, retain) NSArray *queuedTracks;
 @property (nonatomic, retain) PLATrack *currentlyPlayingTrack;
-@property (nonatomic, retain) PTPusher *pusherClient;
-@property (nonatomic, retain) PTPusherEventBinding *updateNowPlayingPusherChannelBinding;
-@property (nonatomic, retain) NSString *streamUrl;
-@property (nonatomic, retain) NSString *pusherKey;
+@property (nonatomic, retain) NSTimer *queuePoller;
 
 + (PLAController *)sharedController;
 
 - (void)logInWithBlock:(void(^)(BOOL succeeded))block;
-- (PTPusherChannel *)nowPlayingPusherChannel;
-- (void)setUpPusher;
-- (void)subscribeToChannels;
 - (void)setPlayUrl:(NSString *)url;
 - (NSString *)playUrl;
+- (NSString *)streamUrl;
 - (void)setAuthToken:(NSString *)token;
 - (NSString *)authToken;
-- (void)updateNowPlaying:(NSDictionary *)nowPlayingDict;
-- (void)channelEventPushed:(PTPusherEvent *)channelEvent;
+- (void)updateNowPlaying;
+- (void)startPolling;
+- (void)stopPolling;
 
 @end

Play Client/PLAController.m

@@ -10,7 +10,6 @@
 
 #import "PLAPlayClient.h"
 #import "PLATrack.h"
-#import "PTPusherChannel.h"
 
 #if TARGET_OS_EMBEDDED
 #import "Reachability.h"
@@ -20,15 +19,13 @@
 
 @implementation PLAController
 
-@synthesize queuedTracks, currentlyPlayingTrack, pusherClient, updateNowPlayingPusherChannelBinding, streamUrl, pusherKey;
+@synthesize queuedTracks, currentlyPlayingTrack, queuePoller;
 
 - (void) dealloc{
   [queuedTracks release];
   [currentlyPlayingTrack release];
-  [pusherClient release];
-  [updateNowPlayingPusherChannelBinding release];
-  [streamUrl release];
-  [pusherKey release];
+  [queuePoller invalidate];
+  [queuePoller release];
 
   [super dealloc];
 }
@@ -53,12 +50,7 @@ - (id)init {
 }
 
 - (void)logInWithBlock:(void(^)(BOOL succeeded))block{
-  [[PLAPlayClient sharedClient] getPath:@"/streaming_info" parameters:nil success:^(AFHTTPRequestOperation *operation, id responseObject) {
-    self.streamUrl = [responseObject objectForKey:@"stream_url"];
-    self.pusherKey = [responseObject objectForKey:@"pusher_key"];
-
-		[self setUpPusher];
-    [self subscribeToChannels];
+  [[PLAPlayClient sharedClient] getPath:@"/api/now_playing" parameters:nil success:^(AFHTTPRequestOperation *operation, id responseObject) {
 
 	if (block != nil)
 	  block(YES);
@@ -70,42 +62,8 @@ - (void)logInWithBlock:(void(^)(BOOL succeeded))block{
 
 }
 
-#pragma mark - Pusher Bootstrap
-
-- (PTPusherChannel *)nowPlayingPusherChannel{
-  if (pusherClient) {
-    return [pusherClient subscribeToChannelNamed:@"now_playing_updates"];
-  }
-
-  return nil;
-}
-
-- (void)setUpPusher{
-  if (pusherClient) {
-    NSLog(@"destroying pusherClient to be ready to create a new one");
-    PTPusherChannel *channel = [self nowPlayingPusherChannel];
-    [channel removeBinding:updateNowPlayingPusherChannelBinding];
-    self.updateNowPlayingPusherChannelBinding = nil;
-
-    [self.pusherClient setDelegate:nil];
-    [self.pusherClient unsubscribeFromChannel:channel];
-    [self.pusherClient setReconnectAutomatically:NO];
-    [self.pusherClient disconnect];
-	  [self.pusherClient retain]; //intentional leak. For some when these object die they occasionally wreak havoc with a hard-as-shit crash.
-	  self.pusherClient = nil;
-  }
-
-  self.pusherClient = [PTPusher pusherWithKey:pusherKey delegate:self encrypted:NO];
-  [pusherClient setReconnectAutomatically:YES];
-  [pusherClient setReconnectDelay:30];  
-}
-
-- (void)subscribeToChannels{
-  if (pusherClient) {
-    NSLog(@"subscribing to channels");
-    PTPusherChannel *channel = [self nowPlayingPusherChannel];
-    self.updateNowPlayingPusherChannelBinding = [channel bindToEventNamed:@"update_now_playing" target:self action:@selector(channelEventPushed:)];
-  }
+- (NSString *)streamUrl{
+  return [NSString stringWithFormat:@"%@/api/stream?token=%@", [[PLAController sharedController] playUrl], [self authToken]];
 }
 
 #pragma mark - Settings
@@ -128,90 +86,39 @@ - (NSString *)authToken{
   return [[NSUserDefaults standardUserDefaults] objectForKey:@"authToken"];
 }
 
-#pragma mark - State methods
-
-- (void)updateNowPlaying:(NSDictionary *)nowPlayingDict{
-  // record current state
-  self.currentlyPlayingTrack = [[[PLATrack alloc] initWithAttributes:[nowPlayingDict objectForKey:@"now_playing"]] autorelease];
-
-  NSMutableArray *tracks = [NSMutableArray array];
-  for (NSDictionary *trackDict in [nowPlayingDict objectForKey:@"songs"]) {
-    PLATrack *track = [[PLATrack alloc] initWithAttributes:trackDict];
-    [tracks addObject:track];
-    [track release];
-  }
-
-  self.queuedTracks = [NSArray arrayWithArray:tracks];
+- (void)startPolling{
+  [queuePoller invalidate];
+  self.queuePoller = nil;
 
-  [[NSNotificationCenter defaultCenter] postNotificationName:PLANowPlayingUpdated object:nil];
-}
-
-#pragma mark - Channel Event handler
-
-- (void)channelEventPushed:(PTPusherEvent *)channelEvent{
-  if ([[channelEvent name] isEqualToString:@"update_now_playing"]) {
-    [self updateNowPlaying:(NSDictionary *)[channelEvent data]];
-  }
-}
-
-#pragma mark - PTPusher Delegate Methods
-
-- (void)pusher:(PTPusher *)client connectionDidConnect:(PTPusherConnection *)connection{
-  NSLog(@"connectionDidConnect");
-  client.reconnectAutomatically = YES;
+  self.queuePoller = [NSTimer scheduledTimerWithTimeInterval:60 target:self selector:@selector(updateNowPlaying) userInfo:nil repeats:YES];
+  [queuePoller fire];
 }
 
-- (void)pusher:(PTPusher *)pusher didSubscribeToChannel:(PTPusherChannel *)channel {
-  NSLog(@"did subscribe to channel: %@", [channel name]);
+- (void)stopPolling{
+  [queuePoller invalidate];
+  self.queuePoller = nil;
+  [queuePoller release];
 }
 
-- (void)pusher:(PTPusher *)pusher didFailToSubscribeToChannel:(PTPusherChannel *)channel withError:(NSError *)error{
-  NSLog(@"failed to subscribe: %@", error.description);
-}
-
-- (void)pusher:(PTPusher *)pusher didReceiveErrorEvent:(PTPusherErrorEvent *)errorEvent{
-  NSLog(@"received error event: %@", errorEvent);
-}
+#pragma mark - State methods
 
-- (void)pusher:(PTPusher *)client connectionDidDisconnect:(PTPusherConnection *)connection{
-  NSLog(@"connectionDidDisconnect");
+- (void)updateNowPlaying{
+  NSLog(@"Updating Now Playing");
 
-#if TARGET_OS_EMBEDDED
-  Reachability *reachability = [Reachability reachabilityForInternetConnection];
-
-  if ([reachability currentReachabilityStatus] == NotReachable) {
-    NSLog(@"NotReachable");
-    client.reconnectAutomatically = NO;
+  [PLATrack currentQueueWithBlock:^(NSArray *tracks, NSError *err) {
+    NSMutableArray *foundTracks = [NSMutableArray arrayWithArray:tracks];
 
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(reachabilityChanged:) name:kReachabilityChangedNotification object:reachability];
+    if ([foundTracks count] > 0) {
+      self.currentlyPlayingTrack = [foundTracks objectAtIndex:0];
+      [foundTracks removeObjectAtIndex:0];
+    }
+
+    self.queuedTracks = [NSArray arrayWithArray:foundTracks];
 
-    [reachability startNotifier];
-  }else{
-    [PLATrack currentTrackWithBlock:^(PLATrack *track, NSError *error) {
-      dispatch_async(dispatch_get_main_queue(), ^(void) {
-        self.currentlyPlayingTrack = track;
-        [[NSNotificationCenter defaultCenter] postNotificationName:PLANowPlayingUpdated object:nil];
-        [self setUpPusher];
-        [self subscribeToChannels];
-      });
-    }];
-  }
-
-#else
-  [PLATrack currentTrackWithBlock:^(PLATrack *track, NSError *err) {
     dispatch_async(dispatch_get_main_queue(), ^(void) {
-      self.currentlyPlayingTrack = track;
       [[NSNotificationCenter defaultCenter] postNotificationName:PLANowPlayingUpdated object:nil];
-      [self setUpPusher];
-      [self subscribeToChannels];
     });
-  }];
-
-	[PLATrack currentQueueWithBlock:^(NSArray *tracks, NSError *err) {
-		if (tracks != nil)
-			self.queuedTracks = tracks;
-	}];
-#endif
+  }];  
 }
 
 #if TARGET_OS_EMBEDDED
@@ -226,8 +133,6 @@ - (void)reachabilityChanged:(NSNotification *)note{
     [PLATrack currentTrackWithBlock:^(PLATrack *track, NSError *error) {
       self.currentlyPlayingTrack = track;
       [[NSNotificationCenter defaultCenter] postNotificationName:PLANowPlayingUpdated object:nil];
-      [self setUpPusher];
-      [self subscribeToChannels];
     }];
 
   }

Play Client/PLATrack.h

@@ -9,19 +9,25 @@
 #import <Foundation/Foundation.h>
 
 @interface PLATrack : NSObject <NSCopying> {
-  NSString *trackId;
+  NSString *slug;
   NSString *name;
   NSString *album;
+  NSString *albumSlug;
   NSString *artist;
-  BOOL starred;
+  NSString *artistSlug;
+  NSString *albumArtPath;
+  BOOL liked;
   BOOL queued;
 }
 
-@property (nonatomic, retain) NSString *trackId;
+@property (nonatomic, retain) NSString *slug;
 @property (nonatomic, retain) NSString *name;
 @property (nonatomic, retain) NSString *album;
+@property (nonatomic, retain) NSString *albumSlug;
 @property (nonatomic, retain) NSString *artist;
-@property (nonatomic, assign) BOOL starred;
+@property (nonatomic, retain) NSString *artistSlug;
+@property (nonatomic, retain) NSString *albumArtPath;
+@property (nonatomic, assign) BOOL liked;
 @property (nonatomic, assign) BOOL queued;
 @property (nonatomic, readonly) NSURL *albumArtURL;
 @property (nonatomic, readonly) NSURL *downloadURL;