@@ -83,6 +83,8 @@ [NSNumber numberWithBool:NO],BGPrefWantOldIcon, [NSNumber numberWithBool:NO],BGPrefShouldDoMultiPlay, [NSNumber numberWithBool:NO],BGPrefShouldUseAlbumArtist, + [NSNumber numberWithBool:NO],BGPrefShouldUseComposerInsteadOfArtist, + [NSNumber numberWithBool:NO],BGPrefShouldUseGroupingInTitle, @"~/Music/iTunes/iTunes Music Library.xml",BGPrefXmlLocation, nil] ]; AppController.m @@ -38,7 +38,7 @@ currentUnixTime = [NSString stringWithFormat:@"%d",(int)[[NSDate date] timeIntervalSince1970]]; authenticationHash = [[NSString stringWithFormat:@"%@%@",[API_SECRET md5HexHash],currentUnixTime] md5HexHash]; - handshakeURL = [NSURL URLWithString: [NSString stringWithFormat:@"http://post.audioscrobbler.com/?hs=true&p=1.2.1&c=sld&v=0.50.11&u=%@&t=%@&a=%@&sk=%@",theUsername,currentUnixTime,authenticationHash,apiSessionKey]]; + handshakeURL = [NSURL URLWithString: [NSString stringWithFormat:@"http://post.audioscrobbler.com/?hs=true&p=1.2.1&c=sld&v=0.521&u=%@&t=%@&a=%@&sk=%@",theUsername,currentUnixTime,authenticationHash,apiSessionKey]]; NSMutableURLRequest *handshakeRequest = [[NSMutableURLRequest alloc] initWithURL:handshakeURL cachePolicy:NSURLRequestReloadIgnoringCacheData timeoutInterval:2.0]; [handshakeRequest setHTTPMethod:@"GET"]; BGLastFmHandshaker.m @@ -17,7 +17,7 @@ NSString *currentUnixTime = [NSString stringWithFormat:@"%d",(int)[[NSDate date] timeIntervalSince1970]]; NSString *authString = [[NSString stringWithFormat:@"%@%@",API_SECRET,currentUnixTime] md5HexHash]; - NSString *handshakeUrlString = [NSString stringWithFormat:@"http://post.audioscrobbler.com/?hs=true&p=1.2.1&c=sld&v=0.50&u=%@&t=%@&a=%@&api_key=%@&sk=%@",username,currentUnixTime,authString,API_KEY,wsSessionKey]; + NSString *handshakeUrlString = [NSString stringWithFormat:@"http://post.audioscrobbler.com/?hs=true&p=1.2.1&c=sld&v=0.52&u=%@&t=%@&a=%@&api_key=%@&sk=%@",username,currentUnixTime,authString,API_KEY,wsSessionKey]; NSURL *postURL = [NSURL URLWithString:handshakeUrlString]; BGLastFmSubmissionHandshaker.m @@ -14,6 +14,9 @@ @implementation BGTrackCollector -(NSMutableArray *)collectTracksFromXMLFile:(NSString *)xmlPath withCutoffDate:(NSDate *)cutoffDate includingPodcasts:(BOOL)includePodcasts includingVideo:(BOOL)includeVideo ignoringComment:(NSString *)ignoreString ignoringGenre:(NSString *)genreString withMinimumDuration:(int)minimumDuration { + double oldPriority = [NSThread threadPriority]; + [NSThread setThreadPriority:0.0]; + if (!xmlPath || ![[NSFileManager defaultManager] fileExistsAtPath:xmlPath]) { NSLog(@"Supplied XML path does not exist - Using default XML path"); xmlPath = [@"~/Music/iTunes/iTunes Music Library.xml" stringByExpandingTildeInPath]; @@ -27,7 +30,9 @@ NSMutableArray *resultSongArray = [NSMutableArray new]; - BOOL useAlbumArtist = [[NSUserDefaults standardUserDefaults] boolForKey:BGPrefShouldUseAlbumArtist]; + BOOL useAlbumArtist = [[NSUserDefaults standardUserDefaults] boolForKey:BGPrefShouldUseAlbumArtist]; + BOOL useComposerInsteadOfArtist = [[NSUserDefaults standardUserDefaults] boolForKey:BGPrefShouldUseComposerInsteadOfArtist]; + BOOL useGroupingInTitle = [[NSUserDefaults standardUserDefaults] boolForKey:BGPrefShouldUseGroupingInTitle]; if (itunesLibrary) { NSLog(@"Parsing XML contents"); @@ -51,13 +56,28 @@ NSDictionary *trackStuff; for (trackStuff in wantedTracksSorted) { + // track name - NSString *nameString = [trackStuff objectForKey:@"Name"]; + NSString *trackTitle = [trackStuff objectForKey:@"Name"]; + NSString *nameString = nil; + if (trackTitle) { + if (useGroupingInTitle) { + NSString *trackGrouping = [trackStuff objectForKey:@"Grouping"]; + if (trackGrouping) nameString = [NSString stringWithFormat:@"%@: %@",trackGrouping,trackTitle]; + } + if (!nameString) nameString = trackTitle; + } + NSLog(@"10"); if (!nameString) nameString = @""; + NSLog(@"11"); // artist, using album artist where possible NSString *artistString = nil; - if (useAlbumArtist) artistString = [trackStuff objectForKey:@"Album Artist"]; + if (useAlbumArtist) { + artistString = [trackStuff objectForKey:@"Album Artist"]; + } else if (useComposerInsteadOfArtist) { + artistString = [trackStuff objectForKey:@"Composer"]; + } if (!artistString) artistString = [trackStuff objectForKey:@"Artist"]; if (!artistString) artistString = @""; @@ -97,6 +117,8 @@ } else NSLog(@"Could not load dictionary from XML"); //itunesLibrary + + [NSThread setThreadPriority:oldPriority]; return resultSongArray; } BGTrackCollector.m @@ -15,6 +15,8 @@ #define BGPrefIgnoreShortLength @"IgnoreShortLength" #define BGPrefShouldDoMultiPlay @"DoMultiPlay" #define BGPrefShouldUseAlbumArtist @"UseAlbumArtist" + #define BGPrefShouldUseComposerInsteadOfArtist @"UseComposer" + #define BGPrefShouldUseGroupingInTitle @"UseGroupingInTitle" #define INSTALLATIONID @"AnonymousInstallNumber" #define BGPrefWantOldIcon @"WantOldIcon" Defines.h @@ -17,7 +17,7 @@ <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleShortVersionString</key> - <string>0.51</string> + <string>0.52</string> <key>CFBundleSignature</key> <string>????</string> <key>CFBundleURLTypes</key> @@ -32,7 +32,7 @@ </dict> </array> <key>CFBundleVersion</key> - <string>0.51</string> + <string>0.52</string> <key>LSMinimumSystemVersion</key> <string>10.5</string> <key>NSMainNibFile</key> Info.plist 0b83f30eeab06dc3fbbfa86b52012d813450ab2d Ben Gummer bengummer@gmail.com http://github.com/scrobblepod/scrobblepod/commit/a8762960074eec273378bd7061f481bbfe825a90 a8762960074eec273378bd7061f481bbfe825a90 2009-02-15T05:08:46-08:00 2009-02-15T05:08:46-08:00 Add two hidden preferences used in 0.52 (and soon 0.52.1 bug fix release). 4b23eec42d2b2b6c44d108fff32e05eb2ec4ec3f Ben Gummer bengummer@gmail.com