Skip to content

Commit

Permalink
Small update
Browse files Browse the repository at this point in the history
  • Loading branch information
KazukiPrzyborowski committed Jan 24, 2025
1 parent 731e0a3 commit c5db354
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 5 deletions.
16 changes: 12 additions & 4 deletions altcatfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,13 @@
__version_date_plusrc__ = pycatfile.__version_date_plusrc__
__version__ = pycatfile.__version__


def decode_unicode_escape(value):
if sys.version_info[0] < 3: # Python 2
return value.decode('unicode_escape')
else: # Python 3
return bytes(value, 'UTF-8').decode('unicode_escape')

# Initialize Configuration
def load_config():
if 'PYCATFILE_CONFIG_FILE' in os.environ and os.path.exists(os.environ['PYCATFILE_CONFIG_FILE']):
Expand All @@ -52,13 +59,14 @@ def load_config():
scriptconf = os.path.join(os.path.dirname(__file__), "catfile.ini")

config = configparser.ConfigParser()
__file_format_default__ = decode_unicode_escape(config.get('config', 'default'))
if os.path.exists(scriptconf):
config.read(scriptconf)
return {
'name': config.get('main', 'name', fallback="CatFile"),
'delimiter': config.get('main', 'delimiter', fallback="\x00"),
'version': config.get('main', 'ver', fallback="001"),
'extension': config.get('main', 'extension', fallback=".cat")
'name': decode_unicode_escape(config.get(__file_format_default__, 'name')),
'delimiter': decode_unicode_escape(config.get(__file_format_default__, 'delimiter')),
'version': config.get(section, 'ver'),
'extension': decode_unicode_escape(config.get(__file_format_default__, 'extension'))
}
else:
return {
Expand Down
2 changes: 1 addition & 1 deletion pycatfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ def decode_unicode_escape(value):
"newstyle", "advancedlist", "altinode"
]
if all(key in config[section] for key in required_keys):
__file_format_multi_dict__.update({decode_unicode_escape(config.get(section, 'magic')): {'format_name': config.get(section, 'name'), 'format_magic': decode_unicode_escape(config.get(section, 'magic')), 'format_lower': config.get(section, 'lower'), 'format_len': config.getint(section, 'len'), 'format_hex': config.get(section, 'hex'), 'format_delimiter': decode_unicode_escape(config.get(section, 'delimiter')), 'format_ver': config.get(section, 'ver'), 'new_style': config.getboolean(section, 'newstyle'), 'use_advanced_list': config.getboolean(section, 'advancedlist'), 'use_alt_inode': config.getboolean(section, 'altinode'), 'format_extension': decode_unicode_escape(config.get(section, 'extension')) } } )
__file_format_multi_dict__.update({decode_unicode_escape(config.get(section, 'magic')): {'format_name': decode_unicode_escape(config.get(section, 'name')), 'format_magic': decode_unicode_escape(config.get(section, 'magic')), 'format_lower': decode_unicode_escape(config.get(section, 'lower')), 'format_len': config.getint(section, 'len'), 'format_hex': config.get(section, 'hex'), 'format_delimiter': decode_unicode_escape(config.get(section, 'delimiter')), 'format_ver': config.get(section, 'ver'), 'new_style': config.getboolean(section, 'newstyle'), 'use_advanced_list': config.getboolean(section, 'advancedlist'), 'use_alt_inode': config.getboolean(section, 'altinode'), 'format_extension': decode_unicode_escape(config.get(section, 'extension')) } } )
if("CatFile" not in __file_format_multi_dict__):
__file_format_multi_dict__.update({'CatFile': {'format_name': "CatFile", 'format_magic': "CatFile", 'format_lower': "catfile", 'format_len': 7, 'format_hex': "43617446696c65", 'format_delimiter': "\x00", 'format_ver': "001", 'new_style': True, 'use_advanced_list': True, 'use_alt_inode': False, 'format_extension': ".cat" } } )
if("NekoFile" not in __file_format_multi_dict__):
Expand Down

0 comments on commit c5db354

Please sign in to comment.