Skip to content

Commit 648913d

Browse files
author
Kazuki Suzuki Przyborowski
committed
Small update
1 parent 94552e2 commit 648913d

2 files changed

Lines changed: 28 additions & 24 deletions

File tree

catfile.ini

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
[config]
22
usealt = false
3+
mainfmt = main
4+
altfmt = alt
35

46
[main]
57
len = 7

pycatfile.py

Lines changed: 26 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -286,37 +286,39 @@ def get_default_threads():
286286
config = configparser.ConfigParser()
287287
config.read(__config_file__)
288288
__use_alt_format__ = config.getboolean('config', 'usealt')
289+
main_fmt = config.get('config', 'mainfmt')
290+
alt_fmt = config.get('config', 'altfmt')
289291
def decode_unicode_escape(value):
290292
if sys.version_info[0] < 3: # Python 2
291293
return value.decode('unicode_escape')
292294
else: # Python 3
293295
return bytes(value, 'UTF-8').decode('unicode_escape')
294296
if not __use_alt_format__:
295-
__file_format_name__ = config.get('main', 'name')
296-
__program_name__ = config.get('main', 'proname')
297-
__file_format_lower__ = config.get('main', 'lower')
298-
__file_format_magic__ = decode_unicode_escape(config.get('main', 'magic'))
299-
__file_format_len__ = config.getint('main', 'len')
300-
__file_format_hex__ = config.get('main', 'hex')
301-
__file_format_delimiter__ = decode_unicode_escape(config.get('main', 'delimiter'))
302-
__file_format_ver__ = config.get('main', 'ver')
303-
__use_new_style__ = config.getboolean('main', 'newstyle')
304-
__use_advanced_list__ = config.getboolean('main', 'advancedlist')
305-
__use_alt_inode__ = config.getboolean('main', 'altinode')
306-
__file_format_extension__ = config.get('main', 'extension')
297+
__file_format_name__ = config.get(main_fmt, 'name')
298+
__program_name__ = config.get(main_fmt, 'proname')
299+
__file_format_lower__ = config.get(main_fmt, 'lower')
300+
__file_format_magic__ = decode_unicode_escape(config.get(main_fmt, 'magic'))
301+
__file_format_len__ = config.getint(main_fmt, 'len')
302+
__file_format_hex__ = config.get(main_fmt, 'hex')
303+
__file_format_delimiter__ = decode_unicode_escape(config.get(main_fmt, 'delimiter'))
304+
__file_format_ver__ = config.get(main_fmt, 'ver')
305+
__use_new_style__ = config.getboolean(main_fmt, 'newstyle')
306+
__use_advanced_list__ = config.getboolean(main_fmt, 'advancedlist')
307+
__use_alt_inode__ = config.getboolean(main_fmt, 'altinode')
308+
__file_format_extension__ = config.get(main_fmt, 'extension')
307309
else:
308-
__file_format_name__ = config.get('alt', 'name')
309-
__program_name__ = config.get('alt', 'proname')
310-
__file_format_lower__ = config.get('alt', 'lower')
311-
__file_format_magic__ = decode_unicode_escape(config.get('alt', 'magic'))
312-
__file_format_len__ = config.getint('alt', 'len')
313-
__file_format_hex__ = config.get('alt', 'hex')
314-
__file_format_delimiter__ = decode_unicode_escape(config.get('alt', 'delimiter'))
315-
__file_format_ver__ = config.get('alt', 'ver')
316-
__use_new_style__ = config.getboolean('alt', 'newstyle')
317-
__use_advanced_list__ = config.getboolean('alt', 'advancedlist')
318-
__use_alt_inode__ = config.getboolean('alt', 'altinode')
319-
__file_format_extension__ = config.get('alt', 'extension')
310+
__file_format_name__ = config.get(alt_fmt, 'name')
311+
__program_name__ = config.get(alt_fmt, 'proname')
312+
__file_format_lower__ = config.get(alt_fmt, 'lower')
313+
__file_format_magic__ = decode_unicode_escape(config.get(alt_fmt, 'magic'))
314+
__file_format_len__ = config.getint(alt_fmt, 'len')
315+
__file_format_hex__ = config.get(alt_fmt, 'hex')
316+
__file_format_delimiter__ = decode_unicode_escape(config.get(alt_fmt, 'delimiter'))
317+
__file_format_ver__ = config.get(alt_fmt, 'ver')
318+
__use_new_style__ = config.getboolean(alt_fmt, 'newstyle')
319+
__use_advanced_list__ = config.getboolean(alt_fmt, 'advancedlist')
320+
__use_alt_inode__ = config.getboolean(alt_fmt, 'altinode')
321+
__file_format_extension__ = config.get(alt_fmt, 'extension')
320322
else:
321323
if not __use_alt_format__:
322324
# Format Info by Kazuki Przyborowski

0 commit comments

Comments
 (0)