Skip to content

Commit

Permalink
v2.26
Browse files Browse the repository at this point in the history
Updated program to version 2.26
  • Loading branch information
Skrepysh committed Jan 29, 2024
1 parent 1eb588a commit 1ef5282
Show file tree
Hide file tree
Showing 5 changed files with 104 additions and 70 deletions.
1 change: 1 addition & 0 deletions config.ini
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@
game_path = default
custom_username = skrepysh.dll
err_pause = 1
fin_quit = 0
22 changes: 10 additions & 12 deletions main.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
group1.add_argument("--restore", default=0, nargs='?', const=1, help="используйте --restore, чтобы восстановить бэкап")
args = parser.parse_args()

program_version = "2.25"
program_version = "2.26"
program = MineSquid(program_version)
logging = program.logging
if __name__ == "__main__":
Expand All @@ -36,32 +36,31 @@
logging.info(f'Путь к игре: {program.game_directory}')
logging.info(f'Путь к папке с пользовательскими данными: {program.userappdata}')
if (int(args.mpnum) != 0 and int(args.mpnum) > 0) and int(args.mpnum) < len(program.list)+1:
program.cmd_args = 1
program.load_modpack(modpack_number=(int(args.mpnum) - 1))
elif str(args.mpname) in program.list:
program.cmd_args = 1
program.load_modpack(modpack_number=program.list.index(args.mpname))
else:
if args.restore != 0:
program.cmd_args = 1
program.restore_backup()
else:
program.run()
except KeyError as err:
logging.error("KeyError")
logging.exception(err)
a = program.repair_config()
if a == 'restart_required':
program.repair_config()
program.repair_config()
except configparser.ParsingError as err:
logging.error("ParsingError")
logging.exception(err)
a = program.repair_config()
if a == 'restart_required':
program.repair_config()
program.repair_config()
except IndexError as err:
logging.error("IndexError")
logging.exception(err)
print(Fore.RED + "Неверное значение!")
a = program.err_pause()
if a == 'disabled':
if a:
print(f"{Fore.MAGENTA}Перезапуск")
program.error(nosleep=True)
except PermissionError as err:
Expand All @@ -76,15 +75,15 @@
logging.error("ZeroSelector")
print(Fore.RED + "Неверное значение")
a = program.err_pause()
if a == 'disabled':
if a:
print(f"{Fore.MAGENTA}Перезапуск")
program.error(nosleep=True)
except ValueError as err:
logging.error("ValueError")
logging.exception(err)
print(Fore.RED + "Неверное значение!")
a = program.err_pause()
if a == 'disabled':
if a:
print(f"{Fore.MAGENTA}Перезапуск")
program.error(nosleep=True)
except FileNotFoundError as err:
Expand All @@ -94,9 +93,8 @@
program.checker()
program.finish()
except Restart:
logging.info("Программа перезапускается (raise Restart)...")
logging.info("Программа перезапускается (raise Restart)")
system("cls")
pass
except KeyboardInterrupt:
print(Fore.RED + '\nQuit by Ctrl+C')
exit()
Expand Down
20 changes: 0 additions & 20 deletions migrate.py

This file was deleted.

Loading

0 comments on commit 1ef5282

Please sign in to comment.