ObjFW  Check-in [a8bc0b31d0]

Overview
Comment:+[URIForFile{ -> Path}:inArchive{ -> WithURI}:]
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: a8bc0b31d01e8ad0f91fafb6ffbe46b43b1636a7b6f5821ce5d2fcdbf85c1948
User & Date: js on 2022-10-11 00:28:23
Other Links: manifest | tags
Context
2022-10-11
19:27
OFURI: Make scheme and path nonnull check-in: 3e455c4839 user: js tags: trunk
00:28
+[URIForFile{ -> Path}:inArchive{ -> WithURI}:] check-in: a8bc0b31d0 user: js tags: trunk
00:18
OFURI: Remove percentEncodedScheme check-in: 13ead1212f user: js tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Modified src/OFLHAArchive.h from [2fb649d2fb] to [d69e07845d].

︙︙
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98

+ (instancetype)archiveWithURI: (OFURI *)URI mode: (OFString *)mode;

/**
 * @brief Creates a URI for accessing a the specified file within the specified
 *	  LHA archive.
 *
 * @param path The path of the file within the archive
 * @param archive The URI of the archive
 * @return A URI for accessing the specified file within the specified LHA
 *	   archive
 */
+ (OFURI *)URIForFile: (OFString *)path inArchive: (OFURI *)archive;

- (instancetype)init OF_UNAVAILABLE;

/**
 * @brief Initializes an already allocated OFLHAArchive object with the
 *	  specified stream.
 *








|



|








80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98

+ (instancetype)archiveWithURI: (OFURI *)URI mode: (OFString *)mode;

/**
 * @brief Creates a URI for accessing a the specified file within the specified
 *	  LHA archive.
 *
 * @param path The path of the file within the archive
 * @param URI The URI of the archive
 * @return A URI for accessing the specified file within the specified LHA
 *	   archive
 */
+ (OFURI *)URIForFilePath: (OFString *)path inArchiveWithURI: (OFURI *)URI;

- (instancetype)init OF_UNAVAILABLE;

/**
 * @brief Initializes an already allocated OFLHAArchive object with the
 *	  specified stream.
 *
︙︙

Modified src/OFLHAArchive.m from [4f2f21f0fa] to [fa04eb799a].

︙︙
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105

}

+ (instancetype)archiveWithURI: (OFURI *)URI mode: (OFString *)mode
{
	return [[[self alloc] initWithURI: URI mode: mode] autorelease];
}

+ (OFURI *)URIForFile: (OFString *)path inArchive: (OFURI *)archive
{
	return OFArchiveURIHandlerURIForFileInArchive(@"lha", path, archive);
}

- (instancetype)init
{
	OF_INVALID_INIT_METHOD
}









|

|








89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105

}

+ (instancetype)archiveWithURI: (OFURI *)URI mode: (OFString *)mode
{
	return [[[self alloc] initWithURI: URI mode: mode] autorelease];
}

+ (OFURI *)URIForFilePath: (OFString *)path inArchiveWithURI: (OFURI *)URI
{
	return OFArchiveURIHandlerURIForFileInArchive(@"lha", path, URI);
}

- (instancetype)init
{
	OF_INVALID_INIT_METHOD
}
︙︙

Modified src/OFTarArchive.h from [d7ca0d5892] to [4a06438b7d].

︙︙
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102

+ (instancetype)archiveWithURI: (OFURI *)URI mode: (OFString *)mode;

/**
 * @brief Creates a URI for accessing a the specified file within the specified
 *	  tar archive.
 *
 * @param path The path of the file within the archive
 * @param archive The URI of the archive
 * @return A URI for accessing the specified file within the specified tar
 *	   archive
 */
+ (OFURI *)URIForFile: (OFString *)path inArchive: (OFURI *)archive;

- (instancetype)init OF_UNAVAILABLE;

/**
 * @brief Initializes an already allocated OFTarArchive object with the
 *	  specified stream.
 *








|



|








84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102

+ (instancetype)archiveWithURI: (OFURI *)URI mode: (OFString *)mode;

/**
 * @brief Creates a URI for accessing a the specified file within the specified
 *	  tar archive.
 *
 * @param path The path of the file within the archive
 * @param URI The URI of the archive
 * @return A URI for accessing the specified file within the specified tar
 *	   archive
 */
+ (OFURI *)URIForFilePath: (OFString *)path inArchiveWithURI: (OFURI *)URI;

- (instancetype)init OF_UNAVAILABLE;

/**
 * @brief Initializes an already allocated OFTarArchive object with the
 *	  specified stream.
 *
︙︙

Modified src/OFTarArchive.m from [e86038baec] to [8086f04e85].

︙︙
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91

}

+ (instancetype)archiveWithURI: (OFURI *)URI mode: (OFString *)mode
{
	return [[[self alloc] initWithURI: URI mode: mode] autorelease];
}

+ (OFURI *)URIForFile: (OFString *)path inArchive: (OFURI *)archive
{
	return OFArchiveURIHandlerURIForFileInArchive(@"tar", path, archive);
}

- (instancetype)init
{
	OF_INVALID_INIT_METHOD
}









|

|








75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91

}

+ (instancetype)archiveWithURI: (OFURI *)URI mode: (OFString *)mode
{
	return [[[self alloc] initWithURI: URI mode: mode] autorelease];
}

+ (OFURI *)URIForFilePath: (OFString *)path inArchiveWithURI: (OFURI *)URI
{
	return OFArchiveURIHandlerURIForFileInArchive(@"tar", path, URI);
}

- (instancetype)init
{
	OF_INVALID_INIT_METHOD
}
︙︙

Modified src/OFZIPArchive.h from [2297e4dbb2] to [f20f6f1fc0].

︙︙
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111

+ (instancetype)archiveWithURI: (OFURI *)URI mode: (OFString *)mode;

/**
 * @brief Creates a URI for accessing a the specified file within the specified
 *	  ZIP archive.
 *
 * @param path The path of the file within the archive
 * @param archive The URI of the archive
 * @return A URI for accessing the specified file within the specified ZIP
 *	   archive
 */
+ (OFURI *)URIForFile: (OFString *)path inArchive: (OFURI *)archive;

- (instancetype)init OF_UNAVAILABLE;

/**
 * @brief Initializes an already allocated OFZIPArchive object with the
 *	  specified stream.
 *








|



|








93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111

+ (instancetype)archiveWithURI: (OFURI *)URI mode: (OFString *)mode;

/**
 * @brief Creates a URI for accessing a the specified file within the specified
 *	  ZIP archive.
 *
 * @param path The path of the file within the archive
 * @param URI The URI of the archive
 * @return A URI for accessing the specified file within the specified ZIP
 *	   archive
 */
+ (OFURI *)URIForFilePath: (OFString *)path inArchiveWithURI: (OFURI *)URI;

- (instancetype)init OF_UNAVAILABLE;

/**
 * @brief Initializes an already allocated OFZIPArchive object with the
 *	  specified stream.
 *
︙︙

Modified src/OFZIPArchive.m from [7434ba6daa] to [3d9576934f].

︙︙
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186

}

+ (instancetype)archiveWithURI: (OFURI *)URI mode: (OFString *)mode
{
	return [[[self alloc] initWithURI: URI mode: mode] autorelease];
}

+ (OFURI *)URIForFile: (OFString *)path inArchive: (OFURI *)archive
{
	return OFArchiveURIHandlerURIForFileInArchive(@"zip", path, archive);
}

- (instancetype)init
{
	OF_INVALID_INIT_METHOD
}









|

|








170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186

}

+ (instancetype)archiveWithURI: (OFURI *)URI mode: (OFString *)mode
{
	return [[[self alloc] initWithURI: URI mode: mode] autorelease];
}

+ (OFURI *)URIForFilePath: (OFString *)path inArchiveWithURI: (OFURI *)URI
{
	return OFArchiveURIHandlerURIForFileInArchive(@"zip", path, URI);
}

- (instancetype)init
{
	OF_INVALID_INIT_METHOD
}
︙︙