chris/Cog
2
1
Fork 0
Code Issues 65 Pull requests Projects Releases Packages Wiki Activity Actions

XML playlist now stores and loads the playback queue

Browse source
This commit is contained in:
Chris Moeller 2013-10-10 01:43:04 -07:00
parent 7d6cfe50df
commit 8d19b2538a
3 changed files with 64 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

80
Playlist/PlaylistLoader.m
View file

@ -227,13 +227,22 @@ NSMutableDictionary * dictionaryWithPropertiesOfObject(id obj, NSArray * filterL
[dict release];
}
NSDictionary * dictionary = [NSDictionary dictionaryWithObjectsAndKeys:albumArtSet, @"albumArt", topLevel, @"items", nil];
NSMutableArray * queueList = [[NSMutableArray alloc] init];
for (PlaylistEntry *pe in [playlistController queueList])
{
[queueList addObject:[NSNumber numberWithInt:pe.index]];
}
NSDictionary * dictionary = [NSDictionary dictionaryWithObjectsAndKeys:albumArtSet, @"albumArt", queueList, @"queue", topLevel, @"items", nil];
NSData * data = [NSPropertyListSerialization dataWithPropertyList:dictionary format:NSPropertyListXMLFormat_v1_0 options:0 error:0];
[albumArtSet release];
[topLevel release];
[queueList release];
[fileHandle writeData:data];
@ -276,7 +285,7 @@ NSMutableDictionary * dictionaryWithPropertiesOfObject(id obj, NSArray * filterL
NSMutableArray *containedURLs = [NSMutableArray array];
NSMutableArray *fileURLs = [NSMutableArray array];
NSMutableArray *validURLs = [NSMutableArray array];
NSArray *xmlURLs = nil;
NSDictionary *xmlData = nil;
if (!urls)
return [NSArray array];
@ -333,7 +342,7 @@ NSMutableDictionary * dictionaryWithPropertiesOfObject(id obj, NSArray * filterL
}
else if ([[[[url path] pathExtension] lowercaseString] isEqualToString:@"xml"])
{
xmlURLs = [XmlContainer entriesForContainerURL:url];
xmlData = [XmlContainer entriesForContainerURL:url];
}
else
{
@ -378,14 +387,12 @@ NSMutableDictionary * dictionaryWithPropertiesOfObject(id obj, NSArray * filterL
//Create actual entries
int count = [validURLs count];
if (xmlURLs) count += [xmlURLs count];
if (xmlData) count += [[xmlData objectForKey:@"entries"] count];
int i;
int i = 0;
NSMutableArray *entries = [NSMutableArray arrayWithCapacity:count];
for (i = 0; i < [validURLs count]; i++)
for (NSURL *url in validURLs)
{
NSURL *url = [validURLs objectAtIndex:i];
PlaylistEntry *pe;
if ([url isFileURL])
pe = [[FilePlaylistEntry alloc] init];
@ -399,30 +406,55 @@ NSMutableDictionary * dictionaryWithPropertiesOfObject(id obj, NSArray * filterL
[entries addObject:pe];
[pe release];
++i;
}
int j = index + i;
for (i = 0; i < [xmlURLs count]; i++)
if (xmlData)
{
NSDictionary * entry = [xmlURLs objectAtIndex:i];
PlaylistEntry *pe;
if ([[entry objectForKey:@"URL"] isFileURL])
pe = [[FilePlaylistEntry alloc] init];
else
pe = [[PlaylistEntry alloc] init];
[pe setValuesForKeysWithDictionary:entry];
pe.index = index+i+[validURLs count];
pe.queuePosition = -1;
[entries addObject:pe];
[pe release];
for (NSDictionary *entry in [xmlData objectForKey:@"entries"])
{
PlaylistEntry *pe;
if ([[entry objectForKey:@"URL"] isFileURL])
pe = [[FilePlaylistEntry alloc] init];
else
pe = [[PlaylistEntry alloc] init];
[pe setValuesForKeysWithDictionary:entry];
pe.index = index+i;
pe.queuePosition = -1;
[entries addObject:pe];
[pe release];
++i;
}
}
NSIndexSet *is = [NSIndexSet indexSetWithIndexesInRange:NSMakeRange(index, [entries count])];
[playlistController insertObjects:entries atArrangedObjectIndexes:is];
if (xmlData && [[xmlData objectForKey:@"queue"] count])
{
[playlistController emptyQueueList:self];
i = 0;
for (NSNumber *index in [xmlData objectForKey:@"queue"])
{
int indexVal = [index intValue] + j;
PlaylistEntry *pe = [entries objectAtIndex:indexVal];
pe.queuePosition = i;
pe.queued = YES;
[[playlistController queueList] addObject:pe];
++i;
}
}
//Select the first entry in the group that was just added
[playlistController setSelectionIndex:index];
[self performSelectorInBackground:@selector(loadInfoForEntries:) withObject:entries];

2
Playlist/XmlContainer.h
View file

@ -14,6 +14,6 @@
+ (NSURL *)urlForPath:(NSString *)path relativeTo:(NSString *)baseFilename;
+ (NSArray *)entriesForContainerURL:(NSURL *)url;
+ (NSDictionary *)entriesForContainerURL:(NSURL *)url;
@end

13
Playlist/XmlContainer.m
View file

@ -54,7 +54,7 @@
return url;
}
+ (NSArray *)entriesForContainerURL:(NSURL *)url
+ (NSDictionary *)entriesForContainerURL:(NSURL *)url
{
if (![url isFileURL])
return [NSArray array];
@ -84,12 +84,13 @@
NSArray * items = (isArray) ? (NSArray*)plist : [(NSDictionary *)plist objectForKey:@"items"];
NSDictionary *entry;
NSDictionary *albumArt = (isArray) ? nil : [(NSDictionary *)plist objectForKey:@"albumArt"];
NSEnumerator *e = [items objectEnumerator];
NSArray *queueList = (isArray) ? [NSArray array] : [(NSDictionary *)plist objectForKey:@"queue"];
NSMutableArray *entries = [NSMutableArray array];
while ((entry = [e nextObject]))
for (NSDictionary *entry in items)
{
NSMutableDictionary * preparedEntry = [NSMutableDictionary dictionaryWithDictionary:entry];
@ -100,8 +101,8 @@
[entries addObject:[NSDictionary dictionaryWithDictionary:preparedEntry]];
}
return entries;
return [NSDictionary dictionaryWithObjectsAndKeys:entries, @"entries", queueList, @"queue", nil];
}
@end