@@ -93,6 +93,7 @@ -(void)detachNowPlayingThread; -(void)playScrobblingSound; -(void)xmlFileChanged:(NSNotification *)notification; +-(void)amdsSyncCompleted:(NSNotification *)notification; #pragma mark Secondary Last.fm Methods -(void)queueApiCall:(BGLastFmWebServiceParameterList *)theCall popQueueToo:(BOOL)shouldPopQueue; AppController.h @@ -129,6 +129,7 @@ nil] ]; NSNotificationCenter *defaultNotificationCenter = [NSNotificationCenter defaultCenter]; [defaultNotificationCenter addObserver:self selector:@selector(podWatcherMountedPod:) name:BGNotificationPodMounted object:nil]; [defaultNotificationCenter addObserver:self selector:@selector(xmlFileChanged:) name:XMLChangedNotification object:nil]; + [defaultNotificationCenter addObserver:self selector:@selector(amdsSyncCompleted:) name:AMDSSyncComplete object:nil]; authManager = [[BGLastFmAuthenticationManager alloc] initWithDelegate:self]; @@ -299,6 +300,11 @@ nil] ]; [[BGScrobbleDecisionManager sharedManager] refreshDecisionAndNotifyIfChanged:YES]; } +-(void)amdsSyncCompleted:(NSNotification *)notification { + NSLog(@"Mobile Device finished syncing... going to try to scrobble"); + [self detachScrobbleThreadWithoutConsideration:NO]; +} + -(void)xmlFileChanged:(NSNotification *)notification { NSLog(@"OMG! XML change!"); [self detachScrobbleThreadWithoutConsideration:NO]; AppController.m @@ -67,7 +67,7 @@ [postString appendString:[NSString stringWithFormat:@"&m[%d]=",efficientPostIndex]]; //musicbrainz efficientPostIndex++; - + } NSData *postData = [postString dataUsingEncoding:NSUTF8StringEncoding allowLossyConversion:YES]; BGLastFmScrobbler.m @@ -67,9 +67,7 @@ } if (!nameString) nameString = trackTitle; } - NSLog(@"10"); if (!nameString) nameString = @""; - NSLog(@"11"); // artist, using album artist where possible NSString *artistString = nil; BGTrackCollector.m @@ -59,6 +59,7 @@ #define BGLastSyncDate @"iPodLastSynchronized" #define BGActivityHistoryArray "ActivityHistory" #define BGTracksScrobbledTotal @"TracksScrobbled" + #define AMDSSyncComplete @"AMDSSyncComplete" #define ServiceWorker_LoveCommand @"track.love" #define ServiceWorker_BanCommand @"track.ban" Defines.h @@ -17,7 +17,7 @@ <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleShortVersionString</key> - <string>0.52</string> + <string>0.52.1</string> <key>CFBundleSignature</key> <string>????</string> <key>CFBundleURLTypes</key> @@ -32,7 +32,7 @@ </dict> </array> <key>CFBundleVersion</key> - <string>0.52</string> + <string>0.52.1</string> <key>LSMinimumSystemVersion</key> <string>10.5</string> <key>NSMainNibFile</key> Info.plist @@ -25,6 +25,7 @@ -(void)applyForMobileDeviceNotifications; -(void)amdsDidConnect:(NSNotification*)note; +-(void)amdsDidSync:(NSNotification*)note; -(void)amdsDidFail:(NSNotification*)note; -(void)applyForiPodNotifications; iPodWatcher.h @@ -73,7 +73,13 @@ static iPodWatcher *sharedPodWatcher = nil; -(void)amdsDidConnect:(NSNotification*)note { NSLog(@"Mobile Device Connected: %@", [[note userInfo] objectForKey:@"product"]); + // [self updateLastSyncDateWithNotification:YES]; +} + +-(void)amdsDidSync:(NSNotification*)note { + NSLog(@"Mobile Device Sync Finished"); [self updateLastSyncDateWithNotification:YES]; + [[NSNotificationCenter defaultCenter] postNotificationName:AMDSSyncComplete object:nil]; } -(void)amdsDidFail:(NSNotification*)note { @@ -87,7 +93,8 @@ static iPodWatcher *sharedPodWatcher = nil; NSLog(@"iPhone Detection Initialization error occured"); } else { NSLog(@"iPhone/iPod Touch Detection Enabled"); - [[NSDistributedNotificationCenter defaultCenter] addObserver:self selector:@selector(amdsDidConnect:) name:@"org.bergstrand.amds.connect" object:nil]; + [[NSDistributedNotificationCenter defaultCenter] addObserver:self selector:@selector(amdsDidConnect:) name:@"org.bergstrand.amds.connect" object:nil]; + [[NSDistributedNotificationCenter defaultCenter] addObserver:self selector:@selector(amdsDidSync:) name:@"org.bergstrand.amds.syncDidFinish" object:nil]; [[NSDistributedNotificationCenter defaultCenter] addObserver:self selector:@selector(amdsDidFail:) name:@"org.bergstrand.amds.intializeDidFail" object:nil]; } } iPodWatcher.m @@ -122,6 +122,7 @@ static iTunesWatcher *sharedTunesManager = nil; self.iTunesIsPlaying = YES; NSString *newIdentifier = [[newSongDetails objectForKey:@"PersistentID"] stringValue]; + NSLog(@"Got new song Persistent ID: %@",newIdentifier); if ( [self songIsNew:newIdentifier] ) { iTunesWatcher.m a8762960074eec273378bd7061f481bbfe825a90 Ben Gummer bengummer@gmail.com http://github.com/scrobblepod/scrobblepod/commit/37014c6712a233711b5d4c0640d959a657343a45 37014c6712a233711b5d4c0640d959a657343a45 2009-03-26T18:35:55-07:00 2009-03-26T18:35:55-07:00 Only enable scrobbling for iPhones when they actually finish syncing; Some random changes too. 97c41d53c461aa2739cd03ce8b2bdd526ecec9a9 Ben Gummer bengummer@gmail.com