Skip to content

Commit 70a983c

Browse files
author
Kazuki Suzuki Przyborowski
committed
Small update
1 parent cf805e3 commit 70a983c

File tree

3 files changed

+45
-49
lines changed

3 files changed

+45
-49
lines changed

‎neofile.py‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
from __future__ import absolute_import, division, print_function, unicode_literals
66

77
"""
8-
pyneofile_cli.py — CLI for the PyNeoFile format (.neo).
8+
neofile.py — CLI for the PyNeoFile format (.neo).
99
1010
New:
1111
- Input '-' for list/validate/extract/repack/convert reads archive bytes from stdin.
@@ -38,7 +38,7 @@ def _build_formatspecs_from_args(args):
3838

3939
def _convert_or_fail(infile, outpath, formatspecs, checksum, compression, level):
4040
try:
41-
return N.convert_foreign_to_alt(infile, outpath, formatspecs=formatspecs,
41+
return N.convert_foreign_to_neo(infile, outpath, formatspecs=formatspecs,
4242
checksumtypes=(checksum, checksum, checksum),
4343
compression=compression, compression_level=level)
4444
except RuntimeError as e:
@@ -147,12 +147,12 @@ def _maybe_archive_bytes():
147147
p.error("--output is required for --create (use '-' to stream)")
148148
out_bytes = (args.output == '-')
149149
if out_bytes:
150-
data = N.pack_alt(items, None, formatspecs=formatspecs,
150+
data = N.pack_neo(items, None, formatspecs=formatspecs,
151151
checksumtypes=(checksum, checksum, checksum),
152152
compression=compression, compression_level=level)
153153
_stdout_bin().write(data)
154154
else:
155-
N.pack_alt(items, args.output, formatspecs=formatspecs,
155+
N.pack_neo(items, args.output, formatspecs=formatspecs,
156156
checksumtypes=(checksum, checksum, checksum),
157157
compression=compression, compression_level=level)
158158
if args.verbose: sys.stderr.write("created: %s\n" % args.output)
@@ -174,12 +174,12 @@ def _maybe_archive_bytes():
174174
if not args.output:
175175
p.error("--output is required for --repack (use '-' to stream)")
176176
if args.output == '-':
177-
data = N.repack_alt(src, None, formatspecs=formatspecs,
177+
data = N.repack_neo(src, None, formatspecs=formatspecs,
178178
checksumtypes=(checksum, checksum, checksum),
179179
compression=compression, compression_level=level)
180180
_stdout_bin().write(data)
181181
else:
182-
N.repack_alt(src, args.output, formatspecs=formatspecs,
182+
N.repack_neo(src, args.output, formatspecs=formatspecs,
183183
checksumtypes=(checksum, checksum, checksum),
184184
compression=compression, compression_level=level)
185185
if args.verbose: sys.stderr.write("repacked: %s -> %s\n" % (('<stdin>' if infile0 == '-' else infile0), args.output))
@@ -192,18 +192,18 @@ def _maybe_archive_bytes():
192192
pass
193193
if args.output == '-':
194194
# stream TAR to stdout
195-
arr = N.archive_to_array_alt(src, formatspecs=formatspecs, listonly=False,
195+
arr = N.archive_to_array_neo(src, formatspecs=formatspecs, listonly=False,
196196
skipchecksum=args.skipchecksum, uncompress=True)
197197
_emit_tar_stream_from_array(arr, _stdout_bin())
198198
return 0
199199
outdir = args.output or "."
200-
N.unpack_alt(src, outdir, formatspecs=formatspecs, skipchecksum=args.skipchecksum, uncompress=True)
200+
N.unpack_neo(src, outdir, formatspecs=formatspecs, skipchecksum=args.skipchecksum, uncompress=True)
201201
if args.verbose: sys.stderr.write("extracted → %s\n" % outdir)
202202
return 0
203203

204204
if args.list:
205205
src = _maybe_archive_bytes() or infile0
206-
names = N.archivefilelistfiles_alt(src, formatspecs=formatspecs, advanced=args.verbose, include_dirs=True)
206+
names = N.archivefilelistfiles_neo(src, formatspecs=formatspecs, advanced=args.verbose, include_dirs=True)
207207
if not args.verbose:
208208
for n in names: sys.stdout.write(n + "\n")
209209
else:
@@ -215,7 +215,7 @@ def _maybe_archive_bytes():
215215

216216
if args.validate:
217217
src = _maybe_archive_bytes() or infile0
218-
ok, details = N.archivefilevalidate_alt(src, formatspecs=formatspecs, verbose=args.verbose, return_details=True)
218+
ok, details = N.archivefilevalidate_neo(src, formatspecs=formatspecs, verbose=args.verbose, return_details=True)
219219
if not args.verbose:
220220
sys.stdout.write("valid: %s\n" % ("yes" if ok else "no"))
221221
else:

‎phpneofile.php‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
/**
33
* PyNeoFile (PHP)
44
* ---------------------------------------------------------------------
5-
* A PHP implementation compatible with the Python "pyneoarc_alt" module.
5+
* A PHP implementation compatible with the Python "pyneoarc_neo" module.
66
* - Same archive wire-format (ArchiveFile + ver digits + NUL delimiter)
7-
* - Functions: pack_alt, pack_iter_alt, unpack_alt, repack_alt,
8-
* archive_to_array_alt, archivefilelistfiles_alt,
9-
* archivefilevalidate_alt, convert_foreign_to_alt
7+
* - Functions: pack_neo, pack_iter_neo, unpack_neo, repack_neo,
8+
* archive_to_array_neo, archivefilelistfiles_neo,
9+
* archivefilevalidate_neo, convert_foreign_to_neo
1010
* - In-memory I/O: accept bytes strings and stream resources; return bytes when $outfile === null or "-"
1111
* - INI auto-fallback (PYNEOFILE_INI/pyneofile.ini, or archivefile.ini/catfile.ini/foxfile.ini)
1212
* - Compression: none|zlib|gzip|bz2 (xz not provided in stock PHP)
@@ -558,7 +558,7 @@ function _neo_parse_record($ns, $formatspecs, $listonly=false, $skipchecksum=fal
558558

559559
# ----------------------- Public API -----------------------
560560

561-
function pack_iter_alt($items, $outfile=null, $formatspecs=null,
561+
function pack_iter_neo($items, $outfile=null, $formatspecs=null,
562562
$checksumtypes=array('crc32','crc32','crc32'),
563563
$encoding='UTF-8', $compression='auto', $compression_level=null) {
564564
$fs = _neo_ensure_formatspecs($formatspecs);
@@ -630,7 +630,7 @@ function pack_iter_alt($items, $outfile=null, $formatspecs=null,
630630
return true;
631631
}
632632

633-
function pack_alt($infiles, $outfile=null, $formatspecs=null,
633+
function pack_neo($infiles, $outfile=null, $formatspecs=null,
634634
$checksumtypes=array('crc32','crc32','crc32'),
635635
$encoding='UTF-8', $compression='auto', $compression_level=null) {
636636
// in-memory dict {name=>bytes|null}
@@ -640,7 +640,7 @@ function pack_alt($infiles, $outfile=null, $formatspecs=null,
640640
$is_dir = ($data === null) || (substr($name, -1) === '/');
641641
$items[] = array('name'=>$name, 'is_dir'=>$is_dir, 'data'=>$is_dir?null:$data);
642642
}
643-
return pack_iter_alt($items, $outfile, $formatspecs, $checksumtypes, $encoding, $compression, $compression_level);
643+
return pack_iter_neo($items, $outfile, $formatspecs, $checksumtypes, $encoding, $compression, $compression_level);
644644
}
645645

646646
// list of paths or single path
@@ -710,7 +710,7 @@ function pack_alt($infiles, $outfile=null, $formatspecs=null,
710710
return true;
711711
}
712712

713-
function archive_to_array_alt($infile, $formatspecs=null, $listonly=false, $skipchecksum=false, $uncompress=true) {
713+
function archive_to_array_neo($infile, $formatspecs=null, $listonly=false, $skipchecksum=false, $uncompress=true) {
714714
$fs = _neo_ensure_formatspecs($formatspecs);
715715
list($ns, $fpclose) = _neo_open_in($infile);
716716
$top = _neo_parse_global_header($ns, $fs);
@@ -723,8 +723,8 @@ function archive_to_array_alt($infile, $formatspecs=null, $listonly=false, $skip
723723
return $top;
724724
}
725725

726-
function unpack_alt($infile, $outdir='.', $formatspecs=null, $skipchecksum=false, $uncompress=true) {
727-
$arr = archive_to_array_alt($infile, $formatspecs, false, $skipchecksum, $uncompress);
726+
function unpack_neo($infile, $outdir='.', $formatspecs=null, $skipchecksum=false, $uncompress=true) {
727+
$arr = archive_to_array_neo($infile, $formatspecs, false, $skipchecksum, $uncompress);
728728
if (!$arr) return false;
729729

730730
if ($outdir === null || $outdir === '-') {
@@ -754,10 +754,10 @@ function unpack_alt($infile, $outdir='.', $formatspecs=null, $skipchecksum=false
754754
return true;
755755
}
756756

757-
function repack_alt($infile, $outfile=null, $formatspecs=null,
757+
function repack_neo($infile, $outfile=null, $formatspecs=null,
758758
$checksumtypes=array('crc32','crc32','crc32'),
759759
$compression='auto', $compression_level=null) {
760-
$arr = archive_to_array_alt($infile, $formatspecs, false, false, false); // stored bytes
760+
$arr = archive_to_array_neo($infile, $formatspecs, false, false, false); // stored bytes
761761
$fs = _neo_ensure_formatspecs($formatspecs);
762762
list($bufMode, $fp, $buf) = _neo_open_out($outfile);
763763
$out = "";
@@ -819,7 +819,7 @@ function repack_alt($infile, $outfile=null, $formatspecs=null,
819819
return true;
820820
}
821821

822-
function archivefilelistfiles_alt($infile, $formatspecs=null, $advanced=false, $include_dirs=true) {
822+
function archivefilelistfiles_neo($infile, $formatspecs=null, $advanced=false, $include_dirs=true) {
823823
$fs = _neo_ensure_formatspecs($formatspecs);
824824
list($ns, $fpclose) = _neo_open_in($infile);
825825
_neo_parse_global_header($ns, $fs);
@@ -847,7 +847,7 @@ function archivefilelistfiles_alt($infile, $formatspecs=null, $advanced=false, $
847847
return $out;
848848
}
849849

850-
function archivefilevalidate_alt($infile, $formatspecs=null, $verbose=false, $return_details=false) {
850+
function archivefilevalidate_neo($infile, $formatspecs=null, $verbose=false, $return_details=false) {
851851
$fs = _neo_ensure_formatspecs($formatspecs);
852852
list($ns, $fpclose) = _neo_open_in($infile);
853853
_neo_parse_global_header($ns, $fs);
@@ -880,7 +880,7 @@ function archivefilevalidate_alt($infile, $formatspecs=null, $verbose=false, $re
880880

881881
# ----------------------- Convert (zip/tar stdlib) -----------------------
882882

883-
function convert_foreign_to_alt($infile, $outfile=null, $formatspecs=null,
883+
function convert_foreign_to_neo($infile, $outfile=null, $formatspecs=null,
884884
$checksumtypes=array('crc32','crc32','crc32'),
885885
$compression='auto', $compression_level=null) {
886886
// zip
@@ -898,7 +898,7 @@ function convert_foreign_to_alt($infile, $outfile=null, $formatspecs=null,
898898
$items[] = array('name'=>$name, 'is_dir'=>$is_dir, 'data'=>$data);
899899
}
900900
$z->close();
901-
return pack_iter_alt($items, $outfile, $formatspecs, $checksumtypes, 'UTF-8', $compression, $compression_level);
901+
return pack_iter_neo($items, $outfile, $formatspecs, $checksumtypes, 'UTF-8', $compression, $compression_level);
902902
}
903903

904904
// tar(.gz/.bz2/.xz*) via PharData (xz not standard)
@@ -912,7 +912,7 @@ function convert_foreign_to_alt($infile, $outfile=null, $formatspecs=null,
912912
$data = $is_dir ? null : file_get_contents($file->getPathname());
913913
$items[] = array('name'=>$name, 'is_dir'=>$is_dir, 'data'=>$data);
914914
}
915-
return pack_iter_alt($items, $outfile, $formatspecs, $checksumtypes, 'UTF-8', $compression, $compression_level);
915+
return pack_iter_neo($items, $outfile, $formatspecs, $checksumtypes, 'UTF-8', $compression, $compression_level);
916916
}
917917

918918
throw new \Exception("Unsupported foreign archive (zip/tar.* only in PHP port)");

‎pyneofile.py‎

Lines changed: 18 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
from __future__ import print_function, unicode_literals, division, absolute_import
44

55
"""
6-
pyneoarc_alt.py — Alternate ArchiveFile core with Py2/3 compatible logic.
6+
pyneofile.py — Alternate ArchiveFile core with Py2/3 compatible logic.
77
88
Features:
99
- Pack / unpack / repack / archive_to_array
@@ -156,7 +156,7 @@ def _wrap_outfile(outfile):
156156
return _iopen(outfile, 'wb'), True, False
157157

158158
def _normalize_pack_inputs(infiles):
159-
"""Normalize in-memory inputs into items for pack_iter_alt.
159+
"""Normalize in-memory inputs into items for pack_iter_neo.
160160
Supported forms:
161161
- dict {name: bytes_or_None} (None => directory if name endswith('/'))
162162
- list/tuple of (name, bytes) or (name, is_dir, bytes_or_None) or dicts
@@ -240,7 +240,7 @@ def _load_formatspecs_from_ini(paths=None, prefer_section=None):
240240
envp = os.environ.get('PYNEOFILE_INI') or os.environ.get('PYARCHIVE_INI')
241241
if envp:
242242
cands.append(envp)
243-
cands.extend(['pyneofile.ini', 'archivefile.ini', 'catfile.ini', 'foxfile.ini'])
243+
cands.extend(['pyneofile.ini'])
244244

245245
picked = None
246246
for p in cands:
@@ -704,7 +704,7 @@ def _parse_record(fp, formatspecs, listonly=False, skipchecksum=False, uncompres
704704
}
705705

706706
# ---------------- Public API ----------------
707-
def pack_alt(infiles, outfile=None, formatspecs=None,
707+
def pack_neo(infiles, outfile=None, formatspecs=None,
708708
checksumtypes=("crc32","crc32","crc32"),
709709
encoding="UTF-8",
710710
compression="auto",
@@ -716,7 +716,7 @@ def pack_alt(infiles, outfile=None, formatspecs=None,
716716
# In-memory sources?
717717
items = _normalize_pack_inputs(infiles)
718718
if items is not None:
719-
return pack_iter_alt(items, outfile, formatspecs=fs,
719+
return pack_iter_neo(items, outfile, formatspecs=fs,
720720
checksumtypes=checksumtypes, encoding=encoding,
721721
compression=compression, compression_level=compression_level)
722722

@@ -811,7 +811,7 @@ def pack_alt(infiles, outfile=None, formatspecs=None,
811811
if close_me:
812812
fp.close()
813813

814-
def archive_to_array_alt(infile, formatspecs=None,
814+
def archive_to_array_neo(infile, formatspecs=None,
815815
listonly=False, skipchecksum=False, uncompress=True):
816816
fs = _ensure_formatspecs(formatspecs)
817817
fp, close_me = _wrap_infile(infile)
@@ -827,8 +827,8 @@ def archive_to_array_alt(infile, formatspecs=None,
827827
if close_me:
828828
fp.close()
829829

830-
def unpack_alt(infile, outdir='.', formatspecs=None, skipchecksum=False, uncompress=True):
831-
arr = archive_to_array_alt(infile, formatspecs=formatspecs, listonly=False, skipchecksum=skipchecksum, uncompress=uncompress)
830+
def unpack_neo(infile, outdir='.', formatspecs=None, skipchecksum=False, uncompress=True):
831+
arr = archive_to_array_neo(infile, formatspecs=formatspecs, listonly=False, skipchecksum=skipchecksum, uncompress=uncompress)
832832
if not arr:
833833
return False
834834

@@ -863,11 +863,11 @@ def unpack_alt(infile, outdir='.', formatspecs=None, skipchecksum=False, uncompr
863863
pass
864864
return True
865865

866-
def repack_alt(infile, outfile=None, formatspecs=None,
866+
def repack_neo(infile, outfile=None, formatspecs=None,
867867
checksumtypes=("crc32","crc32","crc32"),
868868
compression="auto",
869869
compression_level=None):
870-
arr = archive_to_array_alt(infile, formatspecs=formatspecs, listonly=False, skipchecksum=False, uncompress=False)
870+
arr = archive_to_array_neo(infile, formatspecs=formatspecs, listonly=False, skipchecksum=False, uncompress=False)
871871
fs = _ensure_formatspecs(formatspecs)
872872
fp, close_me, to_bytes = _wrap_outfile(outfile)
873873
try:
@@ -994,7 +994,7 @@ def _read_record_raw(fp, formatspecs):
994994

995995
return headersize_hex, fields_len_hex, vals, json_bytes, content_stored
996996

997-
def archivefilevalidate_alt(infile, formatspecs=None, verbose=False, return_details=False):
997+
def archivefilevalidate_neo(infile, formatspecs=None, verbose=False, return_details=False):
998998
"""Validate an ArchiveFile using the alt parser."""
999999
fs = _ensure_formatspecs(formatspecs)
10001000
details = []
@@ -1065,7 +1065,7 @@ def archivefilevalidate_alt(infile, formatspecs=None, verbose=False, return_deta
10651065
return ok_all, details
10661066
return ok_all
10671067

1068-
def archivefilelistfiles_alt(infile, formatspecs=None, advanced=False, include_dirs=True):
1068+
def archivefilelistfiles_neo(infile, formatspecs=None, advanced=False, include_dirs=True):
10691069
"""List entries in an archive without extracting."""
10701070
fs = _ensure_formatspecs(formatspecs)
10711071
out = []
@@ -1115,15 +1115,11 @@ def archivefilelistfiles_alt(infile, formatspecs=None, advanced=False, include_d
11151115
fp.close()
11161116
return out
11171117

1118-
# Back-compat aliases
1119-
ArchiveFileValidate_alt = archivefilevalidate_alt
1120-
ArchiveFileListFiles_alt = archivefilelistfiles_alt
1121-
11221118
# -----------------------------------------------------------------------------
11231119
# Pack from iterator + foreign-archive conversion (stdlib + optional deps)
11241120
# -----------------------------------------------------------------------------
11251121

1126-
def pack_iter_alt(items, outfile, formatspecs=None,
1122+
def pack_iter_neo(items, outfile, formatspecs=None,
11271123
checksumtypes=("crc32","crc32","crc32"),
11281124
encoding="UTF-8",
11291125
compression="auto",
@@ -1355,7 +1351,7 @@ def _iter_7z_members(z7):
13551351
yield {'name': name, 'is_dir': False, 'data': blob,
13561352
'mode': (stat.S_IFREG | 0o644), 'mtime': int(time.time())}
13571353

1358-
def convert_foreign_to_alt(infile, outfile=None, formatspecs=None,
1354+
def convert_foreign_to_neo(infile, outfile=None, formatspecs=None,
13591355
checksumtypes=("crc32","crc32","crc32"),
13601356
compression="auto",
13611357
compression_level=None):
@@ -1372,7 +1368,7 @@ def convert_foreign_to_alt(infile, outfile=None, formatspecs=None,
13721368
zsrc = BytesIO(infile) if isinstance(infile, (bytes, bytearray, memoryview)) else (infile if isinstance(infile, basestring) else _wrap_infile(infile)[0])
13731369
try:
13741370
with zipfile.ZipFile(zsrc, 'r') as zf:
1375-
return pack_iter_alt(_iter_zip_members(zf), outfile, formatspecs=formatspecs,
1371+
return pack_iter_neo(_iter_zip_members(zf), outfile, formatspecs=formatspecs,
13761372
checksumtypes=checksumtypes, compression=compression,
13771373
compression_level=compression_level)
13781374
except zipfile.BadZipfile:
@@ -1383,7 +1379,7 @@ def convert_foreign_to_alt(infile, outfile=None, formatspecs=None,
13831379
from io import BytesIO
13841380
src = BytesIO(infile) if isinstance(infile, (bytes, bytearray, memoryview)) else (infile if isinstance(infile, basestring) else _wrap_infile(infile)[0])
13851381
with tarfile.open(src, 'r:*') as tf:
1386-
return pack_iter_alt(_iter_tar_members(tf), outfile, formatspecs=formatspecs,
1382+
return pack_iter_neo(_iter_tar_members(tf), outfile, formatspecs=formatspecs,
13871383
checksumtypes=checksumtypes, compression=compression,
13881384
compression_level=compression_level)
13891385

@@ -1395,7 +1391,7 @@ def convert_foreign_to_alt(infile, outfile=None, formatspecs=None,
13951391
from io import BytesIO
13961392
rsrc = BytesIO(infile) if isinstance(infile, (bytes, bytearray, memoryview)) else (infile if isinstance(infile, basestring) else _wrap_infile(infile)[0])
13971393
with rarfile.RarFile(rsrc) as rf:
1398-
return pack_iter_alt(_iter_rar_members(rf), outfile, formatspecs=formatspecs,
1394+
return pack_iter_neo(_iter_rar_members(rf), outfile, formatspecs=formatspecs,
13991395
checksumtypes=checksumtypes, compression=compression,
14001396
compression_level=compression_level)
14011397

@@ -1407,7 +1403,7 @@ def convert_foreign_to_alt(infile, outfile=None, formatspecs=None,
14071403
from io import BytesIO
14081404
zsrc = BytesIO(infile) if isinstance(infile, (bytes, bytearray, memoryview)) else (infile if isinstance(infile, basestring) else _wrap_infile(infile)[0])
14091405
with py7zr.SevenZipFile(zsrc, 'r') as z7:
1410-
return pack_iter_alt(_iter_7z_members(z7), outfile, formatspecs=formatspecs,
1406+
return pack_iter_neo(_iter_7z_members(z7), outfile, formatspecs=formatspecs,
14111407
checksumtypes=checksumtypes, compression=compression,
14121408
compression_level=compression_level)
14131409

0 commit comments

Comments
 (0)