Merge lp:~rockstar/ubuntuone-ios-music/albumart-loading into lp:~ubuntuone-ios-client-team/ubuntuone-ios-music/moriarty

[Paul Hummer]

This branch adds the album art fetching and display to the views in the places
they are prescribed. I think they're a little awkward now, but it's not
polishing time.

[Michał Karnicki (karni)]

review: Approve

=== modified file 'Music/AppDelegate.h'
--- Music/AppDelegate.h	2013-01-02 23:52:23 +0000
+++ Music/AppDelegate.h	2013-01-02 23:52:23 +0000
@@ -16,8 +16,12 @@
 @property (readonly, strong, nonatomic) NSManagedObjectModel *managedObjectModel;
 @property (readonly, strong, nonatomic) NSPersistentStoreCoordinator *persistentStoreCoordinator;
 
+@property (nonatomic, retain) NSOperationQueue *queue;
+
 - (void)saveContext;
 - (NSURL *)applicationDocumentsDirectory;
+- (NSURL *)applicationCachesDirectory;
+- (NSURL *)albumArtDirectory;
 
 + (AppDelegate *)delegate;
 

=== modified file 'Music/AppDelegate.m'
--- Music/AppDelegate.m	2013-01-02 23:52:23 +0000
+++ Music/AppDelegate.m	2013-01-02 23:52:23 +0000
@@ -38,6 +38,7 @@
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
 
+    self.queue = [[NSOperationQueue alloc] init];
     self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
     
     /* rockstar - WTF? This should just work with the target settings. */
@@ -172,11 +173,26 @@
 #pragma mark - Application's Documents directory
 
 // Returns the URL to the application's Documents directory.
-- (NSURL *)applicationDocumentsDirectory
-{
+- (NSURL *)applicationDocumentsDirectory {
     return [[[NSFileManager defaultManager] URLsForDirectory:NSDocumentDirectory inDomains:NSUserDomainMask] lastObject];
 }
 
+- (NSURL *)applicationCachesDirectory {
+	return [[[NSFileManager defaultManager] URLsForDirectory:NSCachesDirectory inDomains:NSUserDomainMask] lastObject];
+}
+
+- (NSURL *)albumArtDirectory {
+	NSURL *path = [[self applicationCachesDirectory] URLByAppendingPathComponent:@"albumArt"];
+    if (![[NSFileManager defaultManager] fileExistsAtPath:[path path]]) {
+        NSError *error;
+        [[NSFileManager defaultManager] createDirectoryAtPath:[path path] withIntermediateDirectories:YES attributes:nil error:&error];
+        if (error) {
+            abort();
+        }
+    }
+    return path;
+}
+
 - (void)checkAuthentication {
     if (![[UOAuthManager sharedAuthManager] hasCredentials]) {
         UITabBarController *rootViewController = (UITabBarController *)self.window.rootViewController;

=== modified file 'Music/Categories/NSString+Extras.m'
--- Music/Categories/NSString+Extras.m	2013-01-02 23:52:23 +0000
+++ Music/Categories/NSString+Extras.m	2013-01-02 23:52:23 +0000
@@ -45,9 +45,11 @@
     return [[self dearticlizedString] substringToIndex:1];
 }
 
-- (NSString *)urlParameterEncodedString;
-{
-	NSString *result = (__bridge id)CFURLCreateStringByAddingPercentEscapes(kCFAllocatorDefault, (__bridge CFStringRef)self, NULL, (__bridge CFStringRef)@":/?#[]@!$&’()*+,;=", kCFStringEncodingUTF8);
+- (NSString *)urlParameterEncodedString {
+    CFStringRef resultRef = CFURLCreateStringByAddingPercentEscapes(kCFAllocatorDefault, (__bridge CFStringRef)self, NULL, (__bridge CFStringRef)@":/?#[]@!$&’()*+,;=", kCFStringEncodingUTF8);
+    NSString *result = [(__bridge id)resultRef copy];
+    CFRelease(resultRef);
+    
 	return result;
 }
 

=== modified file 'Music/Models/Album.h'
--- Music/Models/Album.h	2013-01-02 23:52:23 +0000
+++ Music/Models/Album.h	2013-01-02 23:52:23 +0000
@@ -16,8 +16,7 @@
 @property (nonatomic, retain) NSString *albumId;
 @property (nonatomic, retain) NSString *title;
 @property (nonatomic, retain) NSString *url;
-@property (nonatomic, retain) NSString *artUrl;
-@property (nonatomic, retain) NSString *art;
+@property (nonatomic, retain) NSString *artHash;
 
 @property (nonatomic, retain, readonly) NSString *dearticlizedTitle;
 @property (nonatomic, retain, readonly) NSString *index;
@@ -26,4 +25,5 @@
 @property (nonatomic, retain, readonly) Artist *artist;
 
 @property (nonatomic, retain) NSSet *songs;
+
 @end

=== modified file 'Music/Models/Album.m'
--- Music/Models/Album.m	2013-01-02 23:52:23 +0000
+++ Music/Models/Album.m	2013-01-02 23:52:23 +0000
@@ -11,13 +11,13 @@
 #import <RestKit/CoreData.h>
 #import "Artist.h"
 #import "NSString+Extras.h"
+#import "AppDelegate.h"
 
 @implementation Album
 @dynamic albumId;
 @dynamic title;
 @dynamic url;
-@dynamic art;
-@dynamic artUrl;
+@dynamic artHash;
 @dynamic dearticlizedTitle;
 
 @synthesize index;
@@ -27,6 +27,8 @@
 
 @dynamic songs;
 
+#pragma mark - UOModel methods
+
 + (RKEntityMapping *)objectMapping {
     RKObjectManager *manager = [RKObjectManager sharedManager];
     
@@ -35,7 +37,7 @@
     [mapping addAttributeMappingsFromDictionary:@{
      @"id": @"albumId",
      @"album_url": @"url",
-     @"cover_art": @"art",
+     @"cover_art": @"artHash",
      @"album_art_url": @"artUrl",
      @"title": @"title",
      @"artist_id": @"artistId"
@@ -48,6 +50,12 @@
     return @"response.albums";
 }
 
+- (NSString *)artPath {
+    return [[[[AppDelegate delegate] albumArtDirectory] URLByAppendingPathComponent:[NSString stringWithFormat:@"album-%@.jpg", self.albumId]] path];
+}
+
+#pragma mark - Model specific methods
+
 - (void)setTitle:(NSString *)title {
     [self setPrimitiveValue:title forKey:@"title"];
     [self setValue:[[title dearticlizedString] uppercaseString] forKey:@"dearticlizedTitle"];
@@ -82,4 +90,5 @@
     return _index;
 }
 
+
 @end

=== modified file 'Music/Models/Artist.h'
--- Music/Models/Artist.h	2013-01-02 23:52:23 +0000
+++ Music/Models/Artist.h	2013-01-02 23:52:23 +0000
@@ -15,10 +15,10 @@
 @property (nonatomic, retain) NSString *artistId;
 @property (nonatomic, retain) NSString *name;
 @property (nonatomic, retain) NSString *url;
-@property (nonatomic, retain) NSString *artUrl;
 
 @property (nonatomic, retain, readonly) NSString *dearticlizedName;
 @property (nonatomic, retain, readonly) NSString *index;
 
 @property (nonatomic, retain) NSSet *albums;
+
 @end

=== modified file 'Music/Models/Artist.m'
--- Music/Models/Artist.m	2013-01-02 23:52:23 +0000
+++ Music/Models/Artist.m	2013-01-02 23:52:23 +0000
@@ -9,17 +9,19 @@
 #import "Artist.h"
 #import <RestKit/RestKit.h>
 #import "NSString+Extras.h"
+#import "AppDelegate.h"
 
 @implementation Artist
 @dynamic artistId;
 @dynamic name;
 @dynamic url;
-@dynamic artUrl;
 @dynamic albums;
 @dynamic dearticlizedName;
 
 @synthesize index;
 
+#pragma mark - UOModel methods
+
 + (RKEntityMapping *)objectMapping {
     RKObjectManager *manager = [RKObjectManager sharedManager];
     
@@ -38,6 +40,12 @@
     return @"response.artists";
 }
 
+- (NSString *)artPath {
+    return [[[[AppDelegate delegate] albumArtDirectory] URLByAppendingPathComponent:[NSString stringWithFormat:@"artist-%@.jpg", self.artistId]] path];
+}
+
+#pragma mark - Model specific methods
+
 - (void)setName:(NSString *)name {
     [self setPrimitiveValue:name forKey:@"name"];
     [self setValue:[[name dearticlizedString] uppercaseString] forKey:@"dearticlizedName"];

=== modified file 'Music/Models/Song.h'
--- Music/Models/Song.h	2013-01-02 23:52:23 +0000
+++ Music/Models/Song.h	2013-01-02 23:52:23 +0000
@@ -15,7 +15,6 @@
 @interface Song : UOModel
 
 @property (nonatomic, retain) NSString *url;
-@property (nonatomic, retain) NSString *artUrl;
 @property (nonatomic, retain) NSString *suffix;
 @property (nonatomic, retain) NSString *track;
 @property (nonatomic, retain) NSString *title;

=== modified file 'Music/Models/Song.m'
--- Music/Models/Song.m	2013-01-02 23:52:23 +0000
+++ Music/Models/Song.m	2013-01-02 23:52:23 +0000
@@ -11,11 +11,11 @@
 #import "Artist.h"
 #import "Album.h"
 #import "NSString+Extras.h"
+#import "AppDelegate.h"
 
 @implementation Song
 
 @dynamic url;
-@dynamic artUrl;
 @dynamic suffix;
 @dynamic track;
 @dynamic title;
@@ -32,11 +32,15 @@
 @dynamic dearticlizedTitle;
 
 @synthesize index;
+/* Override to fall through to album's artUrl */
+@synthesize artUrl;
 
 @dynamic album;
 @dynamic artist;
 @dynamic albumArtist;
 
+#pragma mark - UOModel methods
+
 + (RKEntityMapping *)objectMapping {
     RKObjectManager *manager = [RKObjectManager sharedManager];
     
@@ -44,7 +48,9 @@
     [mapping setIdentificationAttributes:@[@"songId"]];
     [mapping addAttributeMappingsFromDictionary:@{
      @"song_url": @"url",
+     /* Disabled, since we want to fall through to album's art.
      @"song_art_url": @"artUrl",
+      */
      @"suffix": @"suffix",
      @"track": @"track",
      @"title": @"title",
@@ -69,6 +75,16 @@
     return @"response.songs";
 }
 
+- (NSString *)artPath {
+    return self.album.artPath;
+}
+
+#pragma mark - Model specific methods
+
+- (NSString *)artUrl {
+    return self.album.artUrl;
+}
+
 - (void)setTitle:(NSString *)_title {
     [self setPrimitiveValue:_title forKey:@"title"];
     [self setValue:[[_title dearticlizedString] uppercaseString] forKey:@"dearticlizedTitle"];

=== modified file 'Music/Models/UOModel.h'
--- Music/Models/UOModel.h	2013-01-02 23:52:23 +0000
+++ Music/Models/UOModel.h	2013-01-02 23:52:23 +0000
@@ -14,4 +14,12 @@
 + (void)registerMapping;
 + (RKEntityMapping *)objectMapping;
 + (NSString *)keyPath;
+
+/* Not used for playlist */
+@property (nonatomic, retain) NSString *artUrl;
+
+/* Used for fetching art */
+@property (nonatomic, readonly) UIImage *art;
+- (NSString *)artPath;
+- (void)fetchArt:(void (^)(UIImage *))completionBlock;
 @end

=== modified file 'Music/Models/UOModel.m'
--- Music/Models/UOModel.m	2013-01-02 23:52:23 +0000
+++ Music/Models/UOModel.m	2013-01-02 23:52:23 +0000
@@ -8,9 +8,13 @@
 
 #import "UOModel.h"
 #import <RestKit/RestKit.h>
+#import "AppDelegate.h"
+#import "UOAuthManager.h"
 
 @implementation UOModel
 
+@dynamic artUrl;
+
 + (void)registerMapping {
     RKObjectManager *manager = [RKObjectManager sharedManager];
     
@@ -32,4 +36,31 @@
     return @"";
 }
 
+- (UIImage *)art {
+    NSString *path = [self artPath];
+    if (![[NSFileManager defaultManager] fileExistsAtPath:path]) {
+        return nil;
+    }
+    return [UIImage imageWithContentsOfFile:path];
+}
+
+- (void)fetchArt:(void (^)(UIImage *))completionBlock {
+    NSOperationQueue *queue = [[AppDelegate delegate] queue];
+    NSString *path = [self artPath];
+    NSURLRequest *echo = [UOAuthManager oauthRequestForPath:self.artUrl];
+    NSMutableURLRequest *request = [[NSMutableURLRequest alloc] initWithURL:[NSURL URLWithString:self.artUrl]];
+    [request setHTTPMethod:@"GET"];
+    [request addValue:[echo valueForHTTPHeaderField:@"Authorization"] forHTTPHeaderField:@"Authorization"];
+    
+    [NSURLConnection sendAsynchronousRequest:request queue:queue completionHandler:^(NSURLResponse *response, NSData *data, NSError *error) {
+        UIImage *image = [UIImage imageWithData:data];
+        [UIImageJPEGRepresentation(image, 1) writeToFile:path atomically:YES];
+        completionBlock(image);
+    }];
+}
+
+- (NSString *)artPath {
+    return nil;
+}
+
 @end

=== modified file 'Music/Storyboard_iPhone.storyboard'
--- Music/Storyboard_iPhone.storyboard	2013-01-02 23:52:23 +0000
+++ Music/Storyboard_iPhone.storyboard	2013-01-02 23:52:23 +0000
@@ -36,7 +36,7 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                         <prototypes>
-                            <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="Cell" textLabel="Wy4-11-qhh" detailTextLabel="PUO-bG-eLt" style="IBUITableViewCellStyleSubtitle" id="TCk-Kb-c61" customClass="ArtistCell">
+                            <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="Cell" textLabel="Wy4-11-qhh" detailTextLabel="PUO-bG-eLt" imageView="EvX-DO-a8s" style="IBUITableViewCellStyleSubtitle" id="TCk-Kb-c61" customClass="ArtistCell">
                                 <rect key="frame" x="0.0" y="22" width="320" height="44"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
@@ -44,19 +44,23 @@
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" text="" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Wy4-11-qhh">
-                                            <rect key="frame" x="10" y="2" width="38" height="22"/>
+                                            <rect key="frame" x="53" y="2" width="38" height="22"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <fontDescription key="fontDescription" type="boldSystem" pointSize="18"/>
                                             <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
                                             <color key="highlightedColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                                         </label>
                                         <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" text="" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="PUO-bG-eLt">
-                                            <rect key="frame" x="10" y="24" width="47" height="18"/>
+                                            <rect key="frame" x="53" y="24" width="47" height="18"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                             <color key="textColor" red="0.50196078431372548" green="0.50196078431372548" blue="0.50196078431372548" alpha="1" colorSpace="calibratedRGB"/>
                                             <color key="highlightedColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                                         </label>
+                                        <imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" image="default-album-art-120.png" id="EvX-DO-a8s">
+                                            <rect key="frame" x="0.0" y="0.0" width="43" height="43"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                        </imageView>
                                     </subviews>
                                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                 </view>
@@ -85,12 +89,32 @@
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 <prototypes>
-                                    <tableViewCell contentMode="scaleToFill" selectionStyle="blue" indentationWidth="10" reuseIdentifier="Cell" id="Y5x-0G-rno" customClass="AlbumCell">
+                                    <tableViewCell contentMode="scaleToFill" selectionStyle="blue" indentationWidth="10" reuseIdentifier="Cell" textLabel="G72-IX-jh9" detailTextLabel="VIc-Rn-YXm" imageView="F2l-py-JAO" style="IBUITableViewCellStyleSubtitle" id="Y5x-0G-rno" customClass="AlbumCell">
                                         <rect key="frame" x="0.0" y="22" width="320" height="44"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
                                             <rect key="frame" x="0.0" y="0.0" width="320" height="43"/>
                                             <autoresizingMask key="autoresizingMask"/>
+                                            <subviews>
+                                                <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" text="" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="G72-IX-jh9">
+                                                    <rect key="frame" x="53" y="2" width="38" height="22"/>
+                                                    <autoresizingMask key="autoresizingMask"/>
+                                                    <fontDescription key="fontDescription" type="boldSystem" pointSize="18"/>
+                                                    <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                                    <color key="highlightedColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+                                                </label>
+                                                <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" text="" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="VIc-Rn-YXm">
+                                                    <rect key="frame" x="53" y="24" width="47" height="18"/>
+                                                    <autoresizingMask key="autoresizingMask"/>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                                    <color key="textColor" red="0.50196078431372548" green="0.50196078431372548" blue="0.50196078431372548" alpha="1" colorSpace="calibratedRGB"/>
+                                                    <color key="highlightedColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+                                                </label>
+                                                <imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" image="default-album-art-120.png" id="F2l-py-JAO">
+                                                    <rect key="frame" x="0.0" y="0.0" width="43" height="43"/>
+                                                    <autoresizingMask key="autoresizingMask"/>
+                                                </imageView>
+                                            </subviews>
                                             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                         </view>
                                         <connections>
@@ -146,12 +170,32 @@
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 <prototypes>
-                                    <tableViewCell contentMode="scaleToFill" selectionStyle="blue" indentationWidth="10" reuseIdentifier="Cell" id="vAU-q1-3Z9" customClass="SongCell">
+                                    <tableViewCell contentMode="scaleToFill" selectionStyle="blue" indentationWidth="10" reuseIdentifier="Cell" textLabel="0Be-Uu-e1M" detailTextLabel="cgX-vu-iNg" imageView="xX5-x4-y65" style="IBUITableViewCellStyleSubtitle" id="vAU-q1-3Z9" customClass="SongCell">
                                         <rect key="frame" x="0.0" y="22" width="320" height="44"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
                                             <rect key="frame" x="0.0" y="0.0" width="320" height="43"/>
                                             <autoresizingMask key="autoresizingMask"/>
+                                            <subviews>
+                                                <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" text="" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="0Be-Uu-e1M">
+                                                    <rect key="frame" x="53" y="2" width="38" height="22"/>
+                                                    <autoresizingMask key="autoresizingMask"/>
+                                                    <fontDescription key="fontDescription" type="boldSystem" pointSize="18"/>
+                                                    <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                                    <color key="highlightedColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+                                                </label>
+                                                <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" text="" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="cgX-vu-iNg">
+                                                    <rect key="frame" x="53" y="24" width="47" height="18"/>
+                                                    <autoresizingMask key="autoresizingMask"/>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                                    <color key="textColor" red="0.50196078431372548" green="0.50196078431372548" blue="0.50196078431372548" alpha="1" colorSpace="calibratedRGB"/>
+                                                    <color key="highlightedColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+                                                </label>
+                                                <imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" image="default-album-art-120.png" id="xX5-x4-y65">
+                                                    <rect key="frame" x="0.0" y="0.0" width="43" height="43"/>
+                                                    <autoresizingMask key="autoresizingMask"/>
+                                                </imageView>
+                                            </subviews>
                                             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                         </view>
                                     </tableViewCell>
@@ -218,7 +262,7 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                         <prototypes>
-                            <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="Cell" textLabel="lHq-bS-Zm9" detailTextLabel="03B-YT-E7s" style="IBUITableViewCellStyleSubtitle" id="5s2-Qn-BOB" customClass="AlbumCell">
+                            <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="Cell" textLabel="lHq-bS-Zm9" detailTextLabel="03B-YT-E7s" imageView="apM-jL-xHe" style="IBUITableViewCellStyleSubtitle" id="5s2-Qn-BOB" customClass="AlbumCell">
                                 <rect key="frame" x="0.0" y="22" width="320" height="44"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
@@ -226,19 +270,23 @@
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" text="" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="lHq-bS-Zm9">
-                                            <rect key="frame" x="10" y="2" width="38" height="22"/>
+                                            <rect key="frame" x="53" y="2" width="38" height="22"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <fontDescription key="fontDescription" type="boldSystem" pointSize="18"/>
                                             <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
                                             <color key="highlightedColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                                         </label>
                                         <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" text="" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="03B-YT-E7s">
-                                            <rect key="frame" x="10" y="24" width="47" height="18"/>
+                                            <rect key="frame" x="53" y="24" width="47" height="18"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                             <color key="textColor" red="0.50196078431372548" green="0.50196078431372548" blue="0.50196078431372548" alpha="1" colorSpace="calibratedRGB"/>
                                             <color key="highlightedColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                                         </label>
+                                        <imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" image="default-album-art-120.png" id="apM-jL-xHe">
+                                            <rect key="frame" x="0.0" y="0.0" width="43" height="43"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                        </imageView>
                                     </subviews>
                                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                 </view>
@@ -263,7 +311,7 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                         <prototypes>
-                            <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="Cell" textLabel="OwY-7W-CUV" detailTextLabel="ORO-PT-T6b" style="IBUITableViewCellStyleSubtitle" id="jpK-Yt-5Y9" customClass="SongCell">
+                            <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="Cell" textLabel="OwY-7W-CUV" detailTextLabel="ORO-PT-T6b" imageView="Ynd-vW-pQI" style="IBUITableViewCellStyleSubtitle" id="jpK-Yt-5Y9" customClass="SongCell">
                                 <rect key="frame" x="0.0" y="22" width="320" height="44"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
@@ -271,19 +319,23 @@
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" text="" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="OwY-7W-CUV">
-                                            <rect key="frame" x="10" y="2" width="38" height="22"/>
+                                            <rect key="frame" x="53" y="2" width="38" height="22"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <fontDescription key="fontDescription" type="boldSystem" pointSize="18"/>
                                             <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
                                             <color key="highlightedColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                                         </label>
                                         <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" text="" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="ORO-PT-T6b">
-                                            <rect key="frame" x="10" y="24" width="47" height="18"/>
+                                            <rect key="frame" x="53" y="24" width="47" height="18"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                             <color key="textColor" red="0.50196078431372548" green="0.50196078431372548" blue="0.50196078431372548" alpha="1" colorSpace="calibratedRGB"/>
                                             <color key="highlightedColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                                         </label>
+                                        <imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" image="default-album-art-120.png" id="Ynd-vW-pQI">
+                                            <rect key="frame" x="0.0" y="0.0" width="43" height="43"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                        </imageView>
                                     </subviews>
                                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                 </view>
@@ -559,6 +611,7 @@
     <resources>
         <image name="albums.png" width="30" height="30"/>
         <image name="artists.png" width="30" height="30"/>
+        <image name="default-album-art-120.png" width="60" height="60"/>
         <image name="playlists.png" width="30" height="30"/>
         <image name="settings.png" width="30" height="30"/>
         <image name="songs.png" width="30" height="30"/>

=== modified file 'Music/UOMusic.xcdatamodeld/UOMusic.xcdatamodel/contents'
--- Music/UOMusic.xcdatamodeld/UOMusic.xcdatamodel/contents	2013-01-02 23:52:23 +0000
+++ Music/UOMusic.xcdatamodeld/UOMusic.xcdatamodel/contents	2013-01-02 23:52:23 +0000
@@ -2,7 +2,7 @@
 <model name="" userDefinedModelVersionIdentifier="UOMusic0" type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="1811" systemVersion="12C60" minimumToolsVersion="Xcode 4.3" macOSVersion="Automatic" iOSVersion="Automatic">
     <entity name="Album" representedClassName="Album" syncable="YES">
         <attribute name="albumId" attributeType="String" indexed="YES" syncable="YES"/>
-        <attribute name="art" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="artHash" optional="YES" attributeType="String" syncable="YES"/>
         <attribute name="artUrl" optional="YES" attributeType="String" syncable="YES"/>
         <attribute name="dearticlizedTitle" attributeType="String" syncable="YES"/>
         <attribute name="index" optional="YES" transient="YES" attributeType="String" syncable="YES"/>
@@ -12,6 +12,7 @@
         <relationship name="songs" optional="YES" toMany="YES" deletionRule="Nullify" destinationEntity="Song" inverseName="album" inverseEntity="Song" syncable="YES"/>
     </entity>
     <entity name="Artist" representedClassName="Artist" syncable="YES">
+        <attribute name="art" optional="YES" transient="YES" attributeType="Transformable" syncable="YES"/>
         <attribute name="artistId" attributeType="String" indexed="YES" syncable="YES"/>
         <attribute name="artUrl" optional="YES" attributeType="String" syncable="YES"/>
         <attribute name="dearticlizedName" attributeType="String" syncable="YES"/>
@@ -30,7 +31,6 @@
         <attribute name="url" attributeType="String" syncable="YES"/>
     </entity>
     <entity name="Song" representedClassName="Song" syncable="YES">
-        <attribute name="artUrl" optional="YES" attributeType="String" syncable="YES"/>
         <attribute name="bitRate" optional="YES" attributeType="String" syncable="YES"/>
         <attribute name="contentType" optional="YES" attributeType="String" syncable="YES"/>
         <attribute name="dearticlizedTitle" attributeType="String" syncable="YES"/>
@@ -53,8 +53,8 @@
     </entity>
     <elements>
         <element name="Album" positionX="468" positionY="180" width="128" height="180"/>
-        <element name="Artist" positionX="160" positionY="195" width="128" height="165"/>
+        <element name="Artist" positionX="160" positionY="195" width="128" height="180"/>
         <element name="Playlist" positionX="160" positionY="192" width="128" height="135"/>
-        <element name="Song" positionX="160" positionY="192" width="128" height="345"/>
+        <element name="Song" positionX="160" positionY="192" width="128" height="330"/>
     </elements>
 </model>
\ No newline at end of file

=== modified file 'Music/Utilities/UOWebServiceController.m'
--- Music/Utilities/UOWebServiceController.m	2013-01-02 23:52:23 +0000
+++ Music/Utilities/UOWebServiceController.m	2013-01-02 23:52:23 +0000
@@ -169,6 +169,7 @@
 }
 
 - (void)initRestKit {
+    RKLogConfigureByName("RestKit/Network", RKLogLevelWarning);
     
     NSURL *baseUrl = [NSURL URLWithString:@"https://one.ubuntu.com/api/music/v2/"];
     RKObjectManager *objectManager = [RKObjectManager managerWithBaseURL:baseUrl];
@@ -190,6 +191,7 @@
     NSError *error;
     [managedObjectStore addSQLitePersistentStoreAtPath:[RKApplicationDataDirectory() stringByAppendingPathComponent:@"UOMusic.sqlite"] fromSeedDatabaseAtPath:nil withConfiguration:nil options:nil error:&error];
     if (error) {
+        NSLog(@"Database model is out of date");
         abort();
     }
     [objectManager setManagedObjectStore:managedObjectStore];

=== modified file 'Music/View Controllers/AlbumViewController.m'
--- Music/View Controllers/AlbumViewController.m	2013-01-02 23:52:23 +0000
+++ Music/View Controllers/AlbumViewController.m	2013-01-02 23:52:23 +0000
@@ -38,6 +38,14 @@
     
     [_albumTitle setText:album.title];
     [_albumDescription setText:album.artist.name];
+    if (!album.art) {
+        [album fetchArt:^(UIImage *image) {
+            [self.albumArt setImage:image];
+            [self.albumArt setNeedsDisplay];
+        }];
+    } else {
+        [self.albumArt setImage:album.art];
+    }
     
     if ([album.songs count]) {
         NSArray *sortDescriptors = [NSArray arrayWithObjects:[[NSSortDescriptor alloc] initWithKey:@"track" ascending:NO], nil];

=== modified file 'Music/View Controllers/ArtistViewController.m'
--- Music/View Controllers/ArtistViewController.m	2013-01-02 23:52:23 +0000
+++ Music/View Controllers/ArtistViewController.m	2013-01-02 23:52:23 +0000
@@ -41,6 +41,14 @@
     [self fetchArtist];
     
     [_artistName setText:artist.name];
+    if (!artist.art) {
+        [artist fetchArt:^(UIImage *image) {
+            [self.albumArt setImage:image];
+            [self.albumArt setNeedsDisplay];
+        }];
+    } else {
+        [self.albumArt setImage:artist.art];
+    }
     
     NSString *pluralizedNoun = @"albums";
     if ([artist.albums count] == 1) {

=== modified file 'Music/View Controllers/Table Cells/AlbumCell.m'
--- Music/View Controllers/Table Cells/AlbumCell.m	2013-01-02 23:52:23 +0000
+++ Music/View Controllers/Table Cells/AlbumCell.m	2013-01-02 23:52:23 +0000
@@ -13,6 +13,17 @@
 
 - (void)setAlbum:(Album *)album {
     _album = album;
+    
+    if (!album.art) {
+        [self.imageView setImage:[UIImage imageNamed:@"default-album-art-120.png"]];
+        [album fetchArt:^(UIImage *image) {
+            [self.imageView setImage:image];
+            [self setNeedsDisplay];
+        }];
+    } else {
+        [self.imageView setImage:album.art];
+    }
+    
     [self.textLabel setText:album.title];
     
     [self.detailTextLabel setText:album.artist.name];

=== modified file 'Music/View Controllers/Table Cells/ArtistCell.m'
--- Music/View Controllers/Table Cells/ArtistCell.m	2013-01-02 23:52:23 +0000
+++ Music/View Controllers/Table Cells/ArtistCell.m	2013-01-02 23:52:23 +0000
@@ -14,6 +14,16 @@
 - (void)setArtist:(Artist *)artist {
     _artist = artist;
     
+    if (!artist.art) {
+        [self.imageView setImage:[UIImage imageNamed:@"default-album-art-120.png"]];
+        [artist fetchArt:^(UIImage *image) {
+            [self.imageView setImage:image];
+            [self setNeedsDisplay];
+        }];
+    } else {
+        [self.imageView setImage:artist.art];
+    }
+    
     [self.textLabel setText:artist.name];
     if ([artist.albums count] > 0) {
         NSString *pluralizedNoun = @"albums";

=== modified file 'Music/View Controllers/Table Cells/SongCell.m'
--- Music/View Controllers/Table Cells/SongCell.m	2013-01-02 23:52:23 +0000
+++ Music/View Controllers/Table Cells/SongCell.m	2013-01-02 23:52:23 +0000
@@ -7,6 +7,7 @@
 //
 
 #import "SongCell.h"
+#import "Artist.h"
 
 @implementation SongCell
 @synthesize song = _song;
@@ -14,8 +15,18 @@
 - (void)setSong:(Song *)song {
     _song = song;
     
+    if (!song.art) {
+        [self.imageView setImage:[UIImage imageNamed:@"default-album-art-120.png"]];
+        [song fetchArt:^(UIImage *image) {
+            [self.imageView setImage:image];
+            [self setNeedsDisplay];
+        }];
+    } else {
+        [self.imageView setImage:song.art];
+    }
+    
     [self.textLabel setText:song.title];
-    //[self.detailTextLabel setText:song.artist];
+    [self.detailTextLabel setText:song.artist.name];
 }
 
 @end