diff --git a/Plugins/ArchiveSource/ArchiveSource/ArchiveContainer.h b/Plugins/ArchiveSource/ArchiveSource/ArchiveContainer.h index 774ffedb9..801475c0a 100644 --- a/Plugins/ArchiveSource/ArchiveSource/ArchiveContainer.h +++ b/Plugins/ArchiveSource/ArchiveSource/ArchiveContainer.h @@ -13,4 +13,7 @@ @interface ArchiveContainer : NSObject { } +// The unpack:// URL of `file` in `archive`, as ArchiveSource opens it. ++ (NSURL *)urlForFile:(NSString *)file inArchive:(NSString *)archive; + @end diff --git a/Plugins/ArchiveSource/ArchiveSource/ArchiveContainer.m b/Plugins/ArchiveSource/ArchiveSource/ArchiveContainer.m index 8bee33f70..cb9dc7f3a 100644 --- a/Plugins/ArchiveSource/ArchiveSource/ArchiveContainer.m +++ b/Plugins/ArchiveSource/ArchiveSource/ArchiveContainer.m @@ -49,6 +49,10 @@ + (void)initialize { fex_init(); } ++ (NSURL *)urlForFile:(NSString *)file inArchive:(NSString *)archive { + return [NSURL URLWithDataRepresentation:[g_make_unpack_path(archive, file, @"fex") dataUsingEncoding:NSUTF8StringEncoding] relativeToURL:nil]; +} + + (NSArray *)urlsForContainerURL:(NSURL *)url { if(![url isFileURL]) { return @[]; @@ -79,7 +83,7 @@ + (NSArray *)urlsForContainerURL:(NSURL *)url { NSString *name = guess_encoding_of_string(fex_name(fex)); NSString *type = [[name pathExtension] lowercaseString]; if(![playlistTypes containsObject:type] && [[NSClassFromString(@"AudioPlayer") fileTypes] containsObject:type]) - [files addObject:[NSURL URLWithDataRepresentation:[g_make_unpack_path([url path], name, @"fex") dataUsingEncoding:NSUTF8StringEncoding] relativeToURL:nil]]; + [files addObject:[self urlForFile:name inArchive:[url path]]]; fex_next(fex); } @@ -87,6 +91,15 @@ + (NSArray *)urlsForContainerURL:(NSURL *)url { [sandboxBroker endFolderAccess:sbHandle]; + // What a container lists is not opened again, so an archive holding one + // file with several tracks, a rip of an NSF or GBS, say, lists its tracks + // here. Archives of several files are left as they were. + if([files count] == 1) { + NSArray *tracks = [NSClassFromString(@"AudioContainer") urlsForContainerURL:files[0]]; + if([tracks count] > 1) + return tracks; + } + return files; } diff --git a/Plugins/ArchiveSource/ArchiveSource/ArchiveSource.m b/Plugins/ArchiveSource/ArchiveSource/ArchiveSource.m index fdc29c313..8aeec5961 100644 --- a/Plugins/ArchiveSource/ArchiveSource/ArchiveSource.m +++ b/Plugins/ArchiveSource/ArchiveSource/ArchiveSource.m @@ -8,6 +8,8 @@ #import "ArchiveSource.h" +#import "ArchiveContainer.h" + #import "SandboxBroker.h" #import "Logging.h" @@ -60,6 +62,26 @@ static BOOL g_parse_unpack_path(NSString *src, NSString **archive, NSString **fi return YES; } +// The archive and the file in it that `url` names, its fragment (the track of +// a file with several) left off. +static BOOL g_parse_unpack_url(NSURL *url, NSString **archive, NSString **file) { + NSString *urlString = [url absoluteString]; + if([url fragment]) + urlString = [urlString substringToIndex:[urlString rangeOfString:@"#" options:NSBackwardsSearch].location]; + + NSString *type; + if(!g_parse_unpack_path([urlString stringByRemovingPercentEncoding], archive, file, &type)) + return NO; + + if(![type isEqualToString:@"fex"]) + return NO; + + /* An unpack:// URL stored before archive paths were normalized can still + * carry a file reference, which fex_open() cannot use. */ + *archive = CogNormalizeFilePath(*archive); + return YES; +} + @implementation ArchiveSource - (id)init { @@ -73,22 +95,12 @@ - (id)init { - (BOOL)open:(NSURL *)url { [self setURL:url]; - NSString *urlDecoded = [[url absoluteString] stringByRemovingPercentEncoding]; - - NSString *type; NSString *archive; NSString *file; - if(!g_parse_unpack_path(urlDecoded, &archive, &file, &type)) + if(!g_parse_unpack_url(url, &archive, &file)) return NO; - if(![type isEqualToString:@"fex"]) - return NO; - - /* An unpack:// URL stored before archive paths were normalized can still - * carry a file reference, which fex_open() cannot use. */ - archive = CogNormalizeFilePath(archive); - id sandboxBrokerClass = NSClassFromString(@"SandboxBroker"); id sandboxBroker = [sandboxBrokerClass sharedSandboxBroker]; @@ -172,6 +184,39 @@ - (void)close { } } +- (NSDictionary *)filesBesideURL:(NSURL *)url { + NSString *archive; + NSString *file; + + if(!g_parse_unpack_url(url, &archive, &file)) + return nil; + + NSString *folder = [file stringByDeletingLastPathComponent]; + + id sandboxBrokerClass = NSClassFromString(@"SandboxBroker"); + id sandboxBroker = [sandboxBrokerClass sharedSandboxBroker]; + + const void *handle = [sandboxBroker beginFolderAccess:[NSURL fileURLWithPath:archive]]; + + NSMutableDictionary *files = [NSMutableDictionary dictionary]; + + // Its own handle, since moving this source's would free the data it reads. + fex_t *listing; + if(!fex_open(&listing, [archive UTF8String])) { + while(!fex_done(listing)) { + NSString *name = guess_encoding_of_string(fex_name(listing)); + if([[name stringByDeletingLastPathComponent] isEqualToString:folder]) + files[[name lastPathComponent]] = [ArchiveContainer urlForFile:name inArchive:archive]; + fex_next(listing); + } + fex_close(listing); + } + + [sandboxBroker endFolderAccess:handle]; + + return files; +} + - (NSURL *)url { return _url; }