Skip to content

Commit 60187f0

Browse files
author
Kazuki Suzuki Przyborowski
committed
Small update
1 parent 10cf381 commit 60187f0

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

neofile.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[config]
2-
default = PyNeoFile
2+
default = NeoFile
33

44
[NeoFile]
55
magic = NeoFile

phpneofile.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* PyNeoFile (PHP)
44
* ---------------------------------------------------------------------
55
* A PHP implementation compatible with the Python "pyneoarc_neo" module.
6-
* - Same archive wire-format (ArchiveFile + ver digits + NUL delimiter)
6+
* - Same archive wire-format (NeoFile + ver digits + NUL delimiter)
77
* - Functions: pack_neo, pack_iter_neo, unpack_neo, repack_neo,
88
* archive_to_array_neo, archivefilelistfiles_neo,
99
* archivefilevalidate_neo, convert_foreign_to_neo
@@ -152,7 +152,7 @@ function _neo_decode_delim_escape($s) {
152152

153153
function _neo_default_formatspecs() {
154154
return array(
155-
'format_magic' => 'ArchiveFile',
155+
'format_magic' => 'NeoFile',
156156
'format_ver' => '001',
157157
'format_delimiter' => "\x00",
158158
'new_style' => true,
@@ -186,7 +186,7 @@ function _neo_load_formatspecs_from_ini($paths=null, $prefer_section=null) {
186186
}
187187
if (!$sec) return null;
188188

189-
$magic = isset($ini[$sec]['magic']) ? $ini[$sec]['magic'] : 'ArchiveFile';
189+
$magic = isset($ini[$sec]['magic']) ? $ini[$sec]['magic'] : 'NeoFile';
190190
$ver = isset($ini[$sec]['ver']) ? $ini[$sec]['ver'] : '001';
191191
$delim = isset($ini[$sec]['delimiter']) ? $ini[$sec]['delimiter'] : "\\x00";
192192
$newst = isset($ini[$sec]['newstyle']) ? $ini[$sec]['newstyle'] : 'true';

pyneofile.py

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

55
"""
6-
pyneofile.py — Alternate ArchiveFile core with Py2/3 compatible logic.
6+
pyneofile.py — Alternate NeoFile core with Py2/3 compatible logic.
77
88
Features:
99
- Pack / unpack / repack / archive_to_array
@@ -225,7 +225,7 @@ def _ver_digits(verstr):
225225

226226
def _default_formatspecs():
227227
return {
228-
'format_magic': 'ArchiveFile',
228+
'format_magic': 'NeoFile',
229229
'format_ver': '001',
230230
'format_delimiter': '\x00',
231231
'new_style': True,
@@ -1015,7 +1015,7 @@ def _read_record_raw(fp, formatspecs):
10151015
return headersize_hex, fields_len_hex, vals, json_bytes, content_stored
10161016

10171017
def archivefilevalidate_neo(infile, formatspecs=None, verbose=False, return_details=False):
1018-
"""Validate an ArchiveFile using the alt parser."""
1018+
"""Validate an NeoFile using the alt parser."""
10191019
fs = _ensure_formatspecs(formatspecs)
10201020
details = []
10211021
ok_all = True
@@ -1376,7 +1376,7 @@ def convert_foreign_to_neo(infile, outfile=None, formatspecs=None,
13761376
compression="auto",
13771377
compression_level=None):
13781378
"""
1379-
Convert a foreign archive (zip/tar/rar/7z) into the alt ArchiveFile format.
1379+
Convert a foreign archive (zip/tar/rar/7z) into the alt NeoFile format.
13801380
Uses stdlib for zip/tar; requires 'rarfile' for RAR and 'py7zr' for 7z.
13811381
Returns bytes when outfile is None/'-'; otherwise writes a file.
13821382
"""

0 commit comments

Comments
 (0)