Merge lp:~rockstar/ubuntuone-ios-music/no-more-mogenerator into lp:ubuntuone-ios-music

[Paul Hummer]

Don't inherit from mogenerator generated classes

RestKit doesn't seem to like the mogenerator code at all. I'm trying an experiment to see if it's needed at all. Just go with it.

[Michał Karnicki (karni)]

review: Approve

=== modified file 'Models/Album.h'
--- Models/Album.h	2012-02-17 16:39:42 +0000
+++ Models/Album.h	2012-11-06 02:19:20 +0000
@@ -13,9 +13,11 @@
 //  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 {}
+#import <CoreData/CoreData.h>
+
+@class Artist;
+
+@interface Album : NSManagedObject {}
 + (BOOL)albumWithIdExists:(NSString*)anAlbumId;
 + (Album*)albumWithId:(NSString*)anAlbumId;
 + (Album*)albumWithTitle:(NSString*)albumTitle artist:(NSString*)albumArtist;
@@ -24,4 +26,11 @@
 - (NSString*)dearticlizedTitle;
 - (NSString *)idPath;
 - (BOOL)hasCachedSongs;
+
+@property (nonatomic, retain) NSString *albumId;
+@property (nonatomic, retain) NSString *artist;
+@property (nonatomic, retain) Artist* artistEntity;
+@property (nonatomic, retain) NSString *coverArtId;
+@property (nonatomic, retain) NSString *title;
+@property (nonatomic, retain) NSSet* songs;
 @end

=== modified file 'Models/Album.m'
--- Models/Album.m	2012-02-17 17:00:15 +0000
+++ Models/Album.m	2012-11-06 02:19:20 +0000
@@ -27,6 +27,13 @@
 
 @implementation Album
 
+@dynamic albumId;
+@dynamic artist;
+@dynamic artistEntity;
+@dynamic coverArtId;
+@dynamic title;
+@dynamic songs;
+
 + (BOOL)albumWithIdExists:(NSString*)anAlbumId
 {
 	return (nil != [Album albumWithId:anAlbumId]);

=== modified file 'Models/Artist.h'
--- Models/Artist.h	2012-02-17 16:39:42 +0000
+++ Models/Artist.h	2012-11-06 02:19:20 +0000
@@ -13,9 +13,11 @@
 //  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 {}
+#import <CoreData/CoreData.h>
+
+@class Album;
+
+@interface Artist : NSManagedObject {}
 + (Artist*)artistWithId:(NSString*)anArtistId;
 + (BOOL)artistWithIdExists:(NSString*)anArtistId;
 + (Artist*)artistWithName:(NSString*)artistName;
@@ -24,4 +26,9 @@
 - (NSError*)loadAlbums;
 - (NSString *)idPath;
 - (BOOL)hasCachedSongs;
+
+@property (nonatomic, retain) NSString *artistId;
+@property (nonatomic, retain) NSString *name;
+@property (nonatomic, retain) NSSet* albums;
+
 @end

=== modified file 'Models/Artist.m'
--- Models/Artist.m	2012-02-17 17:00:15 +0000
+++ Models/Artist.m	2012-11-06 02:19:20 +0000
@@ -27,6 +27,10 @@
 
 @implementation Artist
 
+@dynamic artistId;
+@dynamic name;
+@dynamic albums;
+
 + (BOOL)artistWithIdExists:(NSString*)anArtistId
 {
 	return [Artist artistWithId:anArtistId] != nil;

=== modified file 'Models/Playlist.h'
--- Models/Playlist.h	2012-01-07 04:48:49 +0000
+++ Models/Playlist.h	2012-11-06 02:19:20 +0000
@@ -13,11 +13,11 @@
 //  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 <CoreData/CoreData.h>
 
 @class Song;
 
-@interface Playlist : _Playlist {}
+@interface Playlist : NSManagedObject {}
 + (BOOL)playlistWithNameExists:(NSString*)aPlaylistName;
 + (Playlist*)playlistWithName:(NSString*)aPlaylistName;
 - (BOOL)matchesSearchQuery:(NSString *)query;
@@ -26,4 +26,8 @@
 - (BOOL)isEditable;
 - (void)addSong:(Song*)song;
 - (void)removeSong:(Song*)song;
+
+@property (nonatomic, retain) NSString *name;
+@property (nonatomic, retain) NSString *playlistId;
+@property (nonatomic, retain) NSSet* playlistSongIndexes;
 @end

=== modified file 'Models/Playlist.m'
--- Models/Playlist.m	2012-01-07 04:48:49 +0000
+++ Models/Playlist.m	2012-11-06 02:19:20 +0000
@@ -22,6 +22,10 @@
 
 @implementation Playlist
 
+@dynamic name;
+@dynamic playlistId;
+@dynamic playlistSongIndexes;
+
 + (BOOL)playlistWithNameExists:(NSString *)aPlaylistName
 {
 	return (nil != [Playlist playlistWithName:aPlaylistName]);

=== modified file 'Models/Song.h'
--- Models/Song.h	2012-02-10 17:36:20 +0000
+++ Models/Song.h	2012-11-06 02:19:20 +0000
@@ -13,13 +13,32 @@
 //  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 {}
+#import <CoreData/CoreData.h>
+
+@class Album;
+@class Artist;
+
+@interface Song : NSManagedObject {}
 + (BOOL)songWithIdExists:(NSString*)aSongId;
 + (Song*)songWithId:(NSString*)aSongId;
 - (BOOL)matchesSearchQuery:(NSString *)query;
 - (NSString *)dearticlizedTitle;
 - (BOOL)cachedSongExists;
 - (NSString*)idPath;
+
+@property (nonatomic, retain) NSString *songId;
+@property (nonatomic, retain) NSString *title;
+@property (nonatomic, retain) NSNumber *track;
+@property (nonatomic, retain) NSNumber *discNumber;
+@property (nonatomic, retain) NSString *artist;
+@property (nonatomic, retain) NSString *album;
+@property (nonatomic, retain) NSNumber *duration;
+@property (nonatomic, retain) Album *albumEntity;
+@property (nonatomic, retain) NSString *coverArtId;
+@property (nonatomic, retain) NSString *genre;
+@property (nonatomic, retain) NSString *path;
+@property (nonatomic, retain) NSNumber *bitRate;
+@property (nonatomic, retain) NSNumber *year;
+@property (nonatomic, retain) Artist *artistEntity;
+@property (nonatomic, retain) NSNumber *size;
 @end

=== modified file 'Models/Song.m'
--- Models/Song.m	2012-02-17 17:42:26 +0000
+++ Models/Song.m	2012-11-06 02:19:20 +0000
@@ -21,6 +21,22 @@
 
 @implementation Song
 
+@dynamic discNumber;
+@dynamic genre;
+@dynamic artistEntity;
+@dynamic artist;
+@dynamic path;
+@dynamic size;
+@dynamic album;
+@dynamic albumEntity;
+@dynamic bitRate;
+@dynamic track;
+@dynamic songId;
+@dynamic coverArtId;
+@dynamic year;
+@dynamic title;
+@dynamic duration;
+
 + (BOOL)songWithIdExists:(NSString*)aSongId
 {
 	return (nil != [Song songWithId:aSongId]);

=== modified file 'utilities/ArtistParser.m'
--- utilities/ArtistParser.m	2012-02-21 16:13:15 +0000
+++ utilities/ArtistParser.m	2012-11-06 02:19:20 +0000
@@ -71,7 +71,8 @@
 			{
 				album = [NSEntityDescription insertNewObjectForEntityForName:@"Album" inManagedObjectContext:PerThreadManagedObjectContext()];
 				album.albumId = albumId;
-				[artist addAlbumsObject:album];			
+                // XXX: rockstar - WTF? This method isn't implemented anywhere.
+				//[artist addAlbumsObject:album];
 			}
 			album.artist = [attributeDict nilifiedValueForKey:@"artist"];
 			album.title = [attributeDict objectForKey:@"title"];