Merge lp:~urbanape/ubuntuone-ios-music/chunked-downloads into lp:ubuntuone-ios-music

[Zachery Bir]

This branch provides for downloading files in chunks. This only replaces the downloader's functionality; it doesn't provide means to resume partial downloads.

[Zachery Bir (urbanape)]

In an effort to allow this branch to land, it includes the single request code path as well, and uses it by default.

[Jason Foreman (threeve)]

review: Approve

=== added directory 'Models'
=== added file 'Models/Album.h'
--- Models/Album.h	1970-01-01 00:00:00 +0000
+++ Models/Album.h	2012-02-03 20:23:18 +0000
@@ -0,0 +1,26 @@
+//
+//  Copyright 2012 Canonical Ltd.
+//	
+//  This program is free software: you can redistribute it and/or modify it
+//  under the terms of the GNU Affero General Public License version 3,
+//  as published by the Free Software Foundation.
+//	
+//  This program is distributed in the hope that it will be useful, but
+//  WITHOUT ANY WARRANTY; without even the implied warranties of
+//  MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+//  PURPOSE.  See the GNU Affero General Public License for more details.
+//
+//  You should have received a copy of the GNU Affero General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#import "_Album.h"
+
+@interface Album : _Album {}
++ (BOOL)albumWithIdExists:(NSString*)anAlbumId;
++ (Album*)albumWithId:(NSString*)anAlbumId;
++ (Album*)albumWithTitle:(NSString*)albumTitle artist:(NSString*)albumArtist;
+- (BOOL)matchesSearchQuery:(NSString *)query;
+- (NSError*)loadSongs;
+- (NSString*)dearticlizedTitle;
+- (BOOL)hasCachedSongs;
+@end

=== added file 'Models/Album.m'
--- Models/Album.m	1970-01-01 00:00:00 +0000
+++ Models/Album.m	2012-02-03 20:23:18 +0000
@@ -0,0 +1,114 @@
+//
+//  Copyright 2012 Canonical Ltd.
+//	
+//  This program is free software: you can redistribute it and/or modify it
+//  under the terms of the GNU Affero General Public License version 3,
+//  as published by the Free Software Foundation.
+//	
+//  This program is distributed in the hope that it will be useful, but
+//  WITHOUT ANY WARRANTY; without even the implied warranties of
+//  MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+//  PURPOSE.  See the GNU Affero General Public License for more details.
+//
+//  You should have received a copy of the GNU Affero General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#import "Album.h"
+#import "Artist.h"
+#import "NSMutableArray+Extras.h"
+#import "NSString+Extras.h"
+#import "AlbumParser.h"
+#import "Subsonic.h"
+
+@interface Album ()
++ (Album*)albumMatchingPredicate:(NSPredicate*)predicate;
+@end
+
+@implementation Album
+
++ (BOOL)albumWithIdExists:(NSString*)anAlbumId
+{
+	return (nil != [Album albumWithId:anAlbumId]);
+}
+
++ (Album*)albumWithId:(NSString*)anAlbumId
+{
+	NSPredicate *predicate = [NSPredicate predicateWithFormat:@"albumId == %@", anAlbumId];
+	return [self albumMatchingPredicate:predicate];
+}
+
++ (Album*)albumWithTitle:(NSString*)albumTitle artist:(NSString*)albumArtist;
+{
+	NSPredicate *predicate = [NSPredicate predicateWithFormat:@"title == %@ AND artist = %@", albumTitle, albumArtist];
+	return [self albumMatchingPredicate:predicate];
+}
+
++ (Album*)albumMatchingPredicate:(NSPredicate*)predicate;
+{
+	NSFetchRequest * fetch = [[NSFetchRequest alloc] init];
+	NSEntityDescription *entityDescription = [NSEntityDescription entityForName:@"Album" inManagedObjectContext:PerThreadManagedObjectContext()];
+	[fetch setEntity:entityDescription];
+	[fetch setPredicate:predicate];
+	NSError * error = nil;
+	NSArray * matches = [PerThreadManagedObjectContext() executeFetchRequest:fetch error:&error];
+	[fetch release];
+	
+	return [matches lastObject];
+}
+
+- (NSString *)dearticlizedTitle
+{
+    return [self.title dearticlizedString];
+}
+
+- (NSError*)loadSongs
+{
+	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+	NSError *error = nil;
+	
+	NSMutableArray *parameters = [NSMutableArray array];
+	[parameters addKeyValueObjectFromArray:[NSArray arrayWithObjects:@"id", self.albumId, nil]];
+	NSURL *url = [[Subsonic sharedSubsonic] getMetadataURL:@"getAlbum.view" parameters:parameters];
+	NSXMLParser *xmlParser = [[NSXMLParser alloc] initWithContentsOfURL:url];
+	
+	AlbumParser *parser = [[AlbumParser alloc] init];
+	parser.albumObjectId = [self objectID];
+	
+	[xmlParser setDelegate:parser];
+	
+	if (![xmlParser parse])
+	{
+		error = [[xmlParser parserError] copy];
+	}
+	
+	[xmlParser release];
+	[parser release];
+	[pool release];
+	
+	return [error autorelease];
+}
+
+- (NSString*)description
+{
+	return [NSString stringWithFormat:@"%@ - %@ (%@) (art: %@) MOC %@",self.artist,self.title,self.albumId,self.coverArtId, [self managedObjectContext]];
+}
+
+- (BOOL)matchesSearchQuery:(NSString *)query
+{
+    NSRange titleResultsRange = [self.title rangeOfString:query options:NSCaseInsensitiveSearch];
+    return titleResultsRange.length > 0;
+}
+
+- (BOOL)hasCachedSongs;
+{
+	NSManagedObjectContext *moc = [self managedObjectContext];
+	NSEntityDescription *songEntity = [NSEntityDescription entityForName:@"Song" inManagedObjectContext:moc];
+	NSFetchRequest *fetch = [[[NSFetchRequest alloc] init] autorelease];
+	[fetch setEntity:songEntity];
+	[fetch setPredicate:[NSPredicate predicateWithFormat:@"album = %@ and cachedSongPath != NIL", self.title]];
+	
+	NSArray *results = [[self managedObjectContext] executeFetchRequest:fetch error:NULL];
+	return [results count] > 0;
+}
+
+@end

=== added file 'Models/Artist.h'
--- Models/Artist.h	1970-01-01 00:00:00 +0000
+++ Models/Artist.h	2012-02-03 20:23:18 +0000
@@ -0,0 +1,26 @@
+//
+//  Copyright 2012 Canonical Ltd.
+//	
+//  This program is free software: you can redistribute it and/or modify it
+//  under the terms of the GNU Affero General Public License version 3,
+//  as published by the Free Software Foundation.
+//	
+//  This program is distributed in the hope that it will be useful, but
+//  WITHOUT ANY WARRANTY; without even the implied warranties of
+//  MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+//  PURPOSE.  See the GNU Affero General Public License for more details.
+//
+//  You should have received a copy of the GNU Affero General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#import "_Artist.h"
+
+@interface Artist : _Artist {}
++ (Artist*)artistWithId:(NSString*)anArtistId;
++ (BOOL)artistWithIdExists:(NSString*)anArtistId;
++ (Artist*)artistWithName:(NSString*)artistName;
+- (BOOL)matchesSearchQuery:(NSString *)query;
+- (NSString *)dearticlizedName;
+- (NSError*)loadAlbums;
+- (BOOL)hasCachedSongs;
+@end

=== added file 'Models/Artist.m'
--- Models/Artist.m	1970-01-01 00:00:00 +0000
+++ Models/Artist.m	2012-02-03 20:23:18 +0000
@@ -0,0 +1,114 @@
+//
+//  Copyright 2012 Canonical Ltd.
+//	
+//  This program is free software: you can redistribute it and/or modify it
+//  under the terms of the GNU Affero General Public License version 3,
+//  as published by the Free Software Foundation.
+//	
+//  This program is distributed in the hope that it will be useful, but
+//  WITHOUT ANY WARRANTY; without even the implied warranties of
+//  MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+//  PURPOSE.  See the GNU Affero General Public License for more details.
+//
+//  You should have received a copy of the GNU Affero General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#import "Artist.h"
+#import "Album.h"
+#import "Subsonic.h"
+#import "NSMutableArray+Extras.h"
+#import "NSString+Extras.h"
+#import "ArtistParser.h"
+
+@interface Artist ()
++ (Artist*)artistMatchingPredicate:(NSPredicate*)predicate;
+@end
+
+@implementation Artist
+
++ (BOOL)artistWithIdExists:(NSString*)anArtistId
+{
+	return [Artist artistWithId:anArtistId] != nil;
+}
+
++ (Artist*)artistWithId:(NSString*)anArtistId
+{
+	NSPredicate *predicate = [NSPredicate predicateWithFormat:@"artistId == %@", anArtistId];
+	return [self artistMatchingPredicate:predicate];
+}
+
++ (Artist*)artistWithName:(NSString*)artistName;
+{
+	NSPredicate *predicate = [NSPredicate predicateWithFormat:@"name == %@", artistName];
+	return [self artistMatchingPredicate:predicate];
+}
+
++ (Artist*)artistMatchingPredicate:(NSPredicate*)predicate;
+{
+	NSFetchRequest * fetch = [[NSFetchRequest alloc] init];
+	NSEntityDescription *entityDescription = [NSEntityDescription entityForName:@"Artist" inManagedObjectContext:PerThreadManagedObjectContext()];
+	[fetch setEntity:entityDescription];
+	[fetch setPredicate:predicate];
+	NSError * error = nil;
+	NSArray * matches = [PerThreadManagedObjectContext() executeFetchRequest:fetch error:&error];
+	[fetch release];
+	
+	return [matches lastObject];
+}
+
+- (NSString*)description
+{
+	return [NSString stringWithFormat:@"%@ (%@) MOC %@",self.name, self.artistId, [self managedObjectContext]];
+}
+
+- (BOOL)matchesSearchQuery:(NSString *)query
+{
+    NSRange titleResultsRange = [self.name rangeOfString:query options:NSCaseInsensitiveSearch];
+    return titleResultsRange.length > 0;
+}
+
+- (NSString *)dearticlizedName
+{
+    return [self.name dearticlizedString];
+}
+
+// Note: executes synchronously!
+- (NSError*)loadAlbums
+{
+	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+	NSError *error = nil;
+	
+	NSMutableArray *parameters = [NSMutableArray array];
+	[parameters addKeyValueObjectFromArray:[NSArray arrayWithObjects:@"id", self.artistId, nil]];
+	NSURL *url = [[Subsonic sharedSubsonic] getMetadataURL:@"getMusicDirectory.view" parameters:parameters];
+	NSXMLParser *xmlParser = [[NSXMLParser alloc] initWithContentsOfURL:url];
+	ArtistParser *parser = [[ArtistParser alloc] init];
+	parser.artistManagedObjectID = [self objectID];
+	[xmlParser setDelegate:parser];
+	
+	if (![xmlParser parse])
+	{
+		error = [[xmlParser parserError] copy];
+	}
+	
+	[xmlParser release];
+	[parser release];
+	[pool release];
+	
+	return [error autorelease];
+}
+
+- (BOOL)hasCachedSongs;
+{
+	NSManagedObjectContext *moc = [self managedObjectContext];
+	NSEntityDescription *songEntity = [NSEntityDescription entityForName:@"Song" inManagedObjectContext:moc];
+	NSFetchRequest *fetch = [[[NSFetchRequest alloc] init] autorelease];
+	[fetch setEntity:songEntity];
+	[fetch setPredicate:[NSPredicate predicateWithFormat:@"artist = %@ and cachedSongPath != NIL", self.name]];
+	
+	NSError *error = nil;
+	NSArray *results = [moc executeFetchRequest:fetch error:&error];
+	return [results count] > 0;
+}
+
+@end

=== renamed file 'models/CachedSongsPlaylist.h' => 'Models/CachedSongsPlaylist.h'
=== renamed file 'models/CachedSongsPlaylist.m' => 'Models/CachedSongsPlaylist.m'
=== added directory 'Models/Generated'
=== added file 'Models/Generated/_Album.h'
--- Models/Generated/_Album.h	1970-01-01 00:00:00 +0000
+++ Models/Generated/_Album.h	2012-02-03 20:23:18 +0000
@@ -0,0 +1,122 @@
+// DO NOT EDIT. This file is machine-generated and constantly overwritten.
+// Make changes to Album.h instead.
+
+#import <CoreData/CoreData.h>
+
+
+@class Artist;
+@class Song;
+
+
+
+
+
+
+@interface AlbumID : NSManagedObjectID {}
+@end
+
+@interface _Album : NSManagedObject {}
++ (id)insertInManagedObjectContext:(NSManagedObjectContext*)moc_;
++ (NSString*)entityName;
++ (NSEntityDescription*)entityInManagedObjectContext:(NSManagedObjectContext*)moc_;
+- (AlbumID*)objectID;
+
+
+
+
+@property (nonatomic, retain) NSString *albumId;
+
+
+//- (BOOL)validateAlbumId:(id*)value_ error:(NSError**)error_;
+
+
+
+
+@property (nonatomic, retain) NSString *artist;
+
+
+//- (BOOL)validateArtist:(id*)value_ error:(NSError**)error_;
+
+
+
+
+@property (nonatomic, retain) NSString *coverArtId;
+
+
+//- (BOOL)validateCoverArtId:(id*)value_ error:(NSError**)error_;
+
+
+
+
+@property (nonatomic, retain) NSString *title;
+
+
+//- (BOOL)validateTitle:(id*)value_ error:(NSError**)error_;
+
+
+
+
+
+@property (nonatomic, retain) Artist* artistEntity;
+
+//- (BOOL)validateArtistEntity:(id*)value_ error:(NSError**)error_;
+
+
+
+
+@property (nonatomic, retain) NSSet* songs;
+
+- (NSMutableSet*)songsSet;
+
+
+
+
+@end
+
+@interface _Album (CoreDataGeneratedAccessors)
+
+- (void)addSongs:(NSSet*)value_;
+- (void)removeSongs:(NSSet*)value_;
+- (void)addSongsObject:(Song*)value_;
+- (void)removeSongsObject:(Song*)value_;
+
+@end
+
+@interface _Album (CoreDataGeneratedPrimitiveAccessors)
+
+
+- (NSString*)primitiveAlbumId;
+- (void)setPrimitiveAlbumId:(NSString*)value;
+
+
+
+
+- (NSString*)primitiveArtist;
+- (void)setPrimitiveArtist:(NSString*)value;
+
+
+
+
+- (NSString*)primitiveCoverArtId;
+- (void)setPrimitiveCoverArtId:(NSString*)value;
+
+
+
+
+- (NSString*)primitiveTitle;
+- (void)setPrimitiveTitle:(NSString*)value;
+
+
+
+
+
+- (Artist*)primitiveArtistEntity;
+- (void)setPrimitiveArtistEntity:(Artist*)value;
+
+
+
+- (NSMutableSet*)primitiveSongs;
+- (void)setPrimitiveSongs:(NSMutableSet*)value;
+
+
+@end

=== added file 'Models/Generated/_Album.m'
--- Models/Generated/_Album.m	1970-01-01 00:00:00 +0000
+++ Models/Generated/_Album.m	2012-02-03 20:23:18 +0000
@@ -0,0 +1,86 @@
+// DO NOT EDIT. This file is machine-generated and constantly overwritten.
+// Make changes to Album.m instead.
+
+#import "_Album.h"
+
+@implementation AlbumID
+@end
+
+@implementation _Album
+
++ (id)insertInManagedObjectContext:(NSManagedObjectContext*)moc_ {
+	NSParameterAssert(moc_);
+	return [NSEntityDescription insertNewObjectForEntityForName:@"Album" inManagedObjectContext:moc_];
+}
+
++ (NSString*)entityName {
+	return @"Album";
+}
+
++ (NSEntityDescription*)entityInManagedObjectContext:(NSManagedObjectContext*)moc_ {
+	NSParameterAssert(moc_);
+	return [NSEntityDescription entityForName:@"Album" inManagedObjectContext:moc_];
+}
+
+- (AlbumID*)objectID {
+	return (AlbumID*)[super objectID];
+}
+
++ (NSSet *)keyPathsForValuesAffectingValueForKey:(NSString *)key {
+	NSSet *keyPaths = [super keyPathsForValuesAffectingValueForKey:key];
+	
+
+	return keyPaths;
+}
+
+
+
+
+@dynamic albumId;
+
+
+
+
+
+
+@dynamic artist;
+
+
+
+
+
+
+@dynamic coverArtId;
+
+
+
+
+
+
+@dynamic title;
+
+
+
+
+
+
+@dynamic artistEntity;
+
+	
+
+@dynamic songs;
+
+	
+- (NSMutableSet*)songsSet {
+	[self willAccessValueForKey:@"songs"];
+	NSMutableSet *result = (NSMutableSet*)[self mutableSetValueForKey:@"songs"];
+	[self didAccessValueForKey:@"songs"];
+	return result;
+}
+	
+
+
+
+
+
+@end

=== added file 'Models/Generated/_Artist.h'
--- Models/Generated/_Artist.h	1970-01-01 00:00:00 +0000
+++ Models/Generated/_Artist.h	2012-02-03 20:23:18 +0000
@@ -0,0 +1,97 @@
+// DO NOT EDIT. This file is machine-generated and constantly overwritten.
+// Make changes to Artist.h instead.
+
+#import <CoreData/CoreData.h>
+
+
+@class Album;
+@class Song;
+
+
+
+
+@interface ArtistID : NSManagedObjectID {}
+@end
+
+@interface _Artist : NSManagedObject {}
++ (id)insertInManagedObjectContext:(NSManagedObjectContext*)moc_;
++ (NSString*)entityName;
++ (NSEntityDescription*)entityInManagedObjectContext:(NSManagedObjectContext*)moc_;
+- (ArtistID*)objectID;
+
+
+
+
+@property (nonatomic, retain) NSString *artistId;
+
+
+//- (BOOL)validateArtistId:(id*)value_ error:(NSError**)error_;
+
+
+
+
+@property (nonatomic, retain) NSString *name;
+
+
+//- (BOOL)validateName:(id*)value_ error:(NSError**)error_;
+
+
+
+
+
+@property (nonatomic, retain) NSSet* albums;
+
+- (NSMutableSet*)albumsSet;
+
+
+
+
+@property (nonatomic, retain) NSSet* songs;
+
+- (NSMutableSet*)songsSet;
+
+
+
+
+@end
+
+@interface _Artist (CoreDataGeneratedAccessors)
+
+- (void)addAlbums:(NSSet*)value_;
+- (void)removeAlbums:(NSSet*)value_;
+- (void)addAlbumsObject:(Album*)value_;
+- (void)removeAlbumsObject:(Album*)value_;
+
+- (void)addSongs:(NSSet*)value_;
+- (void)removeSongs:(NSSet*)value_;
+- (void)addSongsObject:(Song*)value_;
+- (void)removeSongsObject:(Song*)value_;
+
+@end
+
+@interface _Artist (CoreDataGeneratedPrimitiveAccessors)
+
+
+- (NSString*)primitiveArtistId;
+- (void)setPrimitiveArtistId:(NSString*)value;
+
+
+
+
+- (NSString*)primitiveName;
+- (void)setPrimitiveName:(NSString*)value;
+
+
+
+
+
+- (NSMutableSet*)primitiveAlbums;
+- (void)setPrimitiveAlbums:(NSMutableSet*)value;
+
+
+
+- (NSMutableSet*)primitiveSongs;
+- (void)setPrimitiveSongs:(NSMutableSet*)value;
+
+
+@end

=== added file 'Models/Generated/_Artist.m'
--- Models/Generated/_Artist.m	1970-01-01 00:00:00 +0000
+++ Models/Generated/_Artist.m	2012-02-03 20:23:18 +0000
@@ -0,0 +1,79 @@
+// DO NOT EDIT. This file is machine-generated and constantly overwritten.
+// Make changes to Artist.m instead.
+
+#import "_Artist.h"
+
+@implementation ArtistID
+@end
+
+@implementation _Artist
+
++ (id)insertInManagedObjectContext:(NSManagedObjectContext*)moc_ {
+	NSParameterAssert(moc_);
+	return [NSEntityDescription insertNewObjectForEntityForName:@"Artist" inManagedObjectContext:moc_];
+}
+
++ (NSString*)entityName {
+	return @"Artist";
+}
+
++ (NSEntityDescription*)entityInManagedObjectContext:(NSManagedObjectContext*)moc_ {
+	NSParameterAssert(moc_);
+	return [NSEntityDescription entityForName:@"Artist" inManagedObjectContext:moc_];
+}
+
+- (ArtistID*)objectID {
+	return (ArtistID*)[super objectID];
+}
+
++ (NSSet *)keyPathsForValuesAffectingValueForKey:(NSString *)key {
+	NSSet *keyPaths = [super keyPathsForValuesAffectingValueForKey:key];
+	
+
+	return keyPaths;
+}
+
+
+
+
+@dynamic artistId;
+
+
+
+
+
+
+@dynamic name;
+
+
+
+
+
+
+@dynamic albums;
+
+	
+- (NSMutableSet*)albumsSet {
+	[self willAccessValueForKey:@"albums"];
+	NSMutableSet *result = (NSMutableSet*)[self mutableSetValueForKey:@"albums"];
+	[self didAccessValueForKey:@"albums"];
+	return result;
+}
+	
+
+@dynamic songs;
+
+	
+- (NSMutableSet*)songsSet {
+	[self willAccessValueForKey:@"songs"];
+	NSMutableSet *result = (NSMutableSet*)[self mutableSetValueForKey:@"songs"];
+	[self didAccessValueForKey:@"songs"];
+	return result;
+}
+	
+
+
+
+
+
+@end

=== added file 'Models/Generated/_Playlist.h'
--- Models/Generated/_Playlist.h	1970-01-01 00:00:00 +0000
+++ Models/Generated/_Playlist.h	2012-02-03 20:23:18 +0000
@@ -0,0 +1,79 @@
+// DO NOT EDIT. This file is machine-generated and constantly overwritten.
+// Make changes to Playlist.h instead.
+
+#import <CoreData/CoreData.h>
+
+
+@class PlaylistSongIndex;
+
+
+
+
+@interface PlaylistID : NSManagedObjectID {}
+@end
+
+@interface _Playlist : NSManagedObject {}
++ (id)insertInManagedObjectContext:(NSManagedObjectContext*)moc_;
++ (NSString*)entityName;
++ (NSEntityDescription*)entityInManagedObjectContext:(NSManagedObjectContext*)moc_;
+- (PlaylistID*)objectID;
+
+
+
+
+@property (nonatomic, retain) NSString *name;
+
+
+//- (BOOL)validateName:(id*)value_ error:(NSError**)error_;
+
+
+
+
+@property (nonatomic, retain) NSString *playlistId;
+
+
+//- (BOOL)validatePlaylistId:(id*)value_ error:(NSError**)error_;
+
+
+
+
+
+@property (nonatomic, retain) NSSet* playlistSongIndexes;
+
+- (NSMutableSet*)playlistSongIndexesSet;
+
+
+
+
+@end
+
+@interface _Playlist (CoreDataGeneratedAccessors)
+
+- (void)addPlaylistSongIndexes:(NSSet*)value_;
+- (void)removePlaylistSongIndexes:(NSSet*)value_;
+- (void)addPlaylistSongIndexesObject:(PlaylistSongIndex*)value_;
+- (void)removePlaylistSongIndexesObject:(PlaylistSongIndex*)value_;
+
+@end
+
+@interface _Playlist (CoreDataGeneratedPrimitiveAccessors)
+
+
+- (NSString*)primitiveName;
+- (void)setPrimitiveName:(NSString*)value;
+
+
+
+
+- (NSString*)primitivePlaylistId;
+- (void)setPrimitivePlaylistId:(NSString*)value;
+
+
+
+
+
+- (NSMutableSet*)primitivePlaylistSongIndexes;
+- (void)setPrimitivePlaylistSongIndexes:(NSMutableSet*)value;
+
+
+@end

=== added file 'Models/Generated/_Playlist.m'
--- Models/Generated/_Playlist.m	1970-01-01 00:00:00 +0000
+++ Models/Generated/_Playlist.m	2012-02-03 20:23:18 +0000
@@ -0,0 +1,68 @@
+// DO NOT EDIT. This file is machine-generated and constantly overwritten.
+// Make changes to Playlist.m instead.
+
+#import "_Playlist.h"
+
+@implementation PlaylistID
+@end
+
+@implementation _Playlist
+
++ (id)insertInManagedObjectContext:(NSManagedObjectContext*)moc_ {
+	NSParameterAssert(moc_);
+	return [NSEntityDescription insertNewObjectForEntityForName:@"Playlist" inManagedObjectContext:moc_];
+}
+
++ (NSString*)entityName {
+	return @"Playlist";
+}
+
++ (NSEntityDescription*)entityInManagedObjectContext:(NSManagedObjectContext*)moc_ {
+	NSParameterAssert(moc_);
+	return [NSEntityDescription entityForName:@"Playlist" inManagedObjectContext:moc_];
+}
+
+- (PlaylistID*)objectID {
+	return (PlaylistID*)[super objectID];
+}
+
++ (NSSet *)keyPathsForValuesAffectingValueForKey:(NSString *)key {
+	NSSet *keyPaths = [super keyPathsForValuesAffectingValueForKey:key];
+	
+
+	return keyPaths;
+}
+
+
+
+
+@dynamic name;
+
+
+
+
+
+
+@dynamic playlistId;
+
+
+
+
+
+
+@dynamic playlistSongIndexes;
+
+	
+- (NSMutableSet*)playlistSongIndexesSet {
+	[self willAccessValueForKey:@"playlistSongIndexes"];
+	NSMutableSet *result = (NSMutableSet*)[self mutableSetValueForKey:@"playlistSongIndexes"];
+	[self didAccessValueForKey:@"playlistSongIndexes"];
+	return result;
+}
+	
+
+
+
+
+
+@end

=== added file 'Models/Generated/_PlaylistSongIndex.h'
--- Models/Generated/_PlaylistSongIndex.h	1970-01-01 00:00:00 +0000
+++ Models/Generated/_PlaylistSongIndex.h	2012-02-03 20:23:18 +0000
@@ -0,0 +1,79 @@
+// DO NOT EDIT. This file is machine-generated and constantly overwritten.
+// Make changes to PlaylistSongIndex.h instead.
+
+#import <CoreData/CoreData.h>
+
+
+@class Playlist;
+@class Song;
+
+
+
+@interface PlaylistSongIndexID : NSManagedObjectID {}
+@end
+
+@interface _PlaylistSongIndex : NSManagedObject {}
++ (id)insertInManagedObjectContext:(NSManagedObjectContext*)moc_;
++ (NSString*)entityName;
++ (NSEntityDescription*)entityInManagedObjectContext:(NSManagedObjectContext*)moc_;
+- (PlaylistSongIndexID*)objectID;
+
+
+
+
+@property (nonatomic, retain) NSNumber *index;
+
+
+@property int indexValue;
+- (int)indexValue;
+- (void)setIndexValue:(int)value_;
+
+//- (BOOL)validateIndex:(id*)value_ error:(NSError**)error_;
+
+
+
+
+
+@property (nonatomic, retain) Playlist* playlistEntity;
+
+//- (BOOL)validatePlaylistEntity:(id*)value_ error:(NSError**)error_;
+
+
+
+
+@property (nonatomic, retain) Song* songEntity;
+
+//- (BOOL)validateSongEntity:(id*)value_ error:(NSError**)error_;
+
+
+
+
+@end
+
+@interface _PlaylistSongIndex (CoreDataGeneratedAccessors)
+
+@end
+
+@interface _PlaylistSongIndex (CoreDataGeneratedPrimitiveAccessors)
+
+
+- (NSNumber*)primitiveIndex;
+- (void)setPrimitiveIndex:(NSNumber*)value;
+
+- (int)primitiveIndexValue;
+- (void)setPrimitiveIndexValue:(int)value_;
+
+
+
+
+
+- (Playlist*)primitivePlaylistEntity;
+- (void)setPrimitivePlaylistEntity:(Playlist*)value;
+
+
+
+- (Song*)primitiveSongEntity;
+- (void)setPrimitiveSongEntity:(Song*)value;
+
+
+@end

=== added file 'Models/Generated/_PlaylistSongIndex.m'
--- Models/Generated/_PlaylistSongIndex.m	1970-01-01 00:00:00 +0000
+++ Models/Generated/_PlaylistSongIndex.m	2012-02-03 20:23:18 +0000
@@ -0,0 +1,81 @@
+// DO NOT EDIT. This file is machine-generated and constantly overwritten.
+// Make changes to PlaylistSongIndex.m instead.
+
+#import "_PlaylistSongIndex.h"
+
+@implementation PlaylistSongIndexID
+@end
+
+@implementation _PlaylistSongIndex
+
++ (id)insertInManagedObjectContext:(NSManagedObjectContext*)moc_ {
+	NSParameterAssert(moc_);
+	return [NSEntityDescription insertNewObjectForEntityForName:@"PlaylistSongIndex" inManagedObjectContext:moc_];
+}
+
++ (NSString*)entityName {
+	return @"PlaylistSongIndex";
+}
+
++ (NSEntityDescription*)entityInManagedObjectContext:(NSManagedObjectContext*)moc_ {
+	NSParameterAssert(moc_);
+	return [NSEntityDescription entityForName:@"PlaylistSongIndex" inManagedObjectContext:moc_];
+}
+
+- (PlaylistSongIndexID*)objectID {
+	return (PlaylistSongIndexID*)[super objectID];
+}
+
++ (NSSet *)keyPathsForValuesAffectingValueForKey:(NSString *)key {
+	NSSet *keyPaths = [super keyPathsForValuesAffectingValueForKey:key];
+	
+	if ([key isEqualToString:@"indexValue"]) {
+		NSSet *affectingKey = [NSSet setWithObject:@"index"];
+		keyPaths = [keyPaths setByAddingObjectsFromSet:affectingKey];
+	}
+
+	return keyPaths;
+}
+
+
+
+
+@dynamic index;
+
+
+
+- (int)indexValue {
+	NSNumber *result = [self index];
+	return [result intValue];
+}
+
+- (void)setIndexValue:(int)value_ {
+	[self setIndex:[NSNumber numberWithInt:value_]];
+}
+
+- (int)primitiveIndexValue {
+	NSNumber *result = [self primitiveIndex];
+	return [result intValue];
+}
+
+- (void)setPrimitiveIndexValue:(int)value_ {
+	[self setPrimitiveIndex:[NSNumber numberWithInt:value_]];
+}
+
+
+
+
+
+@dynamic playlistEntity;
+
+	
+
+@dynamic songEntity;
+
+	
+
+
+
+
+
+@end

=== added file 'Models/Generated/_Song.h'
--- Models/Generated/_Song.h	1970-01-01 00:00:00 +0000
+++ Models/Generated/_Song.h	2012-02-03 20:23:18 +0000
@@ -0,0 +1,327 @@
+// DO NOT EDIT. This file is machine-generated and constantly overwritten.
+// Make changes to Song.h instead.
+
+#import <CoreData/CoreData.h>
+
+
+@class Album;
+@class Artist;
+@class PlaylistSongIndex;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@interface SongID : NSManagedObjectID {}
+@end
+
+@interface _Song : NSManagedObject {}
++ (id)insertInManagedObjectContext:(NSManagedObjectContext*)moc_;
++ (NSString*)entityName;
++ (NSEntityDescription*)entityInManagedObjectContext:(NSManagedObjectContext*)moc_;
+- (SongID*)objectID;
+
+
+
+
+@property (nonatomic, retain) NSString *album;
+
+
+//- (BOOL)validateAlbum:(id*)value_ error:(NSError**)error_;
+
+
+
+
+@property (nonatomic, retain) NSString *artist;
+
+
+//- (BOOL)validateArtist:(id*)value_ error:(NSError**)error_;
+
+
+
+
+@property (nonatomic, retain) NSNumber *bitRate;
+
+
+@property int bitRateValue;
+- (int)bitRateValue;
+- (void)setBitRateValue:(int)value_;
+
+//- (BOOL)validateBitRate:(id*)value_ error:(NSError**)error_;
+
+
+
+
+@property (nonatomic, retain) NSString *cachedSongPath;
+
+
+//- (BOOL)validateCachedSongPath:(id*)value_ error:(NSError**)error_;
+
+
+
+
+@property (nonatomic, retain) NSString *coverArtId;
+
+
+//- (BOOL)validateCoverArtId:(id*)value_ error:(NSError**)error_;
+
+
+
+
+@property (nonatomic, retain) NSNumber *discNumber;
+
+
+@property int discNumberValue;
+- (int)discNumberValue;
+- (void)setDiscNumberValue:(int)value_;
+
+//- (BOOL)validateDiscNumber:(id*)value_ error:(NSError**)error_;
+
+
+
+
+@property (nonatomic, retain) NSNumber *duration;
+
+
+@property int durationValue;
+- (int)durationValue;
+- (void)setDurationValue:(int)value_;
+
+//- (BOOL)validateDuration:(id*)value_ error:(NSError**)error_;
+
+
+
+
+@property (nonatomic, retain) NSString *genre;
+
+
+//- (BOOL)validateGenre:(id*)value_ error:(NSError**)error_;
+
+
+
+
+@property (nonatomic, retain) NSString *path;
+
+
+//- (BOOL)validatePath:(id*)value_ error:(NSError**)error_;
+
+
+
+
+@property (nonatomic, retain) NSNumber *size;
+
+
+@property int sizeValue;
+- (int)sizeValue;
+- (void)setSizeValue:(int)value_;
+
+//- (BOOL)validateSize:(id*)value_ error:(NSError**)error_;
+
+
+
+
+@property (nonatomic, retain) NSString *songId;
+
+
+//- (BOOL)validateSongId:(id*)value_ error:(NSError**)error_;
+
+
+
+
+@property (nonatomic, retain) NSString *title;
+
+
+//- (BOOL)validateTitle:(id*)value_ error:(NSError**)error_;
+
+
+
+
+@property (nonatomic, retain) NSNumber *track;
+
+
+@property int trackValue;
+- (int)trackValue;
+- (void)setTrackValue:(int)value_;
+
+//- (BOOL)validateTrack:(id*)value_ error:(NSError**)error_;
+
+
+
+
+@property (nonatomic, retain) NSNumber *year;
+
+
+@property int yearValue;
+- (int)yearValue;
+- (void)setYearValue:(int)value_;
+
+//- (BOOL)validateYear:(id*)value_ error:(NSError**)error_;
+
+
+
+
+
+@property (nonatomic, retain) Album* albumEntity;
+
+//- (BOOL)validateAlbumEntity:(id*)value_ error:(NSError**)error_;
+
+
+
+
+@property (nonatomic, retain) Artist* artistEntity;
+
+//- (BOOL)validateArtistEntity:(id*)value_ error:(NSError**)error_;
+
+
+
+
+@property (nonatomic, retain) NSSet* playlistSongIndexes;
+
+- (NSMutableSet*)playlistSongIndexesSet;
+
+
+
+
+@end
+
+@interface _Song (CoreDataGeneratedAccessors)
+
+- (void)addPlaylistSongIndexes:(NSSet*)value_;
+- (void)removePlaylistSongIndexes:(NSSet*)value_;
+- (void)addPlaylistSongIndexesObject:(PlaylistSongIndex*)value_;
+- (void)removePlaylistSongIndexesObject:(PlaylistSongIndex*)value_;
+
+@end
+
+@interface _Song (CoreDataGeneratedPrimitiveAccessors)
+
+
+- (NSString*)primitiveAlbum;
+- (void)setPrimitiveAlbum:(NSString*)value;
+
+
+
+
+- (NSString*)primitiveArtist;
+- (void)setPrimitiveArtist:(NSString*)value;
+
+
+
+
+- (NSNumber*)primitiveBitRate;
+- (void)setPrimitiveBitRate:(NSNumber*)value;
+
+- (int)primitiveBitRateValue;
+- (void)setPrimitiveBitRateValue:(int)value_;
+
+
+
+
+- (NSString*)primitiveCachedSongPath;
+- (void)setPrimitiveCachedSongPath:(NSString*)value;
+
+
+
+
+- (NSString*)primitiveCoverArtId;
+- (void)setPrimitiveCoverArtId:(NSString*)value;
+
+
+
+
+- (NSNumber*)primitiveDiscNumber;
+- (void)setPrimitiveDiscNumber:(NSNumber*)value;
+
+- (int)primitiveDiscNumberValue;
+- (void)setPrimitiveDiscNumberValue:(int)value_;
+
+
+
+
+- (NSNumber*)primitiveDuration;
+- (void)setPrimitiveDuration:(NSNumber*)value;
+
+- (int)primitiveDurationValue;
+- (void)setPrimitiveDurationValue:(int)value_;
+
+
+
+
+- (NSString*)primitiveGenre;
+- (void)setPrimitiveGenre:(NSString*)value;
+
+
+
+
+- (NSString*)primitivePath;
+- (void)setPrimitivePath:(NSString*)value;
+
+
+
+
+- (NSNumber*)primitiveSize;
+- (void)setPrimitiveSize:(NSNumber*)value;
+
+- (int)primitiveSizeValue;
+- (void)setPrimitiveSizeValue:(int)value_;
+
+
+
+
+- (NSString*)primitiveSongId;
+- (void)setPrimitiveSongId:(NSString*)value;
+
+
+
+
+- (NSString*)primitiveTitle;
+- (void)setPrimitiveTitle:(NSString*)value;
+
+
+
+
+- (NSNumber*)primitiveTrack;
+- (void)setPrimitiveTrack:(NSNumber*)value;
+
+- (int)primitiveTrackValue;
+- (void)setPrimitiveTrackValue:(int)value_;
+
+
+
+
+- (NSNumber*)primitiveYear;
+- (void)setPrimitiveYear:(NSNumber*)value;
+
+- (int)primitiveYearValue;
+- (void)setPrimitiveYearValue:(int)value_;
+
+
+
+
+
+- (Album*)primitiveAlbumEntity;
+- (void)setPrimitiveAlbumEntity:(Album*)value;
+
+
+
+- (Artist*)primitiveArtistEntity;
+- (void)setPrimitiveArtistEntity:(Artist*)value;
+
+
+
+- (NSMutableSet*)primitivePlaylistSongIndexes;
+- (void)setPrimitivePlaylistSongIndexes:(NSMutableSet*)value;
+
+
+@end

=== added file 'Models/Generated/_Song.m'
--- Models/Generated/_Song.m	1970-01-01 00:00:00 +0000
+++ Models/Generated/_Song.m	2012-02-03 20:23:18 +0000
@@ -0,0 +1,298 @@
+// DO NOT EDIT. This file is machine-generated and constantly overwritten.
+// Make changes to Song.m instead.
+
+#import "_Song.h"
+
+@implementation SongID
+@end
+
+@implementation _Song
+
++ (id)insertInManagedObjectContext:(NSManagedObjectContext*)moc_ {
+	NSParameterAssert(moc_);
+	return [NSEntityDescription insertNewObjectForEntityForName:@"Song" inManagedObjectContext:moc_];
+}
+
++ (NSString*)entityName {
+	return @"Song";
+}
+
++ (NSEntityDescription*)entityInManagedObjectContext:(NSManagedObjectContext*)moc_ {
+	NSParameterAssert(moc_);
+	return [NSEntityDescription entityForName:@"Song" inManagedObjectContext:moc_];
+}
+
+- (SongID*)objectID {
+	return (SongID*)[super objectID];
+}
+
++ (NSSet *)keyPathsForValuesAffectingValueForKey:(NSString *)key {
+	NSSet *keyPaths = [super keyPathsForValuesAffectingValueForKey:key];
+	
+	if ([key isEqualToString:@"bitRateValue"]) {
+		NSSet *affectingKey = [NSSet setWithObject:@"bitRate"];
+		keyPaths = [keyPaths setByAddingObjectsFromSet:affectingKey];
+	}
+	if ([key isEqualToString:@"discNumberValue"]) {
+		NSSet *affectingKey = [NSSet setWithObject:@"discNumber"];
+		keyPaths = [keyPaths setByAddingObjectsFromSet:affectingKey];
+	}
+	if ([key isEqualToString:@"durationValue"]) {
+		NSSet *affectingKey = [NSSet setWithObject:@"duration"];
+		keyPaths = [keyPaths setByAddingObjectsFromSet:affectingKey];
+	}
+	if ([key isEqualToString:@"sizeValue"]) {
+		NSSet *affectingKey = [NSSet setWithObject:@"size"];
+		keyPaths = [keyPaths setByAddingObjectsFromSet:affectingKey];
+	}
+	if ([key isEqualToString:@"trackValue"]) {
+		NSSet *affectingKey = [NSSet setWithObject:@"track"];
+		keyPaths = [keyPaths setByAddingObjectsFromSet:affectingKey];
+	}
+	if ([key isEqualToString:@"yearValue"]) {
+		NSSet *affectingKey = [NSSet setWithObject:@"year"];
+		keyPaths = [keyPaths setByAddingObjectsFromSet:affectingKey];
+	}
+
+	return keyPaths;
+}
+
+
+
+
+@dynamic album;
+
+
+
+
+
+
+@dynamic artist;
+
+
+
+
+
+
+@dynamic bitRate;
+
+
+
+- (int)bitRateValue {
+	NSNumber *result = [self bitRate];
+	return [result intValue];
+}
+
+- (void)setBitRateValue:(int)value_ {
+	[self setBitRate:[NSNumber numberWithInt:value_]];
+}
+
+- (int)primitiveBitRateValue {
+	NSNumber *result = [self primitiveBitRate];
+	return [result intValue];
+}
+
+- (void)setPrimitiveBitRateValue:(int)value_ {
+	[self setPrimitiveBitRate:[NSNumber numberWithInt:value_]];
+}
+
+
+
+
+
+@dynamic cachedSongPath;
+
+
+
+
+
+
+@dynamic coverArtId;
+
+
+
+
+
+
+@dynamic discNumber;
+
+
+
+- (int)discNumberValue {
+	NSNumber *result = [self discNumber];
+	return [result intValue];
+}
+
+- (void)setDiscNumberValue:(int)value_ {
+	[self setDiscNumber:[NSNumber numberWithInt:value_]];
+}
+
+- (int)primitiveDiscNumberValue {
+	NSNumber *result = [self primitiveDiscNumber];
+	return [result intValue];
+}
+
+- (void)setPrimitiveDiscNumberValue:(int)value_ {
+	[self setPrimitiveDiscNumber:[NSNumber numberWithInt:value_]];
+}
+
+
+
+
+
+@dynamic duration;
+
+
+
+- (int)durationValue {
+	NSNumber *result = [self duration];
+	return [result intValue];
+}
+
+- (void)setDurationValue:(int)value_ {
+	[self setDuration:[NSNumber numberWithInt:value_]];
+}
+
+- (int)primitiveDurationValue {
+	NSNumber *result = [self primitiveDuration];
+	return [result intValue];
+}
+
+- (void)setPrimitiveDurationValue:(int)value_ {
+	[self setPrimitiveDuration:[NSNumber numberWithInt:value_]];
+}
+
+
+
+
+
+@dynamic genre;
+
+
+
+
+
+
+@dynamic path;
+
+
+
+
+
+
+@dynamic size;
+
+
+
+- (int)sizeValue {
+	NSNumber *result = [self size];
+	return [result intValue];
+}
+
+- (void)setSizeValue:(int)value_ {
+	[self setSize:[NSNumber numberWithInt:value_]];
+}
+
+- (int)primitiveSizeValue {
+	NSNumber *result = [self primitiveSize];
+	return [result intValue];
+}
+
+- (void)setPrimitiveSizeValue:(int)value_ {
+	[self setPrimitiveSize:[NSNumber numberWithInt:value_]];
+}
+
+
+
+
+
+@dynamic songId;
+
+
+
+
+
+
+@dynamic title;
+
+
+
+
+
+
+@dynamic track;
+
+
+
+- (int)trackValue {
+	NSNumber *result = [self track];
+	return [result intValue];
+}
+
+- (void)setTrackValue:(int)value_ {
+	[self setTrack:[NSNumber numberWithInt:value_]];
+}
+
+- (int)primitiveTrackValue {
+	NSNumber *result = [self primitiveTrack];
+	return [result intValue];
+}
+
+- (void)setPrimitiveTrackValue:(int)value_ {
+	[self setPrimitiveTrack:[NSNumber numberWithInt:value_]];
+}
+
+
+
+
+
+@dynamic year;
+
+
+
+- (int)yearValue {
+	NSNumber *result = [self year];
+	return [result intValue];
+}
+
+- (void)setYearValue:(int)value_ {
+	[self setYear:[NSNumber numberWithInt:value_]];
+}
+
+- (int)primitiveYearValue {
+	NSNumber *result = [self primitiveYear];
+	return [result intValue];
+}
+
+- (void)setPrimitiveYearValue:(int)value_ {
+	[self setPrimitiveYear:[NSNumber numberWithInt:value_]];
+}
+
+
+
+
+
+@dynamic albumEntity;
+
+	
+
+@dynamic artistEntity;
+
+	
+
+@dynamic playlistSongIndexes;
+
+	
+- (NSMutableSet*)playlistSongIndexesSet {
+	[self willAccessValueForKey:@"playlistSongIndexes"];
+	NSMutableSet *result = (NSMutableSet*)[self mutableSetValueForKey:@"playlistSongIndexes"];
+	[self didAccessValueForKey:@"playlistSongIndexes"];
+	return result;
+}
+	
+
+
+
+
+
+@end

=== renamed file 'models/MOC.h' => 'Models/MOC.h'
=== renamed file 'models/MOC.m' => 'Models/MOC.m'
=== added file 'Models/Playlist.h'
--- Models/Playlist.h	1970-01-01 00:00:00 +0000
+++ Models/Playlist.h	2012-02-03 20:23:18 +0000
@@ -0,0 +1,29 @@
+//
+//  Copyright 2012 Canonical Ltd.
+//	
+//  This program is free software: you can redistribute it and/or modify it
+//  under the terms of the GNU Affero General Public License version 3,
+//  as published by the Free Software Foundation.
+//	
+//  This program is distributed in the hope that it will be useful, but
+//  WITHOUT ANY WARRANTY; without even the implied warranties of
+//  MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+//  PURPOSE.  See the GNU Affero General Public License for more details.
+//
+//  You should have received a copy of the GNU Affero General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#import "_Playlist.h"
+
+@class Song;
+
+@interface Playlist : _Playlist {}
++ (BOOL)playlistWithNameExists:(NSString*)aPlaylistName;
++ (Playlist*)playlistWithName:(NSString*)aPlaylistName;
+- (BOOL)matchesSearchQuery:(NSString *)query;
+- (NSError*)loadSongs;
+- (NSArray *)songs;
+- (BOOL)isEditable;
+- (void)addSong:(Song*)song;
+- (void)removeSong:(Song*)song;
+@end

=== added file 'Models/Playlist.m'
--- Models/Playlist.m	1970-01-01 00:00:00 +0000
+++ Models/Playlist.m	2012-02-03 20:23:18 +0000
@@ -0,0 +1,130 @@
+//
+//  Copyright 2012 Canonical Ltd.
+//	
+//  This program is free software: you can redistribute it and/or modify it
+//  under the terms of the GNU Affero General Public License version 3,
+//  as published by the Free Software Foundation.
+//	
+//  This program is distributed in the hope that it will be useful, but
+//  WITHOUT ANY WARRANTY; without even the implied warranties of
+//  MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+//  PURPOSE.  See the GNU Affero General Public License for more details.
+//
+//  You should have received a copy of the GNU Affero General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#import "Playlist.h"
+#import "Subsonic.h"
+#import "NSMutableArray+Extras.h"
+#import "PlaylistParser.h"
+#import "PlaylistSongIndex.h"
+#import "Song.h"
+
+@implementation Playlist
+
++ (BOOL)playlistWithNameExists:(NSString *)aPlaylistName
+{
+	return (nil != [Playlist playlistWithName:aPlaylistName]);
+}
+
++ (Playlist *)playlistWithName:(NSString *)aPlaylistName
+{
+	NSFetchRequest * fetch = [[NSFetchRequest alloc] init];
+	NSEntityDescription *entityDescription = [NSEntityDescription entityForName:@"Playlist" inManagedObjectContext:PerThreadManagedObjectContext()];
+	[fetch setEntity:entityDescription];
+	
+	NSPredicate *predicate = [NSPredicate predicateWithFormat:@"name == %@", aPlaylistName];
+	[fetch setPredicate:predicate];
+	
+	NSError * error = nil;
+	NSArray * matches = [PerThreadManagedObjectContext() executeFetchRequest:fetch error:&error];
+	[fetch release];
+	
+	if ([matches count] > 0)
+	{
+		return [matches objectAtIndex:0];
+	}
+	else
+	{
+		return nil;
+	}
+}
+
+- (NSError*)loadSongs
+{
+	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+	NSError *error = nil;
+	
+	NSMutableArray *parameters = [NSMutableArray array];
+	[parameters addKeyValueObjectFromArray:[NSArray arrayWithObjects:@"id", self.playlistId, nil]];
+	NSURL *url = [[Subsonic sharedSubsonic] getMetadataURL:@"getPlaylist.view" parameters:parameters];
+	NSXMLParser *xmlParser = [[NSXMLParser alloc] initWithContentsOfURL:url];
+	
+	PlaylistParser *parser = [[PlaylistParser alloc] init];
+	parser.playlistObjectId = [self objectID];
+	
+	[xmlParser setDelegate:parser];
+	
+	if (![xmlParser parse])
+	{
+		error = [[xmlParser parserError] copy];
+	}
+	
+	[xmlParser release];
+	[parser release];
+	[pool release];
+	
+	return [error autorelease];
+}
+
+- (NSArray *)songs
+{
+	// return playlistSongIndexes sorted by index
+	NSSortDescriptor *sortDescriptor = [NSSortDescriptor sortDescriptorWithKey:@"index" ascending:YES];
+	NSArray *results = [[self.playlistSongIndexes sortedArrayUsingDescriptors:[NSArray arrayWithObject:sortDescriptor]] valueForKey:@"songEntity"];
+	return results;
+}
+
+// Do the crazy PlaylistSongIndex lookup/clobber dance inside these methods
+- (void)addSong:(Song *)song
+{
+	PlaylistSongIndex *playlistSongIndex = [NSEntityDescription insertNewObjectForEntityForName:@"PlaylistSongIndex" inManagedObjectContext:PerThreadManagedObjectContext()];
+	playlistSongIndex.playlistEntity = self;
+	playlistSongIndex.songEntity = song;
+	playlistSongIndex.index = [NSNumber numberWithUnsignedInt:[self.playlistSongIndexes count]];
+	SaveContext();
+}
+
+- (void)removeSong:(Song *)song
+{
+	// Look up (potentially) all records where playlistEntity is self, and songEntity is song, and blow them away
+	NSSet *condemned = [self.playlistSongIndexes filteredSetUsingPredicate:[NSPredicate predicateWithFormat:@"songEntity = %@", song]];
+	for (PlaylistSongIndex *playlistSongIndex in condemned)
+	{
+		[PerThreadManagedObjectContext() deleteObject:playlistSongIndex];
+	}
+	SaveContext();
+	
+	[[self.playlistSongIndexes sortedArrayUsingDescriptors:[NSArray arrayWithObject:[NSSortDescriptor sortDescriptorWithKey:@"index" ascending:YES]]] enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) {
+		((PlaylistSongIndex *)obj).index = [NSNumber numberWithUnsignedInt:idx];
+	}];
+	SaveContext();
+}
+
+- (NSString*)description
+{
+	return [NSString stringWithFormat:@"%@ (%@) MOC %@", self.name, self.playlistId, [self managedObjectContext]];
+}
+
+- (BOOL)matchesSearchQuery:(NSString *)query
+{
+    NSRange titleResultsRange = [self.name rangeOfString:query options:NSCaseInsensitiveSearch];
+    return titleResultsRange.length > 0;
+}
+
+- (BOOL)isEditable;
+{
+	return YES;
+}
+
+@end

=== added file 'Models/PlaylistSongIndex.h'
--- Models/PlaylistSongIndex.h	1970-01-01 00:00:00 +0000
+++ Models/PlaylistSongIndex.h	2012-02-03 20:23:18 +0000
@@ -0,0 +1,20 @@
+//
+//  Copyright 2012 Canonical Ltd.
+//	
+//  This program is free software: you can redistribute it and/or modify it
+//  under the terms of the GNU Affero General Public License version 3,
+//  as published by the Free Software Foundation.
+//	
+//  This program is distributed in the hope that it will be useful, but
+//  WITHOUT ANY WARRANTY; without even the implied warranties of
+//  MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+//  PURPOSE.  See the GNU Affero General Public License for more details.
+//
+//  You should have received a copy of the GNU Affero General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#import "_PlaylistSongIndex.h"
+
+@interface PlaylistSongIndex : _PlaylistSongIndex {}
+// Custom logic goes here.
+@end

=== added file 'Models/PlaylistSongIndex.m'
--- Models/PlaylistSongIndex.m	1970-01-01 00:00:00 +0000
+++ Models/PlaylistSongIndex.m	2012-02-03 20:23:18 +0000
@@ -0,0 +1,22 @@
+//
+//  Copyright 2012 Canonical Ltd.
+//	
+//  This program is free software: you can redistribute it and/or modify it
+//  under the terms of the GNU Affero General Public License version 3,
+//  as published by the Free Software Foundation.
+//	
+//  This program is distributed in the hope that it will be useful, but
+//  WITHOUT ANY WARRANTY; without even the implied warranties of
+//  MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+//  PURPOSE.  See the GNU Affero General Public License for more details.
+//
+//  You should have received a copy of the GNU Affero General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#import "PlaylistSongIndex.h"
+
+@implementation PlaylistSongIndex
+
+// Custom logic goes here.
+
+@end

=== added file 'Models/Song.h'
--- Models/Song.h	1970-01-01 00:00:00 +0000
+++ Models/Song.h	2012-02-03 20:23:18 +0000
@@ -0,0 +1,25 @@
+//
+//  Copyright 2012 Canonical Ltd.
+//	
+//  This program is free software: you can redistribute it and/or modify it
+//  under the terms of the GNU Affero General Public License version 3,
+//  as published by the Free Software Foundation.
+//	
+//  This program is distributed in the hope that it will be useful, but
+//  WITHOUT ANY WARRANTY; without even the implied warranties of
+//  MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+//  PURPOSE.  See the GNU Affero General Public License for more details.
+//
+//  You should have received a copy of the GNU Affero General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#import "_Song.h"
+
+@interface Song : _Song {}
++ (BOOL)songWithIdExists:(NSString*)aSongId;
++ (Song*)songWithId:(NSString*)aSongId;
+- (BOOL)matchesSearchQuery:(NSString *)query;
+- (NSString *)dearticlizedTitle;
+- (BOOL)cachedSongExists;
+- (NSURL*)cachedSongURL;
+@end

=== added file 'Models/Song.m'
--- Models/Song.m	1970-01-01 00:00:00 +0000
+++ Models/Song.m	2012-02-03 20:23:18 +0000
@@ -0,0 +1,96 @@
+//
+//  Copyright 2012 Canonical Ltd.
+//	
+//  This program is free software: you can redistribute it and/or modify it
+//  under the terms of the GNU Affero General Public License version 3,
+//  as published by the Free Software Foundation.
+//	
+//  This program is distributed in the hope that it will be useful, but
+//  WITHOUT ANY WARRANTY; without even the implied warranties of
+//  MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+//  PURPOSE.  See the GNU Affero General Public License for more details.
+//
+//  You should have received a copy of the GNU Affero General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#import "Song.h"
+#import "Artist.h"
+#import "Album.h"
+#import "NSString+Extras.h"
+
+@implementation Song
+
++ (BOOL)songWithIdExists:(NSString*)aSongId
+{
+	return (nil != [Song songWithId:aSongId]);
+}
+
++ (Song*)songWithId:(NSString*)aSongId
+{
+	NSFetchRequest * fetch = [[NSFetchRequest alloc] init];
+	NSEntityDescription *entityDescription = [NSEntityDescription entityForName:@"Song" inManagedObjectContext:PerThreadManagedObjectContext()];
+	[fetch setEntity:entityDescription];
+	
+	NSPredicate *predicate = [NSPredicate predicateWithFormat:@"songId == %@", aSongId];
+	[fetch setPredicate:predicate];
+	
+	NSError * error = nil;
+	NSArray * matches = [PerThreadManagedObjectContext() executeFetchRequest:fetch error:&error];
+	[fetch release];
+	
+	if ([matches count] > 0)
+	{
+		return [matches objectAtIndex:0];
+	}
+	else
+	{
+		return nil;
+	}
+}
+
+- (NSURL*)cachedSongURL
+{
+	return [CachedMusicDirectory() URLByAppendingPathComponent:self.songId];
+}
+
+- (BOOL)cachedSongExists
+{
+	return self.cachedSongPath != nil;
+}
+
+- (NSComparisonResult)compare:(Song*)s
+{
+	NSUInteger selfPathArray[] = {[self.discNumber integerValue], [self.track integerValue]};
+	NSUInteger otherPathArray[] = {[s.discNumber integerValue], [s.track integerValue]};
+	
+	NSIndexPath *selfPath = [NSIndexPath indexPathWithIndexes:selfPathArray length:2];
+	NSIndexPath *otherPath = [NSIndexPath indexPathWithIndexes:otherPathArray length:2];
+	
+	return [selfPath compare:otherPath];
+}
+
+- (NSString*)description
+{
+	NSArray *keys = [NSArray arrayWithObjects:@"title", @"songId", @"artist", @"album", @"genre", @"coverArtId", @"path", @"duration", @"bitRate", @"track", @"year", @"size", nil];
+	
+	NSMutableString *desc = [NSMutableString string];
+	
+	for (NSString *k in keys)
+	{
+		[desc appendFormat:@"%@:%@ :: ",k, [self valueForKey:k]];
+	}
+	return desc;
+}
+
+- (BOOL)matchesSearchQuery:(NSString *)query
+{
+    NSRange titleResultsRange = [self.title rangeOfString:query options:NSCaseInsensitiveSearch];
+    return titleResultsRange.length > 0;
+}
+
+- (NSString *)dearticlizedTitle
+{
+    return [self.title dearticlizedString];
+}
+
+@end

=== modified file 'U1Music-Info.plist'
--- U1Music-Info.plist	2011-11-10 19:50:55 +0000
+++ U1Music-Info.plist	2012-02-03 20:23:18 +0000
@@ -39,7 +39,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>30</string>
+	<string>31</string>
 	<key>LSRequiresIPhoneOS</key>
 	<false/>
 	<key>NSMainNibFile</key>

=== modified file 'U1Music.xcodeproj/project.pbxproj'
--- U1Music.xcodeproj/project.pbxproj	2011-11-03 18:33:32 +0000
+++ U1Music.xcodeproj/project.pbxproj	2012-02-03 20:23:18 +0000
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 45;
+	objectVersion = 46;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -57,15 +57,26 @@
 		91406E9813849F2400A7DA67 /* uncached.png in Resources */ = {isa = PBXBuildFile; fileRef = 91406E9213849F2400A7DA67 /* uncached.png */; };
 		91406E9913849F2400A7DA67 /* [e-mail] in Resources */ = {isa = PBXBuildFile; fileRef = 91406E9313849F2400A7DA67 /* [e-mail] */; };
 		91406EEA138AEEE000A7DA67 /* NSString+Extras.m in Sources */ = {isa = PBXBuildFile; fileRef = 91406EE9138AEEE000A7DA67 /* NSString+Extras.m */; };
+		914AC3FF14B61D8A00C7D5A3 /* CachedSongsPlaylist.m in Sources */ = {isa = PBXBuildFile; fileRef = 914AC3F114B61D8A00C7D5A3 /* CachedSongsPlaylist.m */; };
+		914AC40014B61D8A00C7D5A3 /* _Album.m in Sources */ = {isa = PBXBuildFile; fileRef = 914AC3F414B61D8A00C7D5A3 /* _Album.m */; };
+		914AC40114B61D8A00C7D5A3 /* _Artist.m in Sources */ = {isa = PBXBuildFile; fileRef = 914AC3F614B61D8A00C7D5A3 /* _Artist.m */; };
+		914AC40214B61D8A00C7D5A3 /* _Playlist.m in Sources */ = {isa = PBXBuildFile; fileRef = 914AC3F814B61D8A00C7D5A3 /* _Playlist.m */; };
+		914AC40314B61D8A00C7D5A3 /* _PlaylistSongIndex.m in Sources */ = {isa = PBXBuildFile; fileRef = 914AC3FA14B61D8A00C7D5A3 /* _PlaylistSongIndex.m */; };
+		914AC40414B61D8A00C7D5A3 /* _Song.m in Sources */ = {isa = PBXBuildFile; fileRef = 914AC3FC14B61D8A00C7D5A3 /* _Song.m */; };
+		914AC40514B61D8A00C7D5A3 /* PlaylistSongIndex.m in Sources */ = {isa = PBXBuildFile; fileRef = 914AC3FE14B61D8A00C7D5A3 /* PlaylistSongIndex.m */; };
 		919376F3135CC1CF0030B7BD /* PlaylistEditSongUITableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 919376F2135CC1CF0030B7BD /* PlaylistEditSongUITableViewCell.m */; };
 		91B3A4441344CF92006C8193 /* SubsonicIndexedTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 91B3A4431344CF91006C8193 /* SubsonicIndexedTableViewController.m */; };
 		91BE4018138E8D2300D44D68 /* UIActionSheet+Blocks.m in Sources */ = {isa = PBXBuildFile; fileRef = 91BE4015138E8D2300D44D68 /* UIActionSheet+Blocks.m */; };
 		91BE4019138E8D2300D44D68 /* UIAlertView+Blocks.m in Sources */ = {isa = PBXBuildFile; fileRef = 91BE4017138E8D2300D44D68 /* UIAlertView+Blocks.m */; };
 		91BE401C138E8D3A00D44D68 /* RIButtonItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 91BE401B138E8D3A00D44D68 /* RIButtonItem.m */; };
+		91C8CCAF14B7883600A0E311 /* ArtistUITableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 91C8CCAE14B7883600A0E311 /* ArtistUITableViewCell.m */; };
 		91D18DAB13B228D3001BEB42 /* uncached-disabled.png in Resources */ = {isa = PBXBuildFile; fileRef = 91D18DA913B228D3001BEB42 /* uncached-disabled.png */; };
 		91D18DAC13B228D3001BEB42 /* [e-mail] in Resources */ = {isa = PBXBuildFile; fileRef = 91D18DAA13B228D3001BEB42 /* [e-mail] */; };
+		91D3A16F14B93B2A003D4FC0 /* MOC.m in Sources */ = {isa = PBXBuildFile; fileRef = 91D3A16E14B93B2A003D4FC0 /* MOC.m */; };
+		91D3A17214BE12FE003D4FC0 /* PlaylistUITableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 91D3A17114BE12FE003D4FC0 /* PlaylistUITableViewCell.m */; };
 		91DB6B9F13E9C7190029BC77 /* about_logo.png in Resources */ = {isa = PBXBuildFile; fileRef = 91DB6B9E13E9C7190029BC77 /* about_logo.png */; };
-		91E0778913ABAD6200AA7CB2 /* PlaylistSongIndex.m in Sources */ = {isa = PBXBuildFile; fileRef = 91E0778813ABAD6200AA7CB2 /* PlaylistSongIndex.m */; };
+		91E3E46414D33A2D006ED32F /* U1SerializedDownloadOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = 91E3E46314D33A2D006ED32F /* U1SerializedDownloadOperation.m */; };
+		91E3E46814D33A6F006ED32F /* U1ChunkDownloadOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = 91E3E46714D33A6F006ED32F /* U1ChunkDownloadOperation.m */; };
 		91E88609132DA82000618994 /* PlaylistParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 91E88608132DA82000618994 /* PlaylistParser.m */; };
 		9316628812264A74003B0EB7 /* NSDate+Extras.m in Sources */ = {isa = PBXBuildFile; fileRef = 9316628712264A74003B0EB7 /* NSDate+Extras.m */; };
 		932E7A6E1254747E00E7C8FF /* [e-mail] in Resources */ = {isa = PBXBuildFile; fileRef = 932E7A6D1254747E00E7C8FF /* [e-mail] */; };
@@ -106,7 +117,6 @@
 		93D6B5151252CB34007880B0 /* [e-mail] in Resources */ = {isa = PBXBuildFile; fileRef = 93D6B5141252CB34007880B0 /* [e-mail] */; };
 		93D6B54B1252CE57007880B0 /* URLQueryStringParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D6B54A1252CE57007880B0 /* URLQueryStringParser.m */; };
 		93DFFE3F135D70B60061F29F /* CoreData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 93DFFE3E135D70B60061F29F /* CoreData.framework */; };
-		93DFFE45135D71030061F29F /* MOC.m in Sources */ = {isa = PBXBuildFile; fileRef = 93DFFE44135D71030061F29F /* MOC.m */; };
 		93DFFE4D135D71760061F29F /* music.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 93DFFE4C135D71760061F29F /* music.xcdatamodeld */; };
 		93DFFE54135D72420061F29F /* NSManagedObjectContext+Additions.m in Sources */ = {isa = PBXBuildFile; fileRef = 93DFFE53135D72420061F29F /* NSManagedObjectContext+Additions.m */; };
 		93EE2AF0124993F100E7E060 /* ArtistListParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 93EE2AEF124993F100E7E060 /* ArtistListParser.m */; };
@@ -142,7 +152,6 @@
 		93FA43A7124DEE0E0080DF62 /* whitetrack.png in Resources */ = {isa = PBXBuildFile; fileRef = 93FA43A4124DEE0E0080DF62 /* whitetrack.png */; };
 		93FA43B5124DF07C0080DF62 /* player_overlay_bg.png in Resources */ = {isa = PBXBuildFile; fileRef = 93FA43B3124DF07C0080DF62 /* player_overlay_bg.png */; };
 		93FA43B6124DF07C0080DF62 /* [e-mail] in Resources */ = {isa = PBXBuildFile; fileRef = 93FA43B4124DF07C0080DF62 /* [e-mail] */; };
-		9646DB7D13A8FF4700CB42D2 /* CachedSongsPlaylist.m in Sources */ = {isa = PBXBuildFile; fileRef = 9646DB7C13A8FF4700CB42D2 /* CachedSongsPlaylist.m */; };
 		964FA3C213CA5C4F0018A65B /* JSONKit.m in Sources */ = {isa = PBXBuildFile; fileRef = 964FA39513CA5C040018A65B /* JSONKit.m */; };
 		964FA3C313CA5C4F0018A65B /* NSMutableURLRequest+Parameters.m in Sources */ = {isa = PBXBuildFile; fileRef = 964FA39A13CA5C040018A65B /* NSMutableURLRequest+Parameters.m */; };
 		964FA3C413CA5C4F0018A65B /* NSString+URLEncoding.m in Sources */ = {isa = PBXBuildFile; fileRef = 964FA39C13CA5C040018A65B /* NSString+URLEncoding.m */; };
@@ -248,6 +257,21 @@
 		91406E9313849F2400A7DA67 /* [e-mail] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[e-mail]"; sourceTree = "<group>"; };
 		91406EE8138AEEE000A7DA67 /* NSString+Extras.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSString+Extras.h"; sourceTree = "<group>"; };
 		91406EE9138AEEE000A7DA67 /* NSString+Extras.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSString+Extras.m"; sourceTree = "<group>"; };
+		914AC3EE14B60ECC00C7D5A3 /* U1Music 2.2-31.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "U1Music 2.2-31.xcdatamodel"; sourceTree = "<group>"; };
+		914AC3F014B61D8A00C7D5A3 /* CachedSongsPlaylist.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CachedSongsPlaylist.h; path = Models/CachedSongsPlaylist.h; sourceTree = SOURCE_ROOT; };
+		914AC3F114B61D8A00C7D5A3 /* CachedSongsPlaylist.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CachedSongsPlaylist.m; path = Models/CachedSongsPlaylist.m; sourceTree = SOURCE_ROOT; };
+		914AC3F314B61D8A00C7D5A3 /* _Album.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _Album.h; sourceTree = "<group>"; };
+		914AC3F414B61D8A00C7D5A3 /* _Album.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = _Album.m; sourceTree = "<group>"; };
+		914AC3F514B61D8A00C7D5A3 /* _Artist.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _Artist.h; sourceTree = "<group>"; };
+		914AC3F614B61D8A00C7D5A3 /* _Artist.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = _Artist.m; sourceTree = "<group>"; };
+		914AC3F714B61D8A00C7D5A3 /* _Playlist.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _Playlist.h; sourceTree = "<group>"; };
+		914AC3F814B61D8A00C7D5A3 /* _Playlist.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = _Playlist.m; sourceTree = "<group>"; };
+		914AC3F914B61D8A00C7D5A3 /* _PlaylistSongIndex.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _PlaylistSongIndex.h; sourceTree = "<group>"; };
+		914AC3FA14B61D8A00C7D5A3 /* _PlaylistSongIndex.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = _PlaylistSongIndex.m; sourceTree = "<group>"; };
+		914AC3FB14B61D8A00C7D5A3 /* _Song.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _Song.h; sourceTree = "<group>"; };
+		914AC3FC14B61D8A00C7D5A3 /* _Song.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = _Song.m; sourceTree = "<group>"; };
+		914AC3FD14B61D8A00C7D5A3 /* PlaylistSongIndex.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PlaylistSongIndex.h; path = Models/PlaylistSongIndex.h; sourceTree = SOURCE_ROOT; };
+		914AC3FE14B61D8A00C7D5A3 /* PlaylistSongIndex.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PlaylistSongIndex.m; path = Models/PlaylistSongIndex.m; sourceTree = SOURCE_ROOT; };
 		919376F1135CC1CF0030B7BD /* PlaylistEditSongUITableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlaylistEditSongUITableViewCell.h; sourceTree = "<group>"; };
 		919376F2135CC1CF0030B7BD /* PlaylistEditSongUITableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PlaylistEditSongUITableViewCell.m; sourceTree = "<group>"; };
 		91B3A4421344CF90006C8193 /* SubsonicIndexedTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SubsonicIndexedTableViewController.h; sourceTree = "<group>"; };
@@ -258,11 +282,19 @@
 		91BE4017138E8D2300D44D68 /* UIAlertView+Blocks.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIAlertView+Blocks.m"; sourceTree = "<group>"; };
 		91BE401A138E8D3A00D44D68 /* RIButtonItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RIButtonItem.h; sourceTree = "<group>"; };
 		91BE401B138E8D3A00D44D68 /* RIButtonItem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RIButtonItem.m; sourceTree = "<group>"; };
+		91C8CCAD14B7883600A0E311 /* ArtistUITableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ArtistUITableViewCell.h; sourceTree = "<group>"; };
+		91C8CCAE14B7883600A0E311 /* ArtistUITableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ArtistUITableViewCell.m; sourceTree = "<group>"; };
 		91D18DA913B228D3001BEB42 /* uncached-disabled.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "uncached-disabled.png"; sourceTree = "<group>"; };
 		91D18DAA13B228D3001BEB42 /* [e-mail] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[e-mail]"; sourceTree = "<group>"; };
+		91D3A16D14B93B2A003D4FC0 /* MOC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MOC.h; path = Models/MOC.h; sourceTree = SOURCE_ROOT; };
+		91D3A16E14B93B2A003D4FC0 /* MOC.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MOC.m; path = Models/MOC.m; sourceTree = SOURCE_ROOT; };
+		91D3A17014BE12FE003D4FC0 /* PlaylistUITableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlaylistUITableViewCell.h; sourceTree = "<group>"; };
+		91D3A17114BE12FE003D4FC0 /* PlaylistUITableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PlaylistUITableViewCell.m; sourceTree = "<group>"; };
 		91DB6B9E13E9C7190029BC77 /* about_logo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = about_logo.png; sourceTree = "<group>"; };
-		91E0778713ABAD6100AA7CB2 /* PlaylistSongIndex.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlaylistSongIndex.h; sourceTree = "<group>"; };
-		91E0778813ABAD6200AA7CB2 /* PlaylistSongIndex.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PlaylistSongIndex.m; sourceTree = "<group>"; };
+		91E3E46214D33A2D006ED32F /* U1SerializedDownloadOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = U1SerializedDownloadOperation.h; sourceTree = "<group>"; };
+		91E3E46314D33A2D006ED32F /* U1SerializedDownloadOperation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = U1SerializedDownloadOperation.m; sourceTree = "<group>"; };
+		91E3E46614D33A6F006ED32F /* U1ChunkDownloadOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = U1ChunkDownloadOperation.h; sourceTree = "<group>"; };
+		91E3E46714D33A6F006ED32F /* U1ChunkDownloadOperation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = U1ChunkDownloadOperation.m; sourceTree = "<group>"; };
 		91E88607132DA82000618994 /* PlaylistParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlaylistParser.h; sourceTree = "<group>"; };
 		91E88608132DA82000618994 /* PlaylistParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PlaylistParser.m; sourceTree = "<group>"; };
 		9316628612264A74003B0EB7 /* NSDate+Extras.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSDate+Extras.h"; sourceTree = "<group>"; };
@@ -326,8 +358,6 @@
 		93D6B5491252CE57007880B0 /* URLQueryStringParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = URLQueryStringParser.h; sourceTree = "<group>"; };
 		93D6B54A1252CE57007880B0 /* URLQueryStringParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = URLQueryStringParser.m; sourceTree = "<group>"; };
 		93DFFE3E135D70B60061F29F /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = System/Library/Frameworks/CoreData.framework; sourceTree = SDKROOT; };
-		93DFFE43135D71030061F29F /* MOC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MOC.h; sourceTree = "<group>"; };
-		93DFFE44135D71030061F29F /* MOC.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MOC.m; sourceTree = "<group>"; };
 		93DFFE48135D71550061F29F /* music.xcdatamodel */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = wrapper.xcdatamodel; path = music.xcdatamodel; sourceTree = "<group>"; };
 		93DFFE52135D72420061F29F /* NSManagedObjectContext+Additions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSManagedObjectContext+Additions.h"; sourceTree = "<group>"; };
 		93DFFE53135D72420061F29F /* NSManagedObjectContext+Additions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSManagedObjectContext+Additions.m"; sourceTree = "<group>"; };
@@ -381,8 +411,6 @@
 		93FA43A4124DEE0E0080DF62 /* whitetrack.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = whitetrack.png; sourceTree = "<group>"; };
 		93FA43B3124DF07C0080DF62 /* player_overlay_bg.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = player_overlay_bg.png; sourceTree = "<group>"; };
 		93FA43B4124DF07C0080DF62 /* [e-mail] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[e-mail]"; sourceTree = "<group>"; };
-		9646DB7B13A8FF4700CB42D2 /* CachedSongsPlaylist.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CachedSongsPlaylist.h; sourceTree = "<group>"; };
-		9646DB7C13A8FF4700CB42D2 /* CachedSongsPlaylist.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CachedSongsPlaylist.m; sourceTree = "<group>"; };
 		964FA39313CA5C040018A65B /* CHANGELOG.md */ = {isa = PBXFileReference; lastKnownFileType = text; path = CHANGELOG.md; sourceTree = "<group>"; };
 		964FA39413CA5C040018A65B /* JSONKit.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = JSONKit.h; sourceTree = "<group>"; };
 		964FA39513CA5C040018A65B /* JSONKit.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = JSONKit.m; sourceTree = "<group>"; };
@@ -641,6 +669,24 @@
 			path = "TestFlight SDK";
 			sourceTree = "<group>";
 		};
+		914AC3F214B61D8A00C7D5A3 /* Generated */ = {
+			isa = PBXGroup;
+			children = (
+				914AC3F314B61D8A00C7D5A3 /* _Album.h */,
+				914AC3F414B61D8A00C7D5A3 /* _Album.m */,
+				914AC3F514B61D8A00C7D5A3 /* _Artist.h */,
+				914AC3F614B61D8A00C7D5A3 /* _Artist.m */,
+				914AC3F714B61D8A00C7D5A3 /* _Playlist.h */,
+				914AC3F814B61D8A00C7D5A3 /* _Playlist.m */,
+				914AC3F914B61D8A00C7D5A3 /* _PlaylistSongIndex.h */,
+				914AC3FA14B61D8A00C7D5A3 /* _PlaylistSongIndex.m */,
+				914AC3FB14B61D8A00C7D5A3 /* _Song.h */,
+				914AC3FC14B61D8A00C7D5A3 /* _Song.m */,
+			);
+			name = Generated;
+			path = Models/Generated;
+			sourceTree = SOURCE_ROOT;
+		};
 		9316628512264A74003B0EB7 /* Categories */ = {
 			isa = PBXGroup;
 			children = (
@@ -702,6 +748,10 @@
 				936F230912284D1900070F43 /* NamedTextFieldCell.m */,
 				912D1262134A162000721EE4 /* AlertPrompt.h */,
 				912D1263134A162000721EE4 /* AlertPrompt.m */,
+				91C8CCAD14B7883600A0E311 /* ArtistUITableViewCell.h */,
+				91C8CCAE14B7883600A0E311 /* ArtistUITableViewCell.m */,
+				91D3A17014BE12FE003D4FC0 /* PlaylistUITableViewCell.h */,
+				91D3A17114BE12FE003D4FC0 /* PlaylistUITableViewCell.m */,
 			);
 			name = Controls;
 			path = controls;
@@ -710,8 +760,9 @@
 		936F20651227363800070F43 /* Models */ = {
 			isa = PBXGroup;
 			children = (
-				93DFFE43135D71030061F29F /* MOC.h */,
-				93DFFE44135D71030061F29F /* MOC.m */,
+				914AC3F214B61D8A00C7D5A3 /* Generated */,
+				91D3A16D14B93B2A003D4FC0 /* MOC.h */,
+				91D3A16E14B93B2A003D4FC0 /* MOC.m */,
 				93F3344E1247FA2C006C6707 /* Album.h */,
 				93F3344F1247FA2C006C6707 /* Album.m */,
 				93F334501247FA2C006C6707 /* Artist.h */,
@@ -720,10 +771,10 @@
 				936F208F12273D9000070F43 /* Song.m */,
 				936F20661227364200070F43 /* Playlist.h */,
 				936F20671227364200070F43 /* Playlist.m */,
-				9646DB7B13A8FF4700CB42D2 /* CachedSongsPlaylist.h */,
-				9646DB7C13A8FF4700CB42D2 /* CachedSongsPlaylist.m */,
-				91E0778713ABAD6100AA7CB2 /* PlaylistSongIndex.h */,
-				91E0778813ABAD6200AA7CB2 /* PlaylistSongIndex.m */,
+				914AC3FD14B61D8A00C7D5A3 /* PlaylistSongIndex.h */,
+				914AC3FE14B61D8A00C7D5A3 /* PlaylistSongIndex.m */,
+				914AC3F014B61D8A00C7D5A3 /* CachedSongsPlaylist.h */,
+				914AC3F114B61D8A00C7D5A3 /* CachedSongsPlaylist.m */,
 			);
 			name = Models;
 			path = models;
@@ -732,6 +783,10 @@
 		937FAA0C137CFC1B00507E51 /* operations */ = {
 			isa = PBXGroup;
 			children = (
+				91E3E46214D33A2D006ED32F /* U1SerializedDownloadOperation.h */,
+				91E3E46314D33A2D006ED32F /* U1SerializedDownloadOperation.m */,
+				91E3E46614D33A6F006ED32F /* U1ChunkDownloadOperation.h */,
+				91E3E46714D33A6F006ED32F /* U1ChunkDownloadOperation.m */,
 				937FAA16137CFC7200507E51 /* DownloadOperation.h */,
 				937FAA17137CFC7200507E51 /* DownloadOperation.m */,
 				937FAA13137CFC5000507E51 /* Downloader.h */,
@@ -976,10 +1031,11 @@
 		29B97313FDCFA39411CA2CEA /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
+				LastUpgradeCheck = 0420;
 				ORGANIZATIONNAME = Canonical;
 			};
 			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "U1Music" */;
-			compatibilityVersion = "Xcode 3.1";
+			compatibilityVersion = "Xcode 3.2";
 			developmentRegion = English;
 			hasScannedForEncodings = 1;
 			knownRegions = (
@@ -1162,7 +1218,6 @@
 				91018B4E135A724B0051EFDC /* PlaylistEditArtistViewController.m in Sources */,
 				91018B4F135A724B0051EFDC /* PlaylistEditSongListViewController.m in Sources */,
 				919376F3135CC1CF0030B7BD /* PlaylistEditSongUITableViewCell.m in Sources */,
-				93DFFE45135D71030061F29F /* MOC.m in Sources */,
 				93DFFE4D135D71760061F29F /* music.xcdatamodeld in Sources */,
 				93DFFE54135D72420061F29F /* NSManagedObjectContext+Additions.m in Sources */,
 				937FAA11137CFC1B00507E51 /* AlbumArtLoader.m in Sources */,
@@ -1176,14 +1231,24 @@
 				91BE4019138E8D2300D44D68 /* UIAlertView+Blocks.m in Sources */,
 				91BE401C138E8D3A00D44D68 /* RIButtonItem.m in Sources */,
 				9674C2C513A7DC01004509E4 /* UORadialProgressControl.m in Sources */,
-				9646DB7D13A8FF4700CB42D2 /* CachedSongsPlaylist.m in Sources */,
 				96FB790A13AA628700D8D4A4 /* UONetworkStatusCoordinator.m in Sources */,
-				91E0778913ABAD6200AA7CB2 /* PlaylistSongIndex.m in Sources */,
 				9654C9BC13C7826900D0EEA0 /* UOSSOCredentialsViewController.m in Sources */,
 				9654C9C713C7AF9200D0EEA0 /* UOMusicLoginController.m in Sources */,
 				964FA3DF13CA5D1D0018A65B /* UOJSONFetchOperation.m in Sources */,
 				964FA3EA13CA848D0018A65B /* UOHTTPFetchOperation.m in Sources */,
 				964FA3ED13CA8C490018A65B /* UOSSOMusicCredsFetchOperation.m in Sources */,
+				914AC3FF14B61D8A00C7D5A3 /* CachedSongsPlaylist.m in Sources */,
+				914AC40014B61D8A00C7D5A3 /* _Album.m in Sources */,
+				914AC40114B61D8A00C7D5A3 /* _Artist.m in Sources */,
+				914AC40214B61D8A00C7D5A3 /* _Playlist.m in Sources */,
+				914AC40314B61D8A00C7D5A3 /* _PlaylistSongIndex.m in Sources */,
+				914AC40414B61D8A00C7D5A3 /* _Song.m in Sources */,
+				914AC40514B61D8A00C7D5A3 /* PlaylistSongIndex.m in Sources */,
+				91C8CCAF14B7883600A0E311 /* ArtistUITableViewCell.m in Sources */,
+				91D3A16F14B93B2A003D4FC0 /* MOC.m in Sources */,
+				91D3A17214BE12FE003D4FC0 /* PlaylistUITableViewCell.m in Sources */,
+				91E3E46414D33A2D006ED32F /* U1SerializedDownloadOperation.m in Sources */,
+				91E3E46814D33A6F006ED32F /* U1ChunkDownloadOperation.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1266,7 +1331,6 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 4.0;
 				OTHER_CFLAGS = "";
-				PREBINDING = NO;
 				PROVISIONING_PROFILE = "";
 				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
 				SDKROOT = iphoneos;
@@ -1285,7 +1349,6 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 4.0;
-				PREBINDING = NO;
 				PROVISIONING_PROFILE = "";
 				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
 				SDKROOT = iphoneos;
@@ -1319,9 +1382,10 @@
 		93DFFE4C135D71760061F29F /* music.xcdatamodeld */ = {
 			isa = XCVersionGroup;
 			children = (
+				914AC3EE14B60ECC00C7D5A3 /* U1Music 2.2-31.xcdatamodel */,
 				93DFFE48135D71550061F29F /* music.xcdatamodel */,
 			);
-			currentVersion = 93DFFE48135D71550061F29F /* music.xcdatamodel */;
+			currentVersion = 914AC3EE14B60ECC00C7D5A3 /* U1Music 2.2-31.xcdatamodel */;
 			path = music.xcdatamodeld;
 			sourceTree = "<group>";
 			versionGroupType = wrapper.xcdatamodel;

=== modified file 'controls/AlbumArtistUITableViewCell.h'
--- controls/AlbumArtistUITableViewCell.h	2011-05-05 16:38:37 +0000
+++ controls/AlbumArtistUITableViewCell.h	2012-02-03 20:23:18 +0000
@@ -19,6 +19,8 @@
 
 #import <UIKit/UIKit.h>
 
+@class Album;
+
 @interface AlbumArtistUITableViewCell : UITableViewCell {
 	UIImageView *coverArtView;
     UILabel *albumNameLabel;
@@ -27,4 +29,5 @@
 @property (nonatomic, retain) UIImageView *coverArtView;
 @property (nonatomic, retain) UILabel *albumNameLabel;
 @property (nonatomic, retain) UILabel *artistNameLabel;
+@property (nonatomic, retain) Album *album;
 @end

=== modified file 'controls/AlbumArtistUITableViewCell.m'
--- controls/AlbumArtistUITableViewCell.m	2011-05-05 16:38:37 +0000
+++ controls/AlbumArtistUITableViewCell.m	2012-02-03 20:23:18 +0000
@@ -20,7 +20,7 @@
 #import "AlbumArtistUITableViewCell.h"
 
 @implementation AlbumArtistUITableViewCell
-@synthesize coverArtView, albumNameLabel, artistNameLabel;
+@synthesize coverArtView, albumNameLabel, artistNameLabel, album;
 
 - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier
 {

=== modified file 'controls/AlbumUITableViewCell.h'
--- controls/AlbumUITableViewCell.h	2011-05-27 18:22:51 +0000
+++ controls/AlbumUITableViewCell.h	2012-02-03 20:23:18 +0000
@@ -30,6 +30,8 @@
 
 #import <UIKit/UIKit.h>
 
+@class Album;
+
 @interface AlbumUITableViewCell : UITableViewCell {
 	UIImageView *coverArtView;
 	UILabel *albumNameLabel;
@@ -37,5 +39,6 @@
 
 @property (nonatomic, retain) UIImageView *coverArtView;
 @property (nonatomic, retain) UILabel *albumNameLabel;
+@property (nonatomic, retain) Album *album;
 
 @end

=== modified file 'controls/AlbumUITableViewCell.m'
--- controls/AlbumUITableViewCell.m	2011-05-27 18:22:51 +0000
+++ controls/AlbumUITableViewCell.m	2012-02-03 20:23:18 +0000
@@ -32,7 +32,7 @@
 
 @implementation AlbumUITableViewCell
 
-@synthesize coverArtView, albumNameLabel;
+@synthesize coverArtView, albumNameLabel, album;
 
 - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier {
     if ((self = [super initWithStyle:style reuseIdentifier:reuseIdentifier])) {

=== added file 'controls/ArtistUITableViewCell.h'
--- controls/ArtistUITableViewCell.h	1970-01-01 00:00:00 +0000
+++ controls/ArtistUITableViewCell.h	2012-02-03 20:23:18 +0000
@@ -0,0 +1,24 @@
+//
+//  Copyright 2012 Canonical Ltd.
+//	
+//  This program is free software: you can redistribute it and/or modify it
+//  under the terms of the GNU Affero General Public License version 3,
+//  as published by the Free Software Foundation.
+//	
+//  This program is distributed in the hope that it will be useful, but
+//  WITHOUT ANY WARRANTY; without even the implied warranties of
+//  MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+//  PURPOSE.  See the GNU Affero General Public License for more details.
+//
+//  You should have received a copy of the GNU Affero General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#import <UIKit/UIKit.h>
+
+@class Artist;
+
+@interface ArtistUITableViewCell : UITableViewCell {}
+
+@property (nonatomic, retain) Artist *artist;
+
+@end

=== added file 'controls/ArtistUITableViewCell.m'
--- controls/ArtistUITableViewCell.m	1970-01-01 00:00:00 +0000
+++ controls/ArtistUITableViewCell.m	2012-02-03 20:23:18 +0000
@@ -0,0 +1,23 @@
+//
+//  Copyright 2012 Canonical Ltd.
+//	
+//  This program is free software: you can redistribute it and/or modify it
+//  under the terms of the GNU Affero General Public License version 3,
+//  as published by the Free Software Foundation.
+//	
+//  This program is distributed in the hope that it will be useful, but
+//  WITHOUT ANY WARRANTY; without even the implied warranties of
+//  MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+//  PURPOSE.  See the GNU Affero General Public License for more details.
+//
+//  You should have received a copy of the GNU Affero General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#import "ArtistUITableViewCell.h"
+#import "Artist.h"
+
+@implementation ArtistUITableViewCell
+
+@synthesize artist;
+
+@end

=== added file 'controls/PlaylistUITableViewCell.h'
--- controls/PlaylistUITableViewCell.h	1970-01-01 00:00:00 +0000
+++ controls/PlaylistUITableViewCell.h	2012-02-03 20:23:18 +0000
@@ -0,0 +1,23 @@
+//
+//  Copyright 2012 Canonical Ltd.
+//	
+//  This program is free software: you can redistribute it and/or modify it
+//  under the terms of the GNU Affero General Public License version 3,
+//  as published by the Free Software Foundation.
+//	
+//  This program is distributed in the hope that it will be useful, but
+//  WITHOUT ANY WARRANTY; without even the implied warranties of
+//  MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+//  PURPOSE.  See the GNU Affero General Public License for more details.
+//
+//  You should have received a copy of the GNU Affero General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#import <UIKit/UIKit.h>
+
+@class Playlist;
+
+@interface PlaylistUITableViewCell : UITableViewCell {}
+@property (nonatomic, retain) Playlist *playlist;
+
+@end

=== added file 'controls/PlaylistUITableViewCell.m'
--- controls/PlaylistUITableViewCell.m	1970-01-01 00:00:00 +0000
+++ controls/PlaylistUITableViewCell.m	2012-02-03 20:23:18 +0000
@@ -0,0 +1,22 @@
+//
+//  Copyright 2012 Canonical Ltd.
+//	
+//  This program is free software: you can redistribute it and/or modify it
+//  under the terms of the GNU Affero General Public License version 3,
+//  as published by the Free Software Foundation.
+//	
+//  This program is distributed in the hope that it will be useful, but
+//  WITHOUT ANY WARRANTY; without even the implied warranties of
+//  MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+//  PURPOSE.  See the GNU Affero General Public License for more details.
+//
+//  You should have received a copy of the GNU Affero General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#import "PlaylistUITableViewCell.h"
+
+@implementation PlaylistUITableViewCell
+
+@synthesize playlist;
+
+@end

=== removed directory 'models'
=== removed file 'models/Album.h'
--- models/Album.h	2011-06-14 17:06:21 +0000
+++ models/Album.h	1970-01-01 00:00:00 +0000
@@ -1,58 +0,0 @@
-//
-//  Album.h
-//  iSub
-//
-//  Created by Ben Baron on 2/28/10.
-//  Copyright 2010 Ben Baron. All rights reserved.
-//
-//  Redistribution and use in source and binary forms, with or without modification, 
-//  are permitted provided that the following conditions are met:
-//  
-//  * Redistributions of source code must retain the above copyright notice, this 
-//    list of conditions and the following disclaimer.
-//  * Redistributions in binary form must reproduce the above copyright notice, 
-//    this list of conditions and the following disclaimer in the documentation 
-//    and/or other materials provided with the distribution.
-//  * Neither the my name nor the names of my contributors may be used to endorse
-//    or promote products derived from this software without specific prior written 
-//    permission.
-//  
-//  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-//  EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-//  OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
-//  SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, 
-//  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED 
-//  TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR 
-//  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
-//  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN 
-//  ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH 
-//  DAMAGE.
-
-@class Artist, Song;
-
-@interface Album : NSManagedObject
-{
-}
-@property (nonatomic, retain) NSString *title;
-@property (nonatomic, retain) NSString *artist;
-@property (nonatomic, retain) NSString *albumId;
-@property (nonatomic, retain) NSString *coverArtId;
-@property (nonatomic, retain) Artist * artistEntity;
-@property (nonatomic, retain) NSSet *songs;
-
-+ (BOOL)albumWithIdExists:(NSString*)anAlbumId;
-+ (Album*)albumWithId:(NSString*)anAlbumId;
-+ (Album*)albumWithTitle:(NSString*)albumTitle artist:(NSString*)albumArtist;
-- (BOOL)matchesSearchQuery:(NSString *)query;
-- (NSError*)loadSongs;
-- (NSString*)dearticlizedTitle;
-- (BOOL)hasCachedSongs;
-@end
-
-// coalesce these into one @interface Album (CoreDataGeneratedAccessors) section
-@interface Album (CoreDataGeneratedAccessors)
-- (void)addSongsObject:(Song *)value;
-- (void)removeSongsObject:(Song *)value;
-- (void)addSongs:(NSSet *)value;
-- (void)removeSongs:(NSSet *)value;
-@end

=== removed file 'models/Album.m'
--- models/Album.m	2011-11-05 00:42:21 +0000
+++ models/Album.m	1970-01-01 00:00:00 +0000
@@ -1,131 +0,0 @@
-//
-//  Album.m
-//  iSub
-//
-//  Created by Ben Baron on 2/28/10.
-//  Copyright 2010 Ben Baron. All rights reserved.
-//
-//  Redistribution and use in source and binary forms, with or without modification, 
-//  are permitted provided that the following conditions are met:
-//  
-//  * Redistributions of source code must retain the above copyright notice, this 
-//    list of conditions and the following disclaimer.
-//  * Redistributions in binary form must reproduce the above copyright notice, 
-//    this list of conditions and the following disclaimer in the documentation 
-//    and/or other materials provided with the distribution.
-//  * Neither the my name nor the names of my contributors may be used to endorse
-//    or promote products derived from this software without specific prior written 
-//    permission.
-//  
-//  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-//  EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-//  OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
-//  SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, 
-//  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED 
-//  TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR 
-//  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
-//  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN 
-//  ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH 
-//  DAMAGE.
-
-#import "Album.h"
-#import "Artist.h"
-#import "NSMutableArray+Extras.h"
-#import "NSString+Extras.h"
-#import "AlbumParser.h"
-#import "Subsonic.h"
-
-@interface Album ()
-+ (Album*)albumMatchingPredicate:(NSPredicate*)predicate;
-@end
-
-@implementation Album
-@dynamic title, artist, albumId, coverArtId;
-@dynamic artistEntity, songs;
-
-+ (BOOL)albumWithIdExists:(NSString*)anAlbumId
-{
-	return (nil != [Album albumWithId:anAlbumId]);
-}
-
-+ (Album*)albumWithId:(NSString*)anAlbumId
-{
-	NSPredicate *predicate = [NSPredicate predicateWithFormat:@"albumId == %@", anAlbumId];
-	return [self albumMatchingPredicate:predicate];
-}
-
-+ (Album*)albumWithTitle:(NSString*)albumTitle artist:(NSString*)albumArtist;
-{
-	NSPredicate *predicate = [NSPredicate predicateWithFormat:@"title == %@ AND artist = %@", albumTitle, albumArtist];
-	return [self albumMatchingPredicate:predicate];
-}
-
-+ (Album*)albumMatchingPredicate:(NSPredicate*)predicate;
-{
-	NSFetchRequest * fetch = [[NSFetchRequest alloc] init];
-	NSEntityDescription *entityDescription = [NSEntityDescription entityForName:@"Album" inManagedObjectContext:PerThreadManagedObjectContext()];
-	[fetch setEntity:entityDescription];
-	[fetch setPredicate:predicate];
-	NSError * error = nil;
-	NSArray * matches = [PerThreadManagedObjectContext() executeFetchRequest:fetch error:&error];
-	[fetch release];
-	
-	return [matches lastObject];
-}
-
-- (NSString *)dearticlizedTitle
-{
-    return [self.title dearticlizedString];
-}
-
-- (NSError*)loadSongs
-{
-	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
-	NSError *error = nil;
-	
-	NSMutableArray *parameters = [NSMutableArray array];
-	[parameters addKeyValueObjectFromArray:[NSArray arrayWithObjects:@"id", self.albumId, nil]];
-	NSURL *url = [[Subsonic sharedSubsonic] getMetadataURL:@"getAlbum.view" parameters:parameters];
-	NSXMLParser *xmlParser = [[NSXMLParser alloc] initWithContentsOfURL:url];
-	
-	AlbumParser *parser = [[AlbumParser alloc] init];
-	parser.albumObjectId = [self objectID];
-	
-	[xmlParser setDelegate:parser];
-	
-	if (![xmlParser parse])
-	{
-		error = [[xmlParser parserError] copy];
-	}
-	
-	[xmlParser release];
-	[parser release];
-	[pool release];
-	
-	return [error autorelease];
-}
-
-- (NSString*)description
-{
-	return [NSString stringWithFormat:@"%@ - %@ (%@) (art: %@) MOC %@",self.artist,self.title,self.albumId,self.coverArtId, [self managedObjectContext]];
-}
-
-- (BOOL)matchesSearchQuery:(NSString *)query
-{
-    NSRange titleResultsRange = [self.title rangeOfString:query options:NSCaseInsensitiveSearch];
-    return titleResultsRange.length > 0;
-}
-
-- (BOOL)hasCachedSongs;
-{
-	NSManagedObjectContext *moc = [self managedObjectContext];
-	NSEntityDescription *songEntity = [NSEntityDescription entityForName:@"Song" inManagedObjectContext:moc];
-	NSFetchRequest *fetch = [[[NSFetchRequest alloc] init] autorelease];
-	[fetch setEntity:songEntity];
-	[fetch setPredicate:[NSPredicate predicateWithFormat:@"album = %@ and cachedSongPath != NIL", self.title]];
-	
-	NSArray *results = [[self managedObjectContext] executeFetchRequest:fetch error:NULL];
-	return [results count] > 0;
-}
-
-@end

=== removed file 'models/Artist.h'
--- models/Artist.h	2011-06-14 17:06:21 +0000
+++ models/Artist.h	1970-01-01 00:00:00 +0000
@@ -1,59 +0,0 @@
-//
-//  Artist.h
-//  iSub
-//
-//  Created by Ben Baron on 2/27/10.
-//  Copyright 2010 Ben Baron. All rights reserved.
-//
-//  Redistribution and use in source and binary forms, with or without modification, 
-//  are permitted provided that the following conditions are met:
-//  
-//  * Redistributions of source code must retain the above copyright notice, this 
-//    list of conditions and the following disclaimer.
-//  * Redistributions in binary form must reproduce the above copyright notice, 
-//    this list of conditions and the following disclaimer in the documentation 
-//    and/or other materials provided with the distribution.
-//  * Neither the my name nor the names of my contributors may be used to endorse
-//    or promote products derived from this software without specific prior written 
-//    permission.
-//  
-//  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-//  EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-//  OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
-//  SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, 
-//  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED 
-//  TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR 
-//  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
-//  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN 
-//  ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH 
-//  DAMAGE.
-
-@class Album, Song;
-
-@interface Artist : NSManagedObject
-{
-}
-@property (nonatomic, retain) NSString *name;
-@property (nonatomic, retain) NSString *artistId;
-@property (nonatomic, retain) NSSet* albums;
-@property (nonatomic, retain) NSSet* songs;
-+ (Artist*)artistWithId:(NSString*)anArtistId;
-+ (BOOL)artistWithIdExists:(NSString*)anArtistId;
-+ (Artist*)artistWithName:(NSString*)artistName;
-- (BOOL)matchesSearchQuery:(NSString *)query;
-- (NSString *)dearticlizedName;
-- (NSError*)loadAlbums;
-- (BOOL)hasCachedSongs;
-@end
-
-@interface Artist (CoreDataGeneratedAccessors)
-- (void)addAlbumsObject:(Album *)value;
-- (void)removeAlbumsObject:(Album *)value;
-- (void)addAlbums:(NSSet *)value;
-- (void)removeAlbums:(NSSet *)value;
-
-- (void)addSongsObject:(Song *)value;
-- (void)removeSongsObject:(Song *)value;
-- (void)addSongs:(NSSet *)value;
-- (void)removeSongs:(NSSet *)value;
-@end

=== removed file 'models/Artist.m'
--- models/Artist.m	2011-11-05 00:42:21 +0000
+++ models/Artist.m	1970-01-01 00:00:00 +0000
@@ -1,135 +0,0 @@
-//
-//  Artist.m
-//  iSub
-//
-//  Created by Ben Baron on 2/27/10.
-//  Copyright 2010 Ben Baron. All rights reserved.
-//
-//  Redistribution and use in source and binary forms, with or without modification, 
-//  are permitted provided that the following conditions are met:
-//  
-//  * Redistributions of source code must retain the above copyright notice, this 
-//    list of conditions and the following disclaimer.
-//  * Redistributions in binary form must reproduce the above copyright notice, 
-//    this list of conditions and the following disclaimer in the documentation 
-//    and/or other materials provided with the distribution.
-//  * Neither the my name nor the names of my contributors may be used to endorse
-//    or promote products derived from this software without specific prior written 
-//    permission.
-//  
-//  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-//  EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-//  OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
-//  SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, 
-//  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED 
-//  TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR 
-//  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
-//  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN 
-//  ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH 
-//  DAMAGE.
-
-#import "Artist.h"
-#import "Album.h"
-#import "Subsonic.h"
-#import "NSMutableArray+Extras.h"
-#import "NSString+Extras.h"
-#import "ArtistParser.h"
-
-@interface Artist ()
-+ (Artist*)artistMatchingPredicate:(NSPredicate*)predicate;
-@end
-
-
-@implementation Artist
-
-@dynamic name;
-@dynamic artistId;
-@dynamic albums;
-@dynamic songs;
-
-+ (BOOL)artistWithIdExists:(NSString*)anArtistId
-{
-	return [Artist artistWithId:anArtistId] != nil;
-}
-
-+ (Artist*)artistWithId:(NSString*)anArtistId
-{
-	NSPredicate *predicate = [NSPredicate predicateWithFormat:@"artistId == %@", anArtistId];
-	return [self artistMatchingPredicate:predicate];
-}
-
-+ (Artist*)artistWithName:(NSString*)artistName;
-{
-	NSPredicate *predicate = [NSPredicate predicateWithFormat:@"name == %@", artistName];
-	return [self artistMatchingPredicate:predicate];
-}
-
-+ (Artist*)artistMatchingPredicate:(NSPredicate*)predicate;
-{
-	NSFetchRequest * fetch = [[NSFetchRequest alloc] init];
-	NSEntityDescription *entityDescription = [NSEntityDescription entityForName:@"Artist" inManagedObjectContext:PerThreadManagedObjectContext()];
-	[fetch setEntity:entityDescription];
-	[fetch setPredicate:predicate];
-	NSError * error = nil;
-	NSArray * matches = [PerThreadManagedObjectContext() executeFetchRequest:fetch error:&error];
-	[fetch release];
-	
-	return [matches lastObject];
-}
-
-- (NSString*)description
-{
-	return [NSString stringWithFormat:@"%@ (%@) MOC %@",self.name, self.artistId, [self managedObjectContext]];
-}
-
-- (BOOL)matchesSearchQuery:(NSString *)query
-{
-    NSRange titleResultsRange = [self.name rangeOfString:query options:NSCaseInsensitiveSearch];
-    return titleResultsRange.length > 0;
-}
-
-- (NSString *)dearticlizedName
-{
-    return [self.name dearticlizedString];
-}
-
-// Note: executes synchronously!
-- (NSError*)loadAlbums
-{
-	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
-	NSError *error = nil;
-	
-	NSMutableArray *parameters = [NSMutableArray array];
-	[parameters addKeyValueObjectFromArray:[NSArray arrayWithObjects:@"id", self.artistId, nil]];
-	NSURL *url = [[Subsonic sharedSubsonic] getMetadataURL:@"getMusicDirectory.view" parameters:parameters];
-	NSXMLParser *xmlParser = [[NSXMLParser alloc] initWithContentsOfURL:url];
-	ArtistParser *parser = [[ArtistParser alloc] init];
-	parser.artistManagedObjectID = [self objectID];
-	[xmlParser setDelegate:parser];
-	
-	if (![xmlParser parse])
-	{
-		error = [[xmlParser parserError] copy];
-	}
-	
-	[xmlParser release];
-	[parser release];
-	[pool release];
-	
-	return [error autorelease];
-}
-
-- (BOOL)hasCachedSongs;
-{
-	NSManagedObjectContext *moc = [self managedObjectContext];
-	NSEntityDescription *songEntity = [NSEntityDescription entityForName:@"Song" inManagedObjectContext:moc];
-	NSFetchRequest *fetch = [[[NSFetchRequest alloc] init] autorelease];
-	[fetch setEntity:songEntity];
-	[fetch setPredicate:[NSPredicate predicateWithFormat:@"artist = %@ and cachedSongPath != NIL", self.name]];
-	
-	NSError *error = nil;
-	NSArray *results = [moc executeFetchRequest:fetch error:&error];
-	return [results count] > 0;
-}
-
-@end

=== removed file 'models/Playlist.h'
--- models/Playlist.h	2011-06-18 02:04:11 +0000
+++ models/Playlist.h	1970-01-01 00:00:00 +0000
@@ -1,47 +0,0 @@
-//
-//  Playlist.h
-//  iSub
-//
-//  Created by Aaron Brethorst on 8/26/10.
-//  Copyright 2010 Canonical Ltd.
-//	
-//  This program is free software: you can redistribute it and/or modify it
-//  under the terms of the GNU Affero General Public License version 3,
-//  as published by the Free Software Foundation.
-//	
-//  This program is distributed in the hope that it will be useful, but
-//  WITHOUT ANY WARRANTY; without even the implied warranties of
-//  MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-//  PURPOSE.  See the GNU Affero General Public License for more details.
-//
-//  You should have received a copy of the GNU Affero General Public License
-//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-#import <Foundation/Foundation.h>
-
-@class Song, PlaylistSongIndex;
-
-@interface Playlist : NSManagedObject
-{
-}
-@property(nonatomic,retain) NSString *name;
-@property(nonatomic,retain) NSString *playlistId;
-@property(nonatomic,retain) NSSet *playlistSongIndexes;
-@property(nonatomic,readonly) NSArray *songs;
-
-+ (BOOL)playlistWithNameExists:(NSString*)aPlaylistName;
-+ (Playlist*)playlistWithName:(NSString*)aPlaylistName;
-- (BOOL)matchesSearchQuery:(NSString *)query;
-- (NSError*)loadSongs;
-- (BOOL)isEditable;
-- (void)addSong:(Song *)song;
-- (void)removeSong:(Song *)song;
-@end
-
-// coalesce these into one @interface Album (CoreDataGeneratedAccessors) section
-@interface Playlist (CoreDataGeneratedAccessors)
-- (void)addPlaylistSongIndexesObject:(PlaylistSongIndex *)value;
-- (void)removePlaylistSongIndexesObject:(PlaylistSongIndex *)value;
-- (void)addPlaylistSongIndexes:(NSSet *)value;
-- (void)removePlaylistSongIndexes:(NSSet *)value;
-@end

=== removed file 'models/Playlist.m'
--- models/Playlist.m	2011-11-05 00:42:21 +0000
+++ models/Playlist.m	1970-01-01 00:00:00 +0000
@@ -1,136 +0,0 @@
-//
-//  Playlist.m
-//  iSub
-//
-//  Created by Aaron Brethorst on 8/26/10.
-//  Copyright 2010 Canonical Ltd.
-//	
-//  This program is free software: you can redistribute it and/or modify it
-//  under the terms of the GNU Affero General Public License version 3,
-//  as published by the Free Software Foundation.
-//	
-//  This program is distributed in the hope that it will be useful, but
-//  WITHOUT ANY WARRANTY; without even the implied warranties of
-//  MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-//  PURPOSE.  See the GNU Affero General Public License for more details.
-//
-//  You should have received a copy of the GNU Affero General Public License
-//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-#import "Playlist.h"
-#import "Subsonic.h"
-#import "NSMutableArray+Extras.h"
-#import "PlaylistParser.h"
-#import "PlaylistSongIndex.h"
-#import "Song.h"
-
-@implementation Playlist
-
-@dynamic playlistId, name, playlistSongIndexes;
-
-+ (BOOL)playlistWithNameExists:(NSString *)aPlaylistName
-{
-	return (nil != [Playlist playlistWithName:aPlaylistName]);
-}
-
-+ (Playlist *)playlistWithName:(NSString *)aPlaylistName
-{
-	NSFetchRequest * fetch = [[NSFetchRequest alloc] init];
-	NSEntityDescription *entityDescription = [NSEntityDescription entityForName:@"Playlist" inManagedObjectContext:PerThreadManagedObjectContext()];
-	[fetch setEntity:entityDescription];
-	
-	NSPredicate *predicate = [NSPredicate predicateWithFormat:@"name == %@", aPlaylistName];
-	[fetch setPredicate:predicate];
-	
-	NSError * error = nil;
-	NSArray * matches = [PerThreadManagedObjectContext() executeFetchRequest:fetch error:&error];
-	[fetch release];
-	
-	if ([matches count] > 0)
-	{
-		return [matches objectAtIndex:0];
-	}
-	else
-	{
-		return nil;
-	}
-}
-
-- (NSError*)loadSongs
-{
-	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
-	NSError *error = nil;
-	
-	NSMutableArray *parameters = [NSMutableArray array];
-	[parameters addKeyValueObjectFromArray:[NSArray arrayWithObjects:@"id", self.playlistId, nil]];
-	NSURL *url = [[Subsonic sharedSubsonic] getMetadataURL:@"getPlaylist.view" parameters:parameters];
-	NSXMLParser *xmlParser = [[NSXMLParser alloc] initWithContentsOfURL:url];
-	
-	PlaylistParser *parser = [[PlaylistParser alloc] init];
-	parser.playlistObjectId = [self objectID];
-	
-	[xmlParser setDelegate:parser];
-	
-	if (![xmlParser parse])
-	{
-		error = [[xmlParser parserError] copy];
-	}
-	
-	[xmlParser release];
-	[parser release];
-	[pool release];
-	
-	return [error autorelease];
-}
-
-- (NSArray *)songs
-{
-	// return playlistSongIndexes sorted by index
-	NSSortDescriptor *sortDescriptor = [NSSortDescriptor sortDescriptorWithKey:@"index" ascending:YES];
-	NSArray *results = [[self.playlistSongIndexes sortedArrayUsingDescriptors:[NSArray arrayWithObject:sortDescriptor]] valueForKey:@"songEntity"];
-	return results;
-}
-
-// Do the crazy PlaylistSongIndex lookup/clobber dance inside these methods
-- (void)addSong:(Song *)song
-{
-	PlaylistSongIndex *playlistSongIndex = [NSEntityDescription insertNewObjectForEntityForName:@"PlaylistSongIndex" inManagedObjectContext:PerThreadManagedObjectContext()];
-	playlistSongIndex.playlistEntity = self;
-	playlistSongIndex.songEntity = song;
-	playlistSongIndex.index = [NSNumber numberWithUnsignedInt:[self.playlistSongIndexes count]];
-	SaveContext();
-}
-
-- (void)removeSong:(Song *)song
-{
-	// Look up (potentially) all records where playlistEntity is self, and songEntity is song, and blow them away
-	NSSet *condemned = [self.playlistSongIndexes filteredSetUsingPredicate:[NSPredicate predicateWithFormat:@"songEntity = %@", song]];
-	for (PlaylistSongIndex *playlistSongIndex in condemned)
-	{
-		[PerThreadManagedObjectContext() deleteObject:playlistSongIndex];
-	}
-	SaveContext();
-	
-	[[self.playlistSongIndexes sortedArrayUsingDescriptors:[NSArray arrayWithObject:[NSSortDescriptor sortDescriptorWithKey:@"index" ascending:YES]]] enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) {
-		((PlaylistSongIndex *)obj).index = [NSNumber numberWithUnsignedInt:idx];
-	}];
-	SaveContext();
-}
-
-- (NSString*)description
-{
-	return [NSString stringWithFormat:@"%@ (%@) MOC %@", self.name, self.playlistId, [self managedObjectContext]];
-}
-
-- (BOOL)matchesSearchQuery:(NSString *)query
-{
-    NSRange titleResultsRange = [self.name rangeOfString:query options:NSCaseInsensitiveSearch];
-    return titleResultsRange.length > 0;
-}
-
-- (BOOL)isEditable;
-{
-	return YES;
-}
-
-@end

=== removed file 'models/PlaylistSongIndex.h'
--- models/PlaylistSongIndex.h	2011-06-21 15:27:36 +0000
+++ models/PlaylistSongIndex.h	1970-01-01 00:00:00 +0000
@@ -1,32 +0,0 @@
-//
-//  PlaylistSongIndex.h
-//  iSub
-//
-//  Created by Zachery Bir on 6/17/11.
-//  Copyright 2011 Canonical Ltd.
-//	
-//  This program is free software: you can redistribute it and/or modify it
-//  under the terms of the GNU Affero General Public License version 3,
-//  as published by the Free Software Foundation.
-//	
-//  This program is distributed in the hope that it will be useful, but
-//  WITHOUT ANY WARRANTY; without even the implied warranties of
-//  MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-//  PURPOSE.  See the GNU Affero General Public License for more details.
-//
-//  You should have received a copy of the GNU Affero General Public License
-//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-#import <Foundation/Foundation.h>
-
-@class Playlist, Song;
-
-@interface PlaylistSongIndex : NSManagedObject {
-@private
-    
-}
-@property (nonatomic, retain) NSNumber *index;
-
-@property (nonatomic, retain) Playlist *playlistEntity;
-@property (nonatomic, retain) Song *songEntity;
-@end

=== removed file 'models/PlaylistSongIndex.m'
--- models/PlaylistSongIndex.m	2011-06-21 15:27:36 +0000
+++ models/PlaylistSongIndex.m	1970-01-01 00:00:00 +0000
@@ -1,27 +0,0 @@
-//
-//  PlaylistSongIndex.m
-//  iSub
-//
-//  Created by Zachery Bir on 6/17/11.
-//  Copyright 2011 Canonical Ltd.
-//	
-//  This program is free software: you can redistribute it and/or modify it
-//  under the terms of the GNU Affero General Public License version 3,
-//  as published by the Free Software Foundation.
-//	
-//  This program is distributed in the hope that it will be useful, but
-//  WITHOUT ANY WARRANTY; without even the implied warranties of
-//  MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-//  PURPOSE.  See the GNU Affero General Public License for more details.
-//
-//  You should have received a copy of the GNU Affero General Public License
-//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-#import "PlaylistSongIndex.h"
-
-
-@implementation PlaylistSongIndex
-
-@dynamic index, playlistEntity, songEntity;
-
-@end

=== removed file 'models/Song.h'
--- models/Song.h	2011-06-21 15:29:37 +0000
+++ models/Song.h	1970-01-01 00:00:00 +0000
@@ -1,67 +0,0 @@
-//
-//  Song.h
-//  iSub
-//
-//  Created by Ben Baron on 2/28/10.
-//  Copyright 2010 Ben Baron. All rights reserved.
-//
-//  Redistribution and use in source and binary forms, with or without modification, 
-//  are permitted provided that the following conditions are met:
-//  
-//  * Redistributions of source code must retain the above copyright notice, this 
-//    list of conditions and the following disclaimer.
-//  * Redistributions in binary form must reproduce the above copyright notice, 
-//    this list of conditions and the following disclaimer in the documentation 
-//    and/or other materials provided with the distribution.
-//  * Neither the my name nor the names of my contributors may be used to endorse
-//    or promote products derived from this software without specific prior written 
-//    permission.
-//  
-//  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-//  EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-//  OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
-//  SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, 
-//  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED 
-//  TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR 
-//  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
-//  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN 
-//  ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH 
-//  DAMAGE.
-
-@class Artist, Album, PlaylistSongIndex;
-
-@interface Song : NSManagedObject
-{
-}
-@property (nonatomic, retain) NSString *title;
-@property (nonatomic, retain) NSString *songId;
-@property (nonatomic, retain) NSString *artist;
-@property (nonatomic, retain) NSString *album;
-@property (nonatomic, retain) NSString *genre;
-@property (nonatomic, retain) NSString *coverArtId;
-@property (nonatomic, retain) NSString *path;
-@property (nonatomic, retain) NSNumber *duration;
-@property (nonatomic, retain) NSNumber *bitRate;
-@property (nonatomic, retain) NSNumber *track;
-@property (nonatomic, retain) NSNumber *discNumber;
-@property (nonatomic, retain) NSNumber *year;
-@property (nonatomic, retain) NSNumber *size;
-@property (nonatomic, retain) Artist *artistEntity;
-@property (nonatomic, retain) Album *albumEntity;
-@property (nonatomic, retain) NSSet *playlistSongIndexes;
-@property (nonatomic, retain) NSString *cachedSongPath;
-
-+ (BOOL)songWithIdExists:(NSString*)aSongId;
-+ (Song*)songWithId:(NSString*)aSongId;
-- (BOOL)matchesSearchQuery:(NSString *)query;
-- (NSString *)dearticlizedTitle;
-- (BOOL)cachedSongExists;
-- (NSURL*)cachedSongURL;
-@end
-
-@interface Song (CoreDataGeneratedAccessors)
-- (void)addPlaylistSongIndexesObject:(PlaylistSongIndex *)value;
-- (void)removePlaylistSongIndexesObject:(PlaylistSongIndex *)value;
-- (void)addPlaylistSongIndexes:(NSSet *)value;
-- (void)removePlaylistSongIndexes:(NSSet *)value;
-@end

=== removed file 'models/Song.m'
--- models/Song.m	2011-06-21 17:04:19 +0000
+++ models/Song.m	1970-01-01 00:00:00 +0000
@@ -1,113 +0,0 @@
-//
-//  Song.m
-//  iSub
-//
-//  Created by Ben Baron on 2/28/10.
-//  Copyright 2010 Ben Baron. All rights reserved.
-//
-//  Redistribution and use in source and binary forms, with or without modification, 
-//  are permitted provided that the following conditions are met:
-//  
-//  * Redistributions of source code must retain the above copyright notice, this 
-//    list of conditions and the following disclaimer.
-//  * Redistributions in binary form must reproduce the above copyright notice, 
-//    this list of conditions and the following disclaimer in the documentation 
-//    and/or other materials provided with the distribution.
-//  * Neither the my name nor the names of my contributors may be used to endorse
-//    or promote products derived from this software without specific prior written 
-//    permission.
-//  
-//  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-//  EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-//  OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
-//  SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, 
-//  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED 
-//  TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR 
-//  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
-//  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN 
-//  ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH 
-//  DAMAGE.
-
-#import "Song.h"
-#import "Artist.h"
-#import "Album.h"
-#import "NSString+Extras.h"
-
-@implementation Song
-@dynamic title, songId, artist, album, genre, coverArtId, path, duration, bitRate, track, discNumber, year, size;
-@dynamic artistEntity, albumEntity, playlistSongIndexes, cachedSongPath;
-
-+ (BOOL)songWithIdExists:(NSString*)aSongId
-{
-	return (nil != [Song songWithId:aSongId]);
-}
-
-+ (Song*)songWithId:(NSString*)aSongId
-{
-	NSFetchRequest * fetch = [[NSFetchRequest alloc] init];
-	NSEntityDescription *entityDescription = [NSEntityDescription entityForName:@"Song" inManagedObjectContext:PerThreadManagedObjectContext()];
-	[fetch setEntity:entityDescription];
-	
-	NSPredicate *predicate = [NSPredicate predicateWithFormat:@"songId == %@", aSongId];
-	[fetch setPredicate:predicate];
-	
-	NSError * error = nil;
-	NSArray * matches = [PerThreadManagedObjectContext() executeFetchRequest:fetch error:&error];
-	[fetch release];
-	
-	if ([matches count] > 0)
-	{
-		return [matches objectAtIndex:0];
-	}
-	else
-	{
-		return nil;
-	}
-}
-
-- (NSURL*)cachedSongURL
-{
-	return [CachedMusicDirectory() URLByAppendingPathComponent:self.songId];
-}
-
-- (BOOL)cachedSongExists
-{
-	return self.cachedSongPath != nil;
-}
-
-- (NSComparisonResult)compare:(Song*)s
-{
-	NSUInteger selfPathArray[] = {[self.discNumber integerValue], [self.track integerValue]};
-	NSUInteger otherPathArray[] = {[s.discNumber integerValue], [s.track integerValue]};
-	
-	NSIndexPath *selfPath = [NSIndexPath indexPathWithIndexes:selfPathArray length:2];
-	NSIndexPath *otherPath = [NSIndexPath indexPathWithIndexes:otherPathArray length:2];
-	
-	return [selfPath compare:otherPath];
-}
-
-- (NSString*)description
-{
-	NSArray *keys = [NSArray arrayWithObjects:@"title", @"songId", @"artist", @"album", @"genre", @"coverArtId", @"path", @"duration", @"bitRate", @"track", @"year", @"size", nil];
-	
-	NSMutableString *desc = [NSMutableString string];
-	
-	for (NSString *k in keys)
-	{
-		[desc appendFormat:@"%@:%@ :: ",k, [self valueForKey:k]];
-	}
-	return desc;
-}
-
-- (BOOL)matchesSearchQuery:(NSString *)query
-{
-    NSRange titleResultsRange = [self.title rangeOfString:query options:NSCaseInsensitiveSearch];
-    return titleResultsRange.length > 0;
-}
-
-- (NSString *)dearticlizedTitle
-{
-    return [self.title dearticlizedString];
-}
-
-@end

=== modified file 'music.xcdatamodeld/.xccurrentversion'
--- music.xcdatamodeld/.xccurrentversion	2011-04-19 08:05:04 +0000
+++ music.xcdatamodeld/.xccurrentversion	2012-02-03 20:23:18 +0000
@@ -3,6 +3,6 @@
 <plist version="1.0">
 <dict>
 	<key>_XCCurrentVersionName</key>
-	<string>music.xcdatamodel</string>
+	<string>U1Music 2.2-31.xcdatamodel</string>
 </dict>
 </plist>

=== added directory 'music.xcdatamodeld/U1Music 2.2-31.xcdatamodel'
=== added file 'music.xcdatamodeld/U1Music 2.2-31.xcdatamodel/elements'
Binary files music.xcdatamodeld/U1Music 2.2-31.xcdatamodel/elements	1970-01-01 00:00:00 +0000 and music.xcdatamodeld/U1Music 2.2-31.xcdatamodel/elements	2012-02-03 20:23:18 +0000 differ
=== added file 'music.xcdatamodeld/U1Music 2.2-31.xcdatamodel/layout'
Binary files music.xcdatamodeld/U1Music 2.2-31.xcdatamodel/layout	1970-01-01 00:00:00 +0000 and music.xcdatamodeld/U1Music 2.2-31.xcdatamodel/layout	2012-02-03 20:23:18 +0000 differ
=== modified file 'utilities/AlbumParser.m'
--- utilities/AlbumParser.m	2011-06-21 15:29:37 +0000
+++ utilities/AlbumParser.m	2012-02-03 20:23:18 +0000
@@ -97,7 +97,7 @@
 
 - (void)setAlbumObjectId:(NSManagedObjectID *)oid
 {
-	Album *anAlbum = [[PerThreadManagedObjectContext() objectWithID:oid] retain];
+	Album *anAlbum = (Album *)[[PerThreadManagedObjectContext() objectWithID:oid] retain];
 	[album release];
 	album = anAlbum;
 }

=== modified file 'utilities/ArtistParser.m'
--- utilities/ArtistParser.m	2011-05-27 18:23:44 +0000
+++ utilities/ArtistParser.m	2012-02-03 20:23:18 +0000
@@ -37,7 +37,7 @@
 
 - (void)setArtistManagedObjectID:(NSManagedObjectID *)moid
 {
-	Artist *anArtist = [[PerThreadManagedObjectContext() objectWithID:moid] retain];
+	Artist *anArtist = (Artist*)[[PerThreadManagedObjectContext() objectWithID:moid] retain];
 	[artist release];
 	artist = anArtist;
 }

=== modified file 'utilities/Globals.h'
--- utilities/Globals.h	2011-06-21 15:29:37 +0000
+++ utilities/Globals.h	2012-02-03 20:23:18 +0000
@@ -21,6 +21,7 @@
 
 NSURL* ApplicationDocumentsDirectory( void );
 NSURL* DatabaseFile( void );
+NSURL* TemporaryDownloadsDirectory( void );
 BOOL CacheContainsFile(NSString *aFilePath);
 NSURL* CachedMusicDirectory( void );
 NSString* CachedMusicPathForFilename(NSString *aFileName);

=== modified file 'utilities/Globals.m'
--- utilities/Globals.m	2011-06-21 15:29:37 +0000
+++ utilities/Globals.m	2012-02-03 20:23:18 +0000
@@ -30,6 +30,12 @@
     return [docs URLByAppendingPathComponent:@"music.sqlite"];
 }
 
+NSURL* TemporaryDownloadsDirectory( void )
+{
+	NSURL* docs = ApplicationDocumentsDirectory();
+	return [docs URLByAppendingPathComponent:@"tmp"];
+}
+
 BOOL CacheContainsFile(NSString *aFilePath)
 {
 	return [[NSFileManager defaultManager] fileExistsAtPath:aFilePath];

=== modified file 'utilities/PlaylistParser.m'
--- utilities/PlaylistParser.m	2011-06-18 02:04:11 +0000
+++ utilities/PlaylistParser.m	2012-02-03 20:23:18 +0000
@@ -100,7 +100,7 @@
 
 - (void)setPlaylistObjectId:(NSManagedObjectID *)oid
 {
-	Playlist *aPlaylist = [[PerThreadManagedObjectContext() objectWithID:oid] retain];
+	Playlist *aPlaylist = (Playlist *)[[PerThreadManagedObjectContext() objectWithID:oid] retain];
 	[playlist release];
 	playlist = aPlaylist;
 }

=== modified file 'utilities/operations/Downloader.m'
--- utilities/operations/Downloader.m	2011-06-21 15:29:37 +0000
+++ utilities/operations/Downloader.m	2012-02-03 20:23:18 +0000
@@ -24,6 +24,8 @@
 #import "Album.h"
 #import "Song.h"
 #import "Subsonic.h"
+#import "U1ChunkDownloadOperation.h"
+#import "U1SerializedDownloadOperation.h"
 
 static const NSUInteger kMaxConcurrentDownloads = 4;
 
@@ -35,6 +37,7 @@
 
 - (void)startAlbumEnqueueing:(Album*)anAlbum;
 - (void)completeAlbumEnqueueing:(Album*)anAlbum;
+- (void)downloadFile:(NSURL*)url withName:(NSString*)fileName completionBlock:(void(^)(NSString *path))completionBlock chunked:(BOOL)inChunks;
 @end
 
 @implementation Downloader
@@ -85,38 +88,126 @@
 
 - (void)downloadFile:(NSURL*)url withName:(NSString*)fileName
 {
-	[self downloadFile:url withName:fileName completionBlock:NULL];
+	[self downloadFile:url withName:fileName completionBlock:NULL chunked:NO];
+}
+
+- (void)downloadFile:(NSURL *)url withName:(NSString *)fileName completionBlock:(void (^)(NSString *))completionBlock;
+{
+	[self downloadFile:url withName:fileName completionBlock:completionBlock chunked:NO];
 }
 
 - (void)downloadFile:(NSURL*)url withName:(NSString*)fileName completionBlock:(void(^)(NSString *path))completionBlock
+			 chunked:(BOOL)inChunks;
 {
 	@synchronized(self)
 	{
-		if ([downloads containsObject:fileName])
-		{
-			return;
-		}
-		
-		NSString *path = CachedMusicPathForFilename(fileName);
-
-		if (CacheContainsFile(path))
-		{
-			// Partially downloaded file, delete and try again
-			[[NSFileManager defaultManager] removeItemAtPath:path error:NULL];
-		}
-		
-		[downloads addObject:fileName];
-		// Disable idle timer sleep while downloading
-		[[UIApplication sharedApplication] setIdleTimerDisabled:YES];
-		
-		DownloadOperation *download = [DownloadOperation downloadOperationWithURL:url
-																		 filePath:path];
-		download.delegate = self;
-		[download setCompletionBlock:^(void) {
-			if (completionBlock)
-				completionBlock(path);
-		}];
-		[queue addOperation:download];
+		if (inChunks)
+		{
+			NSURL* tmpDir = [TemporaryDownloadsDirectory() URLByAppendingPathComponent:fileName];
+			
+			if ([downloads containsObject:fileName] || [[NSFileManager defaultManager] fileExistsAtPath:[tmpDir path]])
+			{
+				return;
+			}
+			
+			NSError *error = nil;
+			BOOL yup = [[NSFileManager defaultManager] createDirectoryAtURL:tmpDir withIntermediateDirectories:YES attributes:nil error:&error];
+			
+			NSString *path = CachedMusicPathForFilename(fileName);
+			
+			[downloads addObject:fileName];
+			// Disable idle timer sleep while downloading
+			[[UIApplication sharedApplication] setIdleTimerDisabled:YES];
+			
+			U1SerializedDownloadOperation *serializer = [[U1SerializedDownloadOperation alloc] initWithPath:path andChunkDirectoryPath:[tmpDir path]];
+			
+			[serializer setCompletionBlock:^(void) {
+				dispatch_async(dispatch_get_main_queue(), ^{
+					[downloads removeObject:[path lastPathComponent]];
+					if ([downloads count] == 0)
+					{
+						// If downloads is empty, go back to idle timing for sleep
+						[[UIApplication sharedApplication] setIdleTimerDisabled:NO];
+					}
+					// Coarse-grained, blanket notification that any download has completed.
+					[[NSNotificationCenter defaultCenter] postNotificationName:NOTIF_downloadComplete object:nil];
+					
+					if (completionBlock)
+						completionBlock(path);
+				});
+			}];
+			
+			dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+				NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:url];
+				[request setHTTPMethod:@"HEAD"];
+				NSError *error = nil;
+				NSHTTPURLResponse *response = nil;
+				[NSURLConnection sendSynchronousRequest:request returningResponse:&response error:&error];
+				
+				NSString *contentLengthString = [[response allHeaderFields] objectForKey:@"Content-Length"];
+				NSNumberFormatter *nf = [[NSNumberFormatter alloc] init];
+				NSNumber *contentLength = [nf numberFromString:contentLengthString];
+				
+				static NSUInteger minChunkSize = 100000;
+				static NSUInteger chunkSize = 500000;
+				NSUInteger remaining = [contentLength unsignedIntegerValue];
+				NSUInteger offset = 0;
+				
+				NSMutableArray *chunkRanges = [NSMutableArray array];
+				
+				while (remaining > 0)
+				{
+					// If remaining is between chunkSize and (chunkSize + minChunkSize), just make this chunkSize that much more.
+					if ((remaining - chunkSize) < minChunkSize)
+					{
+						chunkSize = remaining;
+					}
+					NSRange chunkRange = NSMakeRange(offset, MIN(remaining, chunkSize));
+					[chunkRanges addObject:[NSValue valueWithRange:chunkRange]];
+					offset += chunkRange.length;
+					remaining -= chunkRange.length;
+				}
+				
+				[chunkRanges enumerateObjectsUsingBlock:^(id rangeValue, NSUInteger idx, BOOL *stop) {
+					NSRange range = [rangeValue rangeValue];
+					
+					NSString *path = [[tmpDir path] stringByAppendingPathComponent:[NSString stringWithFormat:@"%lu.chunk", idx]];
+					
+					U1ChunkDownloadOperation *chunk = [[U1ChunkDownloadOperation alloc] initWithUrl:url path:path andRange:range];
+					
+					[queue addOperation:chunk];
+					[serializer addDependency:chunk];
+				}];
+				
+				[queue addOperation:serializer];
+			});
+		}
+		else
+		{
+			if ([downloads containsObject:fileName])
+			{
+				return;
+			}
+			NSString *path = CachedMusicPathForFilename(fileName);
+			if (CacheContainsFile(path))
+			{
+				// Partially downloaded file, delete and try again
+				[[NSFileManager defaultManager] removeItemAtPath:path error:NULL];
+			}
+			
+			[downloads addObject:fileName];
+			// Disable idle timer sleep while downloading
+			[[UIApplication sharedApplication] setIdleTimerDisabled:YES];
+			
+			DownloadOperation *download = [DownloadOperation downloadOperationWithURL:url
+																			 filePath:path];
+			download.delegate = self;
+			[download setCompletionBlock:^(void) {
+				if (completionBlock)
+					completionBlock(path);
+			}];
+			[queue addOperation:download];
+		}
 	}
 }
 

=== added file 'utilities/operations/U1ChunkDownloadOperation.h'
--- utilities/operations/U1ChunkDownloadOperation.h	1970-01-01 00:00:00 +0000
+++ utilities/operations/U1ChunkDownloadOperation.h	2012-02-03 20:23:18 +0000
@@ -0,0 +1,24 @@
+//
+//  Copyright 2012 Canonical Ltd.
+//	
+//  This program is free software: you can redistribute it and/or modify it
+//  under the terms of the GNU Affero General Public License version 3,
+//  as published by the Free Software Foundation.
+//	
+//  This program is distributed in the hope that it will be useful, but
+//  WITHOUT ANY WARRANTY; without even the implied warranties of
+//  MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+//  PURPOSE.  See the GNU Affero General Public License for more details.
+//
+//  You should have received a copy of the GNU Affero General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#import "AbstractNetworkOperation.h"
+
+@interface U1ChunkDownloadOperation : AbstractNetworkOperation
+@property (retain, nonatomic) NSString *path;
+@property (retain, nonatomic) NSFileHandle *fileHandle;
+@property (assign) NSRange range;
+
+- (id)initWithUrl:(NSURL*)url path:(NSString*)path andRange:(NSRange)aRange;
+@end

=== added file 'utilities/operations/U1ChunkDownloadOperation.m'
--- utilities/operations/U1ChunkDownloadOperation.m	1970-01-01 00:00:00 +0000
+++ utilities/operations/U1ChunkDownloadOperation.m	2012-02-03 20:23:18 +0000
@@ -0,0 +1,68 @@
+//
+//  Copyright 2012 Canonical Ltd.
+//	
+//  This program is free software: you can redistribute it and/or modify it
+//  under the terms of the GNU Affero General Public License version 3,
+//  as published by the Free Software Foundation.
+//	
+//  This program is distributed in the hope that it will be useful, but
+//  WITHOUT ANY WARRANTY; without even the implied warranties of
+//  MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+//  PURPOSE.  See the GNU Affero General Public License for more details.
+//
+//  You should have received a copy of the GNU Affero General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#import "U1ChunkDownloadOperation.h"
+
+@implementation U1ChunkDownloadOperation
+
+@synthesize path, fileHandle, range;
+
+- (id)initWithUrl:(NSURL *)url path:(NSString *)aPath andRange:(NSRange)aRange;
+{
+	NSMutableURLRequest *request = [[NSMutableURLRequest alloc] initWithURL:url];
+	NSString *requestRange = [NSString stringWithFormat:@"bytes=%lu-%lu", aRange.location, NSMaxRange(aRange) - 1];
+	[request setValue:requestRange forHTTPHeaderField:@"Range"];
+	
+	self = [super initWithRequest:request];
+	if (self == nil)
+	{
+		return nil;
+	}
+	
+	self.range = aRange;
+	self.path = aPath;
+	[[NSFileManager defaultManager] createFileAtPath:self.path contents:[NSData data] attributes:nil];
+	fileHandle = [[NSFileHandle fileHandleForWritingAtPath:self.path] retain];
+	
+	return self;
+}
+
+- (void)connection:(NSURLConnection *)connection didReceiveResponse:(NSURLResponse *)response
+{
+	[super connection:connection didReceiveResponse:response];
+}
+
+- (void)connection:(NSURLConnection *)connection didReceiveData:(NSData *)data
+{
+	[super connection:connection didReceiveData:data];
+	
+	[fileHandle writeData:data];
+}
+
+- (void)connectionDidFinishLoading:(NSURLConnection *)connection
+{
+	[fileHandle closeFile];
+		
+	[super connectionDidFinishLoading:connection];
+}
+
+- (void)connection:(NSURLConnection *)connection didFailWithError:(NSError *)error
+{
+	[fileHandle closeFile];
+	[[NSFileManager defaultManager] removeItemAtPath:self.path error:nil];
+	
+	[super connection:connection didFailWithError:error];
+}
+@end

=== added file 'utilities/operations/U1SerializedDownloadOperation.h'
--- utilities/operations/U1SerializedDownloadOperation.h	1970-01-01 00:00:00 +0000
+++ utilities/operations/U1SerializedDownloadOperation.h	2012-02-03 20:23:18 +0000
@@ -0,0 +1,22 @@
+//
+//  Copyright 2012 Canonical Ltd.
+//	
+//  This program is free software: you can redistribute it and/or modify it
+//  under the terms of the GNU Affero General Public License version 3,
+//  as published by the Free Software Foundation.
+//	
+//  This program is distributed in the hope that it will be useful, but
+//  WITHOUT ANY WARRANTY; without even the implied warranties of
+//  MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+//  PURPOSE.  See the GNU Affero General Public License for more details.
+//
+//  You should have received a copy of the GNU Affero General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#import <Foundation/Foundation.h>
+
+@interface U1SerializedDownloadOperation : NSOperation
+@property (retain, nonatomic) NSString *path;
+@property (retain, nonatomic) NSString *chunkDirectoryPath;
+- (id)initWithPath:(NSString*)aPath andChunkDirectoryPath:(NSString*)aChunkDirectoryPath;
+@end

=== added file 'utilities/operations/U1SerializedDownloadOperation.m'
--- utilities/operations/U1SerializedDownloadOperation.m	1970-01-01 00:00:00 +0000
+++ utilities/operations/U1SerializedDownloadOperation.m	2012-02-03 20:23:18 +0000
@@ -0,0 +1,57 @@
+//
+//  Copyright 2012 Canonical Ltd.
+//	
+//  This program is free software: you can redistribute it and/or modify it
+//  under the terms of the GNU Affero General Public License version 3,
+//  as published by the Free Software Foundation.
+//	
+//  This program is distributed in the hope that it will be useful, but
+//  WITHOUT ANY WARRANTY; without even the implied warranties of
+//  MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+//  PURPOSE.  See the GNU Affero General Public License for more details.
+//
+//  You should have received a copy of the GNU Affero General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#import "U1SerializedDownloadOperation.h"
+
+@implementation U1SerializedDownloadOperation
+
+@synthesize path, chunkDirectoryPath;
+
+- (id)initWithPath:(NSString *)aPath andChunkDirectoryPath:(NSString *)aChunkDirectoryPath;
+{
+	self = [super init];
+	if (self == nil)
+	{
+		return nil;
+	}
+	
+	self.path = aPath;
+	self.chunkDirectoryPath = aChunkDirectoryPath;
+	
+	return self;
+}
+
+- (void)main;
+{
+	[[NSFileManager defaultManager] createFileAtPath:self.path contents:[NSData data] attributes:nil];
+	NSFileHandle *fileHandle = [[NSFileHandle fileHandleForWritingAtPath:self.path] retain];
+
+	NSError *error = nil;
+	NSArray *filenames = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:self.chunkDirectoryPath error:&error];
+
+	filenames = [filenames sortedArrayUsingSelector:@selector(localizedStandardCompare:)];
+	
+	[filenames enumerateObjectsUsingBlock:^(id filename, NSUInteger idx, BOOL *stop) {
+		NSString *filePath = [NSString pathWithComponents:[NSArray arrayWithObjects:self.chunkDirectoryPath, filename, nil]];
+		NSData *fileData = [[NSFileManager defaultManager] contentsAtPath:filePath];
+		[fileHandle writeData:fileData];
+	}];
+	
+	[fileHandle closeFile];
+
+	error = nil;
+	[[NSFileManager defaultManager] removeItemAtPath:self.chunkDirectoryPath error:&error];
+}
+@end

=== modified file 'view_controllers/AlbumListViewController.m'
--- view_controllers/AlbumListViewController.m	2011-06-16 19:12:54 +0000
+++ view_controllers/AlbumListViewController.m	2012-02-03 20:23:18 +0000
@@ -22,10 +22,12 @@
 #import "AlbumArtistUITableViewCell.h"
 #import "Album.h"
 #import "AlbumViewController.h"
+#import "Downloader.h"
 #import "NSString+Extras.h"
 
 @interface AlbumListViewController ()
 - (void)configureCell:(AlbumArtistUITableViewCell*)cell forTableView:(UITableView*)tableView indexPath:(NSIndexPath*)indexPath;
+- (void)downloadAlbum:(UILongPressGestureRecognizer*)sender;
 @end
 
 @implementation AlbumListViewController
@@ -62,6 +64,30 @@
     [loader release], loader = nil;
 }
 
+- (void)downloadAlbum:(UILongPressGestureRecognizer *)sender;
+{
+    if ((sender.state == UIGestureRecognizerStateBegan) && canCache)
+	{
+		Album *album = ((AlbumArtistUITableViewCell *)sender.view).album;
+        dispatch_queue_t dispatch_queue = dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0);
+        dispatch_async(dispatch_queue, ^{
+			[album loadSongs];
+			for (Song *song in [album songs])
+			{
+				if (![song cachedSongExists])
+				{
+					[[Downloader sharedDownloader] downloadFile:[[Subsonic sharedSubsonic] getStreamingURLForSongId:song.songId] withName:song.songId completionBlock:^(NSString *path) {
+						dispatch_async(dispatch_get_main_queue(), ^(void) {
+							song.cachedSongPath = path;
+							SaveContext();
+						});
+					}];
+				}
+			}
+		});
+	}
+}
+
 #pragma mark - Data Loading
 
 - (void)loadLocalData
@@ -147,6 +173,7 @@
             album = [self.tableData objectAtIndex:indexPath.row];
         }
 	}
+	cell.album = album;
 
     cell.albumNameLabel.text = album.title;
     cell.artistNameLabel.text = album.artist;
@@ -170,6 +197,12 @@
 		cell.albumNameLabel.textColor = [UIColor lightGrayColor];
 		cell.accessoryType = UITableViewCellAccessoryNone;
 	}
+	
+//	UILongPressGestureRecognizer *longPressGesture = [[UILongPressGestureRecognizer alloc] initWithTarget:self action:@selector(downloadAlbum:)];
+//	longPressGesture.minimumPressDuration = 1.0f;
+//	longPressGesture.numberOfTouchesRequired = 1;
+//	[cell addGestureRecognizer:longPressGesture];
+//	[longPressGesture release];
 }
 
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath

=== modified file 'view_controllers/AlbumViewController.m'
--- view_controllers/AlbumViewController.m	2011-06-22 20:11:03 +0000
+++ view_controllers/AlbumViewController.m	2012-02-03 20:23:18 +0000
@@ -138,63 +138,6 @@
 	return cell;
 }
 
-- (void)configureCell:(SongUITableViewCell*)cell forSongAtIndexPath:(NSIndexPath*)indexPath
-{
-	Song *song = [self.songs objectAtIndex:indexPath.row];
-	
-    // explicitly re-set the default state of the button/spinner
-    [cell.cacheButton setImage:(canCache ? [UIImage imageNamed:@"uncached"] : [UIImage imageNamed:@"uncached-disabled"]) forState:UIControlStateNormal];
-    [cell.spinner stopAnimating];
-    
-    cell.cacheButton.tag = indexPath.row;
-    [cell.cacheButton addTarget:self action:@selector(toggleCacheForSong:) forControlEvents:UIControlEventTouchUpInside];
-    
-    if ([[Downloader sharedDownloader] isDownloading:song.songId])
-    {
-        [cell.spinner startAnimating];
-    }
-    else if ([song cachedSongExists])
-    {
-        [cell.cacheButton setImage:[UIImage imageNamed:@"cached"] forState:UIControlStateNormal];
-    }
-    
-	cell.songNameLabel.text = song.title;
-	
-	cell.positionLabel.text = [NSString stringWithFormat:@"%@", [song.track intValue] > 0 ? [song.track stringValue] : @""];
-	
-	if (song.duration && [song.duration intValue] > 0)
-	{
-		cell.durationLabel.text = [NSDate stringFromDuration:song.duration];
-	}
-	else
-	{
-		cell.durationLabel.text = @"";
-	}
-	
-	if ([StreamingPlayer sharedStreamingPlayer].currentSong && [song.songId isEqual:[StreamingPlayer sharedStreamingPlayer].currentSong.songId])
-	{
-		cell.nowPlaying.hidden = NO;
-	}
-	else
-	{
-		cell.nowPlaying.hidden = YES;
-	}
-	
-	cell.evenRow = (0 == indexPath.row % 2);
-	if (song.cachedSongPath == nil && !canStream)
-	{
-		cell.songNameLabel.textColor = [UIColor lightGrayColor];
-		cell.positionLabel.textColor = [UIColor lightGrayColor];
-		cell.durationLabel.textColor = [UIColor lightGrayColor];
-	}
-	else
-	{
-		cell.songNameLabel.textColor = [UIColor blackColor];
-		cell.positionLabel.textColor = [UIColor blackColor];
-		cell.durationLabel.textColor = [UIColor blackColor];
-	}
-}
-
 
 #pragma mark -
 #pragma mark Table view delegate
@@ -268,6 +211,63 @@
 
 @implementation AlbumViewController (Private)
 
+- (void)configureCell:(SongUITableViewCell*)cell forSongAtIndexPath:(NSIndexPath*)indexPath
+{
+	Song *song = [self.songs objectAtIndex:indexPath.row];
+	
+    // explicitly re-set the default state of the button/spinner
+    [cell.cacheButton setImage:(canCache ? [UIImage imageNamed:@"uncached"] : [UIImage imageNamed:@"uncached-disabled"]) forState:UIControlStateNormal];
+    [cell.spinner stopAnimating];
+    
+    cell.cacheButton.tag = indexPath.row;
+    [cell.cacheButton addTarget:self action:@selector(toggleCacheForSong:) forControlEvents:UIControlEventTouchUpInside];
+    
+    if ([[Downloader sharedDownloader] isDownloading:song.songId])
+    {
+        [cell.spinner startAnimating];
+    }
+    else if ([song cachedSongExists])
+    {
+        [cell.cacheButton setImage:[UIImage imageNamed:@"cached"] forState:UIControlStateNormal];
+    }
+    
+	cell.songNameLabel.text = song.title;
+	
+	cell.positionLabel.text = [NSString stringWithFormat:@"%@", [song.track intValue] > 0 ? [song.track stringValue] : @""];
+	
+	if (song.duration && [song.duration intValue] > 0)
+	{
+		cell.durationLabel.text = [NSDate stringFromDuration:song.duration];
+	}
+	else
+	{
+		cell.durationLabel.text = @"";
+	}
+	
+	if ([StreamingPlayer sharedStreamingPlayer].currentSong && [song.songId isEqual:[StreamingPlayer sharedStreamingPlayer].currentSong.songId])
+	{
+		cell.nowPlaying.hidden = NO;
+	}
+	else
+	{
+		cell.nowPlaying.hidden = YES;
+	}
+	
+	cell.evenRow = (0 == indexPath.row % 2);
+	if (song.cachedSongPath == nil && !canStream)
+	{
+		cell.songNameLabel.textColor = [UIColor lightGrayColor];
+		cell.positionLabel.textColor = [UIColor lightGrayColor];
+		cell.durationLabel.textColor = [UIColor lightGrayColor];
+	}
+	else
+	{
+		cell.songNameLabel.textColor = [UIColor blackColor];
+		cell.positionLabel.textColor = [UIColor blackColor];
+		cell.durationLabel.textColor = [UIColor blackColor];
+	}
+}
+
 - (void)toggleCacheForSong:(id)sender
 {
     // This is a binary toggle, and right now, we don't bother trying to cancel a download in progress.
@@ -320,8 +320,8 @@
 						[defaults setBool:YES forKey:@"acknowledged-no-cache-on-3g"];
 					};
 
-					UIAlertView *alertView = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Caching Disabled", @"")
-																		message:NSLocalizedString(@"Caching songs can only be done on WiFi networks.", @"")
+					UIAlertView *alertView = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Downloading Disabled", @"")
+																		message:NSLocalizedString(@"Downloading songs for offline use can only be done on WiFi networks.", @"")
 															   cancelButtonItem:cancelButton otherButtonItems:dismissButton, nil];
 					[alertView show];
 					[alertView release];

=== modified file 'view_controllers/ArtistListViewController.m'
--- view_controllers/ArtistListViewController.m	2011-06-16 19:12:54 +0000
+++ view_controllers/ArtistListViewController.m	2012-02-03 20:23:18 +0000
@@ -30,13 +30,17 @@
 
 #import "ArtistListViewController.h"
 
+#import "Album.h"
+#import "ArtistUITableViewCell.h"
 #import "ArtistViewController.h"
 #import "Artist.h"
 #import "ArtistListParser.h"
+#import "Downloader.h"
 #import "NSString+Extras.h"
 
 @interface ArtistListViewController ()
-- (void)configureCell:(UITableViewCell*)cell forTableView:(UITableView*)tableView indexPath:(NSIndexPath*)indexPath;
+- (void)configureCell:(ArtistUITableViewCell*)cell forTableView:(UITableView*)tableView indexPath:(NSIndexPath*)indexPath;
+- (void)downloadArtist:(UILongPressGestureRecognizer*)sender;
 @end
 
 @implementation ArtistListViewController
@@ -54,6 +58,36 @@
     return nav;
 }
 
+- (void)downloadArtist:(UILongPressGestureRecognizer *)sender;
+{
+    if ((sender.state == UIGestureRecognizerStateBegan) && canCache)
+	{
+		Artist *artist = ((ArtistUITableViewCell *)sender.view).artist;
+		dispatch_queue_t dispatch_queue = dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0);
+		dispatch_async(dispatch_queue, ^{
+			[artist loadAlbums];
+			for (Album *album in [artist albums])
+			{
+				dispatch_async(dispatch_get_main_queue(), ^{
+					[album loadSongs];
+					for (Song *song in [album songs])
+					{
+						if (![song cachedSongExists])
+						{
+							[[Downloader sharedDownloader] downloadFile:[[Subsonic sharedSubsonic] getStreamingURLForSongId:song.songId] withName:song.songId completionBlock:^(NSString *path) {
+								dispatch_async(dispatch_get_main_queue(), ^(void) {
+									song.cachedSongPath = path;
+									SaveContext();
+								});
+							}];
+						}
+					}
+				});
+			}
+		});
+	}
+}
+
 #pragma mark - Data Loading
 
 - (void)loadLocalData
@@ -94,7 +128,7 @@
 {
 	[super updateReachability:reachability];
 	
-	for (UITableViewCell *cell in [self.tableView visibleCells])
+	for (ArtistUITableViewCell *cell in [self.tableView visibleCells])
 	{
 		[self configureCell:cell forTableView:self.tableView indexPath:[self.tableView indexPathForCell:cell]];
 	}
@@ -106,16 +140,16 @@
 {
 	static NSString *CellIdentifier = @"Cell";
 	
-	UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:CellIdentifier];
+	ArtistUITableViewCell *cell = (ArtistUITableViewCell *)[tableView dequeueReusableCellWithIdentifier:CellIdentifier];
 	if (nil == cell)
 	{
-		cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:CellIdentifier] autorelease];
+		cell = [[[ArtistUITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:CellIdentifier] autorelease];
 	}
 	[self configureCell:cell forTableView:tableView indexPath:indexPath];
 	return cell;
 }
 
-- (void)configureCell:(UITableViewCell*)cell forTableView:(UITableView*)tableView indexPath:(NSIndexPath*)indexPath
+- (void)configureCell:(ArtistUITableViewCell*)cell forTableView:(UITableView*)tableView indexPath:(NSIndexPath*)indexPath
 {
 	Artist *artist = nil;
 	if (self.searchDisplayController.searchResultsTableView == tableView)
@@ -137,6 +171,7 @@
 			cell.accessoryType = (canStream || [artist hasCachedSongs]) ? UITableViewCellAccessoryDisclosureIndicator : UITableViewCellAccessoryNone;
         }
 	}
+	cell.artist = artist;
 	
 	cell.textLabel.text = artist.name;
 	if (canStream || [artist hasCachedSongs])
@@ -147,6 +182,12 @@
 	{
 		cell.textLabel.textColor = [UIColor lightGrayColor];
 	}
+
+//	UILongPressGestureRecognizer *longPressGesture = [[UILongPressGestureRecognizer alloc] initWithTarget:self action:@selector(downloadArtist:)];
+//	longPressGesture.minimumPressDuration = 1.0f;
+//	longPressGesture.numberOfTouchesRequired = 1;
+//	[cell addGestureRecognizer:longPressGesture];
+//	[longPressGesture release];
 }
 
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath 

=== modified file 'view_controllers/ArtistViewController.m'
--- view_controllers/ArtistViewController.m	2011-06-21 17:04:19 +0000
+++ view_controllers/ArtistViewController.m	2012-02-03 20:23:18 +0000
@@ -33,11 +33,13 @@
 #import "AlbumUITableViewCell.h"
 #import "Artist.h"
 #import "Album.h"
+#import "Downloader.h"
 #import "Song.h"
 
 
 @interface ArtistViewController ()
 - (void)configureCell:(UITableViewCell*)cell forAlbumAtIndexPath:(NSIndexPath*)indexPath;
+- (void)downloadAlbum:(UILongPressGestureRecognizer*)sender;
 @end
 
 
@@ -60,7 +62,7 @@
     [super viewDidLoad];
 	self.tableView.rowHeight = 60.0f;
 	self.title = self.artist.name;
-
+	
 	loader = [[AlbumArtLoader alloc] init];
 	loader.delegate = self;
 	loader.imageSize = 120;
@@ -100,6 +102,30 @@
 	[self.tableView reloadData];
 }
 
+- (void)downloadAlbum:(UILongPressGestureRecognizer *)sender;
+{
+    if ((sender.state == UIGestureRecognizerStateBegan) && canCache)
+	{
+		Album *album = ((AlbumUITableViewCell *)sender.view).album;
+		dispatch_queue_t dispatch_queue = dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0);
+		dispatch_async(dispatch_queue, ^{
+			[album loadSongs];
+			for (Song *song in [album songs])
+			{
+				if (![song cachedSongExists])
+				{
+					[[Downloader sharedDownloader] downloadFile:[[Subsonic sharedSubsonic] getStreamingURLForSongId:song.songId] withName:song.songId completionBlock:^(NSString *path) {
+						dispatch_async(dispatch_get_main_queue(), ^(void) {
+							song.cachedSongPath = path;
+							SaveContext();
+						});
+					}];
+				}
+			}
+		});
+	}
+}
+
 - (void)beginLoadingRemoteData:(NSString*)force
 {
 	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
@@ -199,6 +225,7 @@
 	if (0 == indexPath.section)
 	{
 		Album *album = [self.albums objectAtIndex:indexPath.row];
+		cell.album = album;
 		cell.albumNameLabel.text = album.title;
 
         NSError *error = nil;
@@ -226,6 +253,12 @@
 		Song *song = [self.songs objectAtIndex:indexPath.row];
 		cell.textLabel.text = song.title;
 	}
+
+	UILongPressGestureRecognizer *longPressGesture = [[UILongPressGestureRecognizer alloc] initWithTarget:self action:@selector(downloadAlbum:)];
+	longPressGesture.minimumPressDuration = 1.0f;
+	longPressGesture.numberOfTouchesRequired = 1;
+//	[cell addGestureRecognizer:longPressGesture];
+	[longPressGesture release];
 }
 
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath

=== modified file 'view_controllers/PlaylistListViewController.m'
--- view_controllers/PlaylistListViewController.m	2011-06-21 17:04:19 +0000
+++ view_controllers/PlaylistListViewController.m	2012-02-03 20:23:18 +0000
@@ -18,13 +18,20 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #import "PlaylistListViewController.h"
+
+#import "Downloader.h"
 #import "PlaylistViewController.h"
 #import "PlaylistEditViewController.h"
 #import "PlaylistListParser.h"
+#import "PlaylistUITableViewCell.h"
 #import "Playlist.h"
 #import "CachedSongsPlaylist.h"
 #import "AlertPrompt.h"
 
+@interface PlaylistListViewController ()
+- (void)downloadPlaylist:(UILongPressGestureRecognizer*)sender;
+@end
+
 @implementation PlaylistListViewController
 
 + (UINavigationController *)navigableViewController
@@ -61,6 +68,30 @@
     return self;
 }
 
+- (void)downloadPlaylist:(UILongPressGestureRecognizer *)sender;
+{
+    if ((sender.state == UIGestureRecognizerStateBegan) && canCache)
+	{
+		Playlist *playlist = ((PlaylistUITableViewCell *)sender.view).playlist;
+		dispatch_queue_t dispatch_queue = dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0);
+		dispatch_async(dispatch_queue, ^{
+			[playlist loadSongs];
+			for (Song *song in [playlist songs])
+			{
+				if (![song cachedSongExists])
+				{
+					[[Downloader sharedDownloader] downloadFile:[[Subsonic sharedSubsonic] getStreamingURLForSongId:song.songId] withName:song.songId completionBlock:^(NSString *path) {
+						dispatch_async(dispatch_get_main_queue(), ^(void) {
+							song.cachedSongPath = path;
+							SaveContext();
+						});
+					}];
+				}
+			}
+		});
+	}
+}
+
 #pragma mark - Data Loading
 
 - (void)loadLocalData
@@ -93,10 +124,10 @@
 {
 	static NSString *CellIdentifier = @"Cell";
 	
-	UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:CellIdentifier];
+	PlaylistUITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:CellIdentifier];
 	if (nil == cell)
 	{
-		cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:CellIdentifier] autorelease];
+		cell = [[[PlaylistUITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:CellIdentifier] autorelease];
 	}
 	
 	cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
@@ -111,7 +142,17 @@
 		p = [self.tableData objectAtIndex:indexPath.row]; 
 	}
 	
+	cell.playlist = p;
 	cell.textLabel.text = p.name;
+	
+//	if (p.playlistId != nil)
+//	{
+//		UILongPressGestureRecognizer *longPressGesture = [[UILongPressGestureRecognizer alloc] initWithTarget:self action:@selector(downloadPlaylist:)];
+//		longPressGesture.minimumPressDuration = 1.0f;
+//		longPressGesture.numberOfTouchesRequired = 1;
+//		[cell addGestureRecognizer:longPressGesture];
+//		[longPressGesture release];
+//	}
 	return cell;
 }
 

=== modified file 'view_controllers/PlaylistViewController.m'
--- view_controllers/PlaylistViewController.m	2011-11-05 00:42:21 +0000
+++ view_controllers/PlaylistViewController.m	2012-02-03 20:23:18 +0000
@@ -86,7 +86,7 @@
 		[self.songs removeAllObjects];
 		if ([self.playlist isKindOfClass:[NSManagedObject class]])
 			[PerThreadManagedObjectContext() refreshObject:self.playlist mergeChanges:YES]; //force the playlist to reload its set of songs from the persistent store.
-		[self.songs addObjectsFromArray:self.playlist.songs];
+		[self.songs addObjectsFromArray:[self.playlist songs]];
         // this should sort based on something else (like the index on the playlist or something)
 //		[self.songs sortUsingSelector:@selector(compare:)];
 	}

=== modified file 'xibs/MainWindow.xib'
--- xibs/MainWindow.xib	2011-11-01 15:14:34 +0000
+++ xibs/MainWindow.xib	2012-02-03 20:23:18 +0000
@@ -47,7 +47,6 @@
 				<object class="NSPSMatrix" key="NSFrameMatrix"/>
 				<string key="NSFrameSize">{320, 480}</string>
 				<reference key="NSSuperview"/>
-				<reference key="NSNextKeyView"/>
 				<object class="NSColor" key="IBUIBackgroundColor">
 					<int key="NSColorSpace">1</int>
 					<bytes key="NSRGB">MSAxIDEAA</bytes>
@@ -169,7 +168,6 @@
 					<int key="NSvFlags">266</int>
 					<string key="NSFrame">{{0, 431}, {320, 49}}</string>
 					<reference key="NSSuperview"/>
-					<reference key="NSNextKeyView"/>
 					<object class="NSColor" key="IBUIBackgroundColor">
 						<int key="NSColorSpace">3</int>
 						<bytes key="NSWhite">MCAwAA</bytes>