@@ -769,12 +769,14 @@ nil] ];
BGLastFmScrobbleResponse *scrobbleResponse = [theScrobbler performScrobbleWithSongs:allRecentTracks andSessionKey:theSessionKey toURL:[NSURL URLWithString:thePostAddress]];
if (!scrobbleResponse.wasSuccessful) {
- if (scrobbleResponse.responseType==2) {
+ if (scrobbleResponse.responseType==SCROBBLE_RESPONSE_BADAUTH) {
// Need to rehandshake
- } else if (scrobbleResponse.responseType==3) {
+ [authManager fetchNewSubmissionSessionKeyUsingWebServiceSessionKey];
+ scrobbleAttempts = 2;
+ } else if (scrobbleResponse.responseType==SCROBBLE_RESPONSE_FAILED) {
[[GrowlHub sharedManager] postGrowlNotificationWithName:SP_Growl_FailedScrobbling andTitle:@"Tracks could not be scrobbled" andDescription:[NSString stringWithFormat:@"Server said \"%@\"",[scrobbleResponse failureReason]] andImage:nil andIdentifier:SP_Growl_StartedScrobbling];
[prefController addHistoryWithSuccess:NO andDate:[NSDate date] andDescription:[NSString stringWithFormat:@"Scrobble failed: ",[scrobbleResponse failureReason]]];
- } else if (scrobbleResponse.responseType==0 && scrobbleAttempts==0) {
+ } else if (scrobbleResponse.responseType==SCROBBLE_RESPONSE_UNKNOWN && scrobbleAttempts==0) {
// Because the scrobble post URL is stored in the user defaults (and handshake is not updated on launch), there is a
// chance that the stored URL (IP address) may no longer point to Last.fm. In this case, we re-handshake.
[authManager fetchNewSubmissionSessionKeyUsingWebServiceSessionKey];
AppController.m
@@ -8,6 +8,11 @@
#import <Cocoa/Cocoa.h>
+#define SCROBBLE_RESPONSE_UNKNOWN 0
+#define SCROBBLE_RESPONSE_OK 1
+#define SCROBBLE_RESPONSE_BADAUTH 2
+#define SCROBBLE_RESPONSE_FAILED 3
+
@interface BGLastFmScrobbleResponse : NSObject {
int responseType;
BGLastFmScrobbleResponse.h
99b955a8562ed9d7ec13d2897ea010064a6f7eb3
Ben Gummer
bengummer@gmail.com
http://github.com/scrobblepod/scrobblepod/commit/bb6ff67d4f3591357ee56052d9e9483df38bbf2e
bb6ff67d4f3591357ee56052d9e9483df38bbf2e
2008-11-25T23:06:55-08:00
2008-11-25T23:06:55-08:00
Re-handshake if BADAUTH is returned when scrobbling
15910beb023ec403131def0a16150dbd1f8f98cd
Ben Gummer
bengummer@gmail.com