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

Tag Reading: Better handle tag names with periods

Browse source 
Oops, I forgot that Cocoa KVO treats key names with periods in them as a
special case, assuming that each dotted word is a separate nested object
from the others. Work around this by using Unicode character replacement
that will hopefully dodge the issue.

Signed-off-by: Christopher Snowhill <kode54@gmail.com>
This commit is contained in:
Christopher Snowhill 2025-06-07 05:43:26 -07:00
parent 6e655bf4b1
commit d4fec5c70e
1 changed files with 22 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
Playlist/PlaylistEntry.m
View file

@ -21,6 +21,16 @@ extern NSMutableDictionary<NSString *, AlbumArtwork *> *kArtworkDictionary;
@implementation PlaylistEntry (Extension) @implementation PlaylistEntry (Extension)
// The following is needed for handling any tag names with periods in them, as KVE wants to treat these as nested objects
// Let's hack in U+2024 and hope nobody notices!
+ (NSString *)keyForMetaTag:(NSString *)tagName {
return [tagName stringByReplacingOccurrencesOfString:@"." withString:@"․"];
}
+ (NSString *)metaTagForKey:(NSString *)key {
return [key stringByReplacingOccurrencesOfString:@"․" withString:@"."];
}
// The following read-only keys depend on the values of other properties // The following read-only keys depend on the values of other properties
+ (NSSet *)keyPathsForValuesAffectingUrl { + (NSSet *)keyPathsForValuesAffectingUrl {
@ -523,7 +533,8 @@ NSURL *_Nullable urlForPath(NSString *_Nullable path) {
} }
self.volume = 1; self.volume = 1;
for(NSString *key in metadata) { for(NSString *key in metadata) {
NSString *lowerKey = [key lowercaseString]; NSString *tagName = [PlaylistEntry metaTagForKey:key];
NSString *lowerKey = [tagName lowercaseString];
id valueObj = [metadata objectForKey:key]; id valueObj = [metadata objectForKey:key];
NSArray *values = nil; NSArray *values = nil;
NSString *firstValue = nil; NSString *firstValue = nil;
@ -582,7 +593,7 @@ NSURL *_Nullable urlForPath(NSString *_Nullable path) {
} else if([lowerKey isEqualToString:@"albumart"]) { } else if([lowerKey isEqualToString:@"albumart"]) {
self.albumArt = dataValue; self.albumArt = dataValue;
} else { } else {
[metaDict setObject:values forKey:lowerKey]; [metaDict setObject:values forKey:key];
} }
} }
self.metadataBlob = [NSDictionary dictionaryWithDictionary:metaDict]; self.metadataBlob = [NSDictionary dictionaryWithDictionary:metaDict];
@ -862,8 +873,9 @@ NSURL *_Nullable urlForPath(NSString *_Nullable path) {
if(metaObj && [metaObj isKindOfClass:[NSDictionary class]]) { if(metaObj && [metaObj isKindOfClass:[NSDictionary class]]) {
NSDictionary *metaDict = (NSDictionary *)metaObj; NSDictionary *metaDict = (NSDictionary *)metaObj;
NSString *realKey = [PlaylistEntry keyForMetaTag:tagName];
NSArray *values = [metaDict objectForKey:tagName]; NSArray *values = [metaDict objectForKey:realKey];
if(values) { if(values) {
return [values componentsJoinedByString:@", "]; return [values componentsJoinedByString:@", "];
@ -883,8 +895,9 @@ NSURL *_Nullable urlForPath(NSString *_Nullable path) {
if(metaObj && [metaObj isKindOfClass:[NSDictionary class]]) { if(metaObj && [metaObj isKindOfClass:[NSDictionary class]]) {
NSDictionary *metaDict = (NSDictionary *)metaObj; NSDictionary *metaDict = (NSDictionary *)metaObj;
NSMutableDictionary *metaDictCopy = [metaDict mutableCopy]; NSMutableDictionary *metaDictCopy = [metaDict mutableCopy];
NSString *realKey = [PlaylistEntry keyForMetaTag:tagName];
[metaDictCopy removeObjectForKey:tagName]; [metaDictCopy removeObjectForKey:realKey];
self.metadataBlob = [NSDictionary dictionaryWithDictionary:metaDictCopy]; self.metadataBlob = [NSDictionary dictionaryWithDictionary:metaDictCopy];
} }
@ -903,8 +916,9 @@ NSURL *_Nullable urlForPath(NSString *_Nullable path) {
if(metaObj && [metaObj isKindOfClass:[NSDictionary class]]) { if(metaObj && [metaObj isKindOfClass:[NSDictionary class]]) {
NSDictionary *metaDict = (NSDictionary *)metaObj; NSDictionary *metaDict = (NSDictionary *)metaObj;
NSMutableDictionary *metaDictCopy = [metaDict mutableCopy]; NSMutableDictionary *metaDictCopy = [metaDict mutableCopy];
NSString *realKey = [PlaylistEntry keyForMetaTag:tagName];
[metaDictCopy setObject:values forKey:tagName]; [metaDictCopy setObject:values forKey:realKey];
self.metadataBlob = [NSDictionary dictionaryWithDictionary:metaDictCopy]; self.metadataBlob = [NSDictionary dictionaryWithDictionary:metaDictCopy];
} }
@ -916,8 +930,9 @@ NSURL *_Nullable urlForPath(NSString *_Nullable path) {
if(metaObj && [metaObj isKindOfClass:[NSDictionary class]]) { if(metaObj && [metaObj isKindOfClass:[NSDictionary class]]) {
NSDictionary *metaDict = (NSDictionary *)metaObj; NSDictionary *metaDict = (NSDictionary *)metaObj;
NSMutableDictionary *metaDictCopy = [metaDict mutableCopy]; NSMutableDictionary *metaDictCopy = [metaDict mutableCopy];
NSString *realKey = [PlaylistEntry keyForMetaTag:tagName];
NSArray *values = [metaDictCopy objectForKey:tagName]; NSArray *values = [metaDictCopy objectForKey:realKey];
NSMutableArray *valuesCopy; NSMutableArray *valuesCopy;
if(values) { if(values) {
valuesCopy = [values mutableCopy]; valuesCopy = [values mutableCopy];
@ -926,7 +941,7 @@ NSURL *_Nullable urlForPath(NSString *_Nullable path) {
} }
[valuesCopy addObject:value]; [valuesCopy addObject:value];
values = [NSArray arrayWithArray:valuesCopy]; values = [NSArray arrayWithArray:valuesCopy];
[metaDictCopy setObject:values forKey:tagName]; [metaDictCopy setObject:values forKey:realKey];
self.metadataBlob = [NSDictionary dictionaryWithDictionary:metaDictCopy]; self.metadataBlob = [NSDictionary dictionaryWithDictionary:metaDictCopy];
} }