Fixed CueSheet Year/Genre reading.
parent
ca2649d930
commit
eedc659f84
|
@ -178,15 +178,22 @@
|
||||||
else if ([command isEqualToString:@"REM"]) //Additional metadata sometimes stored in comments
|
else if ([command isEqualToString:@"REM"]) //Additional metadata sometimes stored in comments
|
||||||
{
|
{
|
||||||
NSString *type;
|
NSString *type;
|
||||||
|
if ( ![scanner scanUpToCharactersFromSet:whitespace intoString:&type]) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
if ([type isEqualToString:@"GENRE"])
|
if ([type isEqualToString:@"GENRE"])
|
||||||
{
|
{
|
||||||
|
NSLog(@"GENRE!");
|
||||||
if ([scanner scanString:@"\"" intoString:nil]) {
|
if ([scanner scanString:@"\"" intoString:nil]) {
|
||||||
|
NSLog(@"QUOTED");
|
||||||
if (![scanner scanUpToString:@"\"" intoString:&genre]) {
|
if (![scanner scanUpToString:@"\"" intoString:&genre]) {
|
||||||
|
NSLog(@"FAILED TO SCAN");
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
NSLog(@"UNQUOTED");
|
||||||
if ( ![scanner scanUpToCharactersFromSet:whitespace intoString:&genre]) {
|
if ( ![scanner scanUpToCharactersFromSet:whitespace intoString:&genre]) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
@ -194,14 +201,11 @@
|
||||||
}
|
}
|
||||||
else if ([type isEqualToString:@"DATE"])
|
else if ([type isEqualToString:@"DATE"])
|
||||||
{
|
{
|
||||||
|
NSLog(@"DATE!");
|
||||||
if ( ![scanner scanUpToCharactersFromSet:whitespace intoString:&year]) {
|
if ( ![scanner scanUpToCharactersFromSet:whitespace intoString:&year]) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
|
||||||
{
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue