@@ -309,7 +309,7 @@ def decode_unicode_escape(value):
309309 __program_name__ = "Py" + __file_format_name__
310310 __file_format_lower__ = __file_format_name__ .lower ()
311311 __file_format_magic__ = __file_format_name__
312- __file_format_len__ = len (__file_format_magic__ )
312+ __file_format_len__ = len (__file_format_magic__ . encode ( 'utf-8' ) )
313313 __file_format_hex__ = binascii .hexlify (
314314 __file_format_magic__ .encode ("UTF-8" )).decode ("UTF-8" )
315315 __file_format_delimiter__ = "\x00 "
@@ -319,21 +319,19 @@ def decode_unicode_escape(value):
319319 __use_alt_inode__ = False
320320 __file_format_extension__ = ".cat"
321321 else :
322- # Format Info Generated by ChatGPT
323- __file_format_name__ = "FastArchive"
322+ __file_format_name__ = "NekoFile"
324323 __program_name__ = "Py" + __file_format_name__
325324 __file_format_lower__ = __file_format_name__ .lower ()
326- __file_format_magic__ = "FstArch "
327- __file_format_len__ = len (__file_format_magic__ )
325+ __file_format_magic__ = "ねこファイル "
326+ __file_format_len__ = len (__file_format_magic__ . encode ( 'utf-8' ) )
328327 __file_format_hex__ = binascii .hexlify (
329328 __file_format_magic__ .encode ("UTF-8" )).decode ("UTF-8" )
330- # Using a non-printable ASCII character as delimiter
331- __file_format_delimiter__ = "\x1F "
329+ __file_format_delimiter__ = "\x00 "
332330 __file_format_ver__ = "001"
333331 __use_new_style__ = True
334- __use_advanced_list__ = False
332+ __use_advanced_list__ = True
335333 __use_alt_inode__ = False
336- __file_format_extension__ = ".fast "
334+ __file_format_extension__ = ".neko "
337335__file_format_list__ = [__file_format_name__ , __file_format_magic__ , __file_format_lower__ , __file_format_len__ ,
338336 __file_format_hex__ , __file_format_delimiter__ , __file_format_ver__ , __use_new_style__ , __use_advanced_list__ , __use_alt_inode__ ]
339337__file_format_dict__ = {'format_name' : __file_format_name__ , 'format_magic' : __file_format_magic__ , 'format_lower' : __file_format_lower__ , 'format_len' : __file_format_len__ , 'format_hex' : __file_format_hex__ ,
@@ -2488,7 +2486,7 @@ def ReadFileDataBySizeWithContent(fp, listonly=False, uncompress=True, skipcheck
24882486 if (curloc > 0 ):
24892487 fp .seek (0 , 0 )
24902488 catheaderver = str (int (formatspecs ['format_ver' ].replace ("." , "" )))
2491- catstring = catfp .read (len ( formatspecs ['format_magic' ] + catheaderver )).decode ("UTF-8" )
2489+ catstring = catfp .read (formatspecs ['format_len' ] + len ( catheaderver )).decode ("UTF-8" )
24922490 catdelszie = len (formatspecs ['format_delimiter' ])
24932491 catdel = catfp .read (catdelszie ).decode ("UTF-8" )
24942492 if (catstring != formatspecs ['format_magic' ]+ catheaderver ):
@@ -2634,7 +2632,7 @@ def ReadFileDataBySizeWithContentToList(fp, seekstart=0, seekend=0, listonly=Fal
26342632 if (curloc > 0 ):
26352633 fp .seek (0 , 0 )
26362634 catheaderver = str (int (formatspecs ['format_ver' ].replace ("." , "" )))
2637- catstring = catfp .read (len ( formatspecs ['format_magic' ] + catheaderver )).decode ("UTF-8" )
2635+ catstring = catfp .read (formatspecs ['format_len' ] + len ( catheaderver )).decode ("UTF-8" )
26382636 catdelszie = len (formatspecs ['format_delimiter' ])
26392637 catdel = catfp .read (catdelszie ).decode ("UTF-8" )
26402638 if (catstring != formatspecs ['format_magic' ]+ catheaderver ):
@@ -5953,7 +5951,7 @@ def ArchiveFileSeekToFileNum(infile, seekto=0, listonly=False, contentasfile=Tru
59535951 if (curloc > 0 ):
59545952 catfp .seek (0 , 0 )
59555953 catheaderver = str (int (formatspecs ['format_ver' ].replace ("." , "" )))
5956- catstring = catfp .read (len ( formatspecs ['format_magic' ] + catheaderver )).decode ("UTF-8" )
5954+ catstring = catfp .read (formatspecs ['format_len' ] + len ( catheaderver )).decode ("UTF-8" )
59575955 catdelszie = len (formatspecs ['format_delimiter' ])
59585956 catdel = catfp .read (catdelszie ).decode ("UTF-8" )
59595957 if (catstring != formatspecs ['format_magic' ]+ catheaderver ):
@@ -6232,7 +6230,7 @@ def ArchiveFileSeekToFileName(infile, seekfile=None, listonly=False, contentasfi
62326230 if (curloc > 0 ):
62336231 catfp .seek (0 , 0 )
62346232 catheaderver = str (int (formatspecs ['format_ver' ].replace ("." , "" )))
6235- catstring = catfp .read (len ( formatspecs ['format_magic' ] + catheaderver )).decode ("UTF-8" )
6233+ catstring = catfp .read (formatspecs ['format_len' ] + len ( catheaderver )).decode ("UTF-8" )
62366234 catdelszie = len (formatspecs ['format_delimiter' ])
62376235 catdel = catfp .read (catdelszie ).decode ("UTF-8" )
62386236 if (catstring != formatspecs ['format_magic' ]+ catheaderver ):
@@ -6548,7 +6546,7 @@ def ArchiveFileValidate(infile, formatspecs=__file_format_dict__, verbose=False,
65486546 if (curloc > 0 ):
65496547 catfp .seek (0 , 0 )
65506548 catheaderver = str (int (formatspecs ['format_ver' ].replace ("." , "" )))
6551- catstring = catfp .read (len ( formatspecs ['format_magic' ] + catheaderver )).decode ("UTF-8" )
6549+ catstring = catfp .read (formatspecs ['format_len' ] + len ( catheaderver )).decode ("UTF-8" )
65526550 catdelszie = len (formatspecs ['format_delimiter' ])
65536551 catdel = catfp .read (catdelszie ).decode ("UTF-8" )
65546552 if (catstring != formatspecs ['format_magic' ]+ catheaderver ):
@@ -6893,7 +6891,7 @@ def ArchiveFileToArray(infile, seekstart=0, seekend=0, listonly=False, contentas
68936891 if (curloc > 0 ):
68946892 catfp .seek (0 , 0 )
68956893 catheaderver = str (int (formatspecs ['format_ver' ].replace ("." , "" )))
6896- catstring = catfp .read (len ( formatspecs ['format_magic' ] + catheaderver )).decode ("UTF-8" )
6894+ catstring = catfp .read (formatspecs ['format_len' ] + len ( catheaderver )).decode ("UTF-8" )
68976895 catdelszie = len (formatspecs ['format_delimiter' ])
68986896 catdel = catfp .read (catdelszie ).decode ("UTF-8" )
68996897 if (catstring != formatspecs ['format_magic' ]+ catheaderver ):
0 commit comments