mirror of
https://github.com/LisherSong/ps5-web-file-manager.git
synced 2026-10-06 08:00:23 +02:00
First release under the fork-marker convention: VERSION_TAG carries a trailing
`M`, so /api/version, the PS5 start-up notification, the stdout banner, the UI
footer and the ELF file name all read "v1.9.3M" in one move -- and a fork build
can no longer collide with an upstream artifact of the same version, a mix-up
that already happened twice. The footer carries a tooltip spelling the marker
out.
Two bodies of work.
1. Encrypted archives (ZIP / RAR / 7z)
- ZIP: ZipCrypto (traditional PKWARE) and WinZip AES-256, through
minizip-ng plus a vendored crypto layer (mz_crypt_wfm.c,
mz_strm_pkcrypt.c, mz_strm_wzaes.c).
- RAR: RARSetPassword, wired after RAROpenArchiveEx and before the first
RARReadHeaderEx. The ordering is load-bearing, not stylistic.
- 7z: 7zAES including -mhe=on encrypted headers, via a virtual
ISeekInStream that splices a pseudo-header + the real archive + the
decrypted header, so no offset stored inside the archive has to move.
A wrong password is reported as ZIPX_ERR_PASSWORD, and a failed attempt
leaves no staging directory behind.
2. Reporting, and the UI round that on-device testing produced
- A RAR whose dictionary exceeds what the build supports now gets its own
extract_dict_too_large code instead of being mis-reported as "entry too
large"; the message names both the required and the supported size. The
behaviour is deliberately unchanged -- such archives are still refused,
because admitting one means allocating the whole window up front, which
is why rarlab's own CLI refuses them by default.
- The upload entry is a menu again: one "Upload" button opening "Upload
files / Upload folder". The previous main-button-plus-small-arrow made
"upload folder" effectively undiscoverable.
- A drag-and-drop hint sits in the footer (hidden on the console browser,
where drag is not how anyone uploads).
- The extract button is now always present and merely disabled until
exactly one archive is selected, instead of appearing out of nowhere.
- Upload-and-extract on an encrypted archive now prompts for the password
directly. The retry table used to be keyed by PATH, and for a non-ASCII
directory the string the page holds and the string the server reports
are not the same bytes -- the lookup missed, so the user got a bare
error box and had to press Extract by hand before the prompt appeared.
It is now keyed by task id, which the server assigns and echoes back
verbatim.
- Error text passes through decodeFsText(), so a GBK entry name no longer
surfaces as `â®…ç§.psd`.
- Local names are encoded with encodeFsText() before being joined onto a
server-side path. fs_path_value() declines to rewrite a path if ANY code
point exceeds 0xFF, so concatenating a local name onto a server directory
produced a mixed representation and a silently dead path.
- The menu row highlight was losing the cascade to the generic button rule
(identical specificity, later in the file) while inheriting the toolbar's
3px focus ring, which overflowed a 46px row. Both rules are now scoped to
the panel and the keyboard cue is an inset ring, so it cannot escape the
row at any line height.
- The footer status line is clamped to a single line; a long
"uploading 3/12: some-name.zip" used to wrap out of the 46px footer.
- A first failed password attempt now says the archive is encrypted,
instead of blaming a password the user was never asked for.
Artifact
web-file-mgr-v1.9.3M.elf
903,448 B
sha256 8ca47d5aaca75085b32641300cce30fadb7df7749cb6b53d04f129bcecc286b7
e_machine 0x003e (x86-64 / PS5)
The file size is identical to the four builds before it, and every one of
them carries a different sha256: only .rodata moved, and by less than the
16 KiB section alignment absorbs. Compare sections with `readelf -SW` --
never infer "nothing changed" from the byte count.
Verification
- host suites: 140 ZIP + 37 RAR = 177 checks, 0 failures
- 7z suite: 27 cases, 0 failures. The `aeshe` entry that used to sit in
KNOWN_GAPS is gone -- the -mhe=on fixture now passes both the folder
decoder and the extraction facade
- frontend: .build/ui_retry_test.mjs (40 checks), .build/ui_upload_menu_test.mjs
(40 checks), .build/preview_check.mjs (12 assertions in headless Chromium
against the real page and a fixture API). Two layout regressions and the
highlight cascade bug were caught by the last one and by nothing else --
reading the source, both CSS rules "look correct"
- built twice from this tree: byte-identical (cmp clean). rsync refreshes
every asset mtime, so this is a genuine recompile, not make short-circuiting
on unchanged sources
- embedded assets verified in place with .build/check-elf-gzip.py, because
gen-asset-module.py gzips them and plain `strings` finds none of their text
- exercised end to end on a real PS5; the checklist is
docs/DEVICE-TEST-v1.9.3M.md
Docs
- docs/USER-GUIDE-zh-CN.md (new, simplified Chinese user guide)
- docs/DEVICE-TEST-v1.9.3M.md (new, on-device acceptance checklist)
- docs/REAL-CONSOLE-PROFILE.md (new, measured console behaviour)
- docs/archive/HANDOVER-v1.8-planning.md (superseded v1.8 design notes)
- CHANGELOG / README (both languages) / HANDOVER updated with the artifact
fingerprint, the section deltas and the new test counts
135 lines
4.0 KiB
C
135 lines
4.0 KiB
C
/* Wall-clock benchmark for the extraction paths, ZIP, RAR and 7z.
|
|
*
|
|
* bench_extract <archive> <out-dir> [password]
|
|
*
|
|
* Reports how long the facade takes end to end -- decode, staging writes,
|
|
* publish -- which is exactly what a PS5 user waits for. Note there is no
|
|
* fsync in the extract path at all (see the comment in zip_extract.c's
|
|
* publish_entry): the pipeline is "sync nothing, rename everything". It is
|
|
* deliberately separate from the correctness drivers: those assert on bytes,
|
|
* this one only prints numbers, and it is not part of the test matrix.
|
|
*
|
|
* Keeping it in-tree matters because "is our engine fast?" is a question that
|
|
* will come up again, and the answer should be a command anyone can rerun
|
|
* rather than a number somebody remembers. The format is picked from the
|
|
* suffix so the same binary covers all three engines.
|
|
*/
|
|
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <time.h>
|
|
|
|
#include "sevenz_extract.h"
|
|
|
|
#ifndef BENCH_NO_RAR
|
|
#include "rar_extract.h"
|
|
#endif
|
|
|
|
static int
|
|
has_suffix(const char *path, const char *suffix) {
|
|
size_t path_len;
|
|
size_t suffix_len;
|
|
|
|
if(!path || !suffix) return 0;
|
|
path_len = strlen(path);
|
|
suffix_len = strlen(suffix);
|
|
if(path_len < suffix_len) return 0;
|
|
for(size_t i = 0; i < suffix_len; i++) {
|
|
char a = path[path_len - suffix_len + i];
|
|
char b = suffix[i];
|
|
if(a >= 'A' && a <= 'Z') a = (char)(a - 'A' + 'a');
|
|
if(b >= 'A' && b <= 'Z') b = (char)(b - 'A' + 'a');
|
|
if(a != b) return 0;
|
|
}
|
|
return 1;
|
|
}
|
|
|
|
static double
|
|
now_seconds(void) {
|
|
struct timespec ts;
|
|
|
|
if(timespec_get(&ts, TIME_UTC) != TIME_UTC) return 0.0;
|
|
return (double)ts.tv_sec + (double)ts.tv_nsec / 1000000000.0;
|
|
}
|
|
|
|
int
|
|
main(int argc, char **argv) {
|
|
zipx_result_t result;
|
|
zipx_status_t status;
|
|
const char *archive;
|
|
const char *out_dir;
|
|
const char *password;
|
|
const char *format;
|
|
double started;
|
|
double elapsed;
|
|
double mebibytes;
|
|
|
|
if(argc < 3) {
|
|
fprintf(stderr, "usage: %s <archive> <out-dir> [password]\n", argv[0]);
|
|
return 2;
|
|
}
|
|
archive = argv[1];
|
|
out_dir = argv[2];
|
|
password = argc > 3 ? argv[3] : NULL;
|
|
|
|
if(has_suffix(archive, ".7z") || has_suffix(archive, ".7z.001") ||
|
|
has_suffix(archive, ".001")) {
|
|
format = "7z";
|
|
}
|
|
#ifndef BENCH_SEVENZ_ONLY
|
|
else if(has_suffix(archive, ".zip") || has_suffix(archive, ".zip.001") ||
|
|
has_suffix(archive, ".z01")) {
|
|
format = "zip";
|
|
}
|
|
#endif
|
|
#ifndef BENCH_NO_RAR
|
|
else if(has_suffix(archive, ".rar") || has_suffix(archive, ".part1.rar") ||
|
|
has_suffix(archive, ".r00")) {
|
|
format = "rar";
|
|
}
|
|
#endif
|
|
else {
|
|
fprintf(stderr, "unsupported benchmark format: %s\n", archive);
|
|
return 2;
|
|
}
|
|
|
|
memset(&result, 0, sizeof(result));
|
|
started = now_seconds();
|
|
#ifndef BENCH_NO_RAR
|
|
if(!strcmp(format, "rar")) {
|
|
status = rar_extract(archive, out_dir, ZIPX_CONFLICT_OVERWRITE,
|
|
zipx_default_limits(), NULL, NULL, NULL, NULL,
|
|
&result);
|
|
} else
|
|
#endif
|
|
#ifndef BENCH_SEVENZ_ONLY
|
|
if(!strcmp(format, "zip")) {
|
|
status = zipx_extract(archive, out_dir, ZIPX_CONFLICT_OVERWRITE,
|
|
zipx_default_limits(), NULL, NULL, NULL, NULL, &result);
|
|
} else
|
|
#endif
|
|
{
|
|
status = sevenz_extract(archive, out_dir, ZIPX_CONFLICT_OVERWRITE,
|
|
zipx_default_limits(), NULL, NULL, NULL,
|
|
password, &result);
|
|
}
|
|
elapsed = now_seconds() - started;
|
|
|
|
mebibytes = (double)result.bytes_total / (1024.0 * 1024.0);
|
|
|
|
printf("format : %s\n", format);
|
|
printf("status : %s\n", zipx_status_string(status));
|
|
printf("entries : %llu\n", (unsigned long long)result.entries_total);
|
|
printf("unpacked : %.1f MiB\n", mebibytes);
|
|
printf("wall : %.3f s\n", elapsed);
|
|
if(elapsed > 0.0) {
|
|
printf("through : %.1f MiB/s\n", mebibytes / elapsed);
|
|
}
|
|
if(status != ZIPX_OK) {
|
|
printf("detail : %s\n", result.detail[0] ? result.detail : "(none)");
|
|
printf("message : %s\n", result.message[0] ? result.message : "(none)");
|
|
}
|
|
return status == ZIPX_OK ? 0 : 1;
|
|
}
|