Differences From Artifact [688b91a007]:
- File src/OFArchiveURIHandler.m — part of check-in [55858a10bb] at 2022-10-08 23:47:33 on branch trunk — Move all archive URI handling to a single file (user: js, size: 5269) [annotate] [blame] [check-ins using]
To Artifact [99f47b2418]:
- File
src/OFArchiveURIHandler.m
— part of check-in
[9b3cae6cba]
at
2022-10-09 16:33:24
on branch trunk
— Drop of- prefix from URI schemes
It's generally uncommon to prefix those.
Additionally, it might be worthwhile to try to get those actually
registered, which requires usage. (user: js, size: 5257) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
67 68 69 70 71 72 73 | */ @throw [OFInvalidArgumentException exception]; /* * GZIP only compresses one file and thus has no path inside an * archive. */ | | | | | | 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 |
*/
@throw [OFInvalidArgumentException exception];
/*
* GZIP only compresses one file and thus has no path inside an
* archive.
*/
if ([scheme isEqual: @"gzip"]) {
stream = [OFURIHandler openItemAtURI: [OFURI URIWithString:
URI.path]
mode: @"r"];
stream = [OFGZIPStream streamWithStream: stream mode: @"r"];
goto end;
}
percentEncodedPath = URI.percentEncodedPath;
pos = [percentEncodedPath rangeOfString: @"!"].location;
if (pos == OFNotFound)
@throw [OFInvalidArgumentException exception];
archiveURI = [OFURI URIWithString:
[percentEncodedPath substringWithRange: OFMakeRange(0, pos)]
.stringByRemovingPercentEncoding];
path = [percentEncodedPath substringWithRange:
OFMakeRange(pos + 1, percentEncodedPath.length - pos - 1)]
.stringByRemovingPercentEncoding;
if ([scheme isEqual: @"lha"]) {
OFLHAArchive *archive = [OFLHAArchive archiveWithURI: archiveURI
mode: @"r"];
OFLHAArchiveEntry *entry;
while ((entry = [archive nextEntry]) != nil) {
if ([entry.fileName isEqual: path]) {
stream = [archive streamForReadingCurrentEntry];
goto end;
}
}
@throw [OFOpenItemFailedException exceptionWithURI: URI
mode: mode
errNo: ENOENT];
} else if ([scheme isEqual: @"tar"]) {
OFTarArchive *archive = [OFTarArchive archiveWithURI: archiveURI
mode: @"r"];
OFTarArchiveEntry *entry;
while ((entry = [archive nextEntry]) != nil) {
if ([entry.fileName isEqual: path]) {
stream = [archive streamForReadingCurrentEntry];
goto end;
}
}
@throw [OFOpenItemFailedException exceptionWithURI: URI
mode: mode
errNo: ENOENT];
} else if ([scheme isEqual: @"zip"]) {
OFZIPArchive *archive = [OFZIPArchive archiveWithURI: archiveURI
mode: @"r"];
stream = [archive streamForReadingFile: path];
} else
@throw [OFInvalidArgumentException exception];
|
| ︙ | ︙ |