changeset 565:5f7f859a72f9

Move CLI options to their own module.
author Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
date Wed, 18 Jun 2014 22:39:11 +0200
parents a0fa01cd9f70
children 04ae31809dc7
files pytouhou/options.py scripts/pytouhou
diffstat 2 files changed, 64 insertions(+), 48 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pytouhou/options.py	Wed Jun 18 22:39:11 2014 +0200
@@ -0,0 +1,60 @@
+# -*- encoding: utf-8 -*-
+##
+## Copyright (C) 2014 Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
+##
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published
+## by the Free Software Foundation; version 3 only.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+
+from argparse import ArgumentParser
+
+
+def parse_arguments(defaults):
+    parser = ArgumentParser(description='Libre reimplementation of the Touhou 6 engine.')
+
+    parser.add_argument('data', metavar='DAT', default=defaults['data'], nargs='*', help='Game’s data files')
+    parser.add_argument('-p', '--path', metavar='DIRECTORY', default='.', help='Game directory path.')
+    parser.add_argument('--debug', action='store_true', help='Set unlimited continues, and perhaps other debug features.')
+    parser.add_argument('--verbosity', metavar='VERBOSITY', choices=['DEBUG', 'INFO', 'WARNING', 'ERROR', 'CRITICAL'], help='Select the wanted logging level.')
+
+    game_group = parser.add_argument_group('Game options')
+    game_group.add_argument('-s', '--stage', metavar='STAGE', type=int, default=None, help='Stage, 1 to 7 (Extra), nothing means story mode.')
+    game_group.add_argument('-r', '--rank', metavar='RANK', type=int, default=0, help='Rank, from 0 (Easy, default) to 3 (Lunatic).')
+    game_group.add_argument('-c', '--character', metavar='CHARACTER', type=int, default=0, help='Select the character to use, from 0 (ReimuA, default) to 3 (MarisaB).')
+    game_group.add_argument('-b', '--boss-rush', action='store_true', help='Fight only bosses.')
+    game_group.add_argument('--game', metavar='GAME', choices=['EoSD'], default='EoSD', help='Select the game engine to use.')
+    game_group.add_argument('--interface', metavar='INTERFACE', choices=['EoSD', 'Sample'], default='EoSD', help='Select the interface to use.')
+    game_group.add_argument('--hints', metavar='HINTS', default=None, help='Hints file, to display text while playing.')
+
+    replay_group = parser.add_argument_group('Replay options')
+    replay_group.add_argument('--replay', metavar='REPLAY', help='Select a file to replay.')
+    replay_group.add_argument('--save-replay', metavar='REPLAY', help='Save the upcoming game into a replay file.')
+    replay_group.add_argument('--skip-replay', action='store_true', help='Skip the replay and start to play when it’s finished.')
+
+    netplay_group = parser.add_argument_group('Netplay options')
+    netplay_group.add_argument('--port', metavar='PORT', type=int, default=0, help='Local port to use.')
+    netplay_group.add_argument('--remote', metavar='REMOTE', default=None, help='Remote address.')
+    netplay_group.add_argument('--friendly-fire', action='store_true', help='Allow friendly-fire during netplay.')
+
+    graphics_group = parser.add_argument_group('Graphics options')
+    graphics_group.add_argument('--backend', metavar='BACKEND', choices=['opengl', 'sdl'], default=['opengl', 'sdl'], nargs='*', help='Which backend to use (opengl or sdl).')
+    graphics_group.add_argument('--fps-limit', metavar='FPS', default=-1, type=int, help='Set fps limit. A value of 0 disables fps limiting, while a negative value limits to 60 fps if and only if vsync doesn’t work.')
+    graphics_group.add_argument('--no-background', action='store_false', help='Disable background display (huge performance boost on slow systems).')
+    graphics_group.add_argument('--no-particles', action='store_false', help='Disable particles handling (huge performance boost on slow systems).')
+    graphics_group.add_argument('--no-sound', action='store_false', help='Disable music and sound effects.')
+
+    opengl_group = parser.add_argument_group('OpenGL backend options')
+    opengl_group.add_argument('--gl-flavor', choices=['core', 'es', 'compatibility', 'legacy'], default='compatibility', help='OpenGL profile to use.')
+    opengl_group.add_argument('--gl-version', default=2.1, type=float, help='OpenGL version to use.')
+
+    double_buffer = opengl_group.add_mutually_exclusive_group()
+    double_buffer.add_argument('--double-buffer', dest='double_buffer', action='store_true', default=None, help='Enable double buffering.')
+    double_buffer.add_argument('--single-buffer', dest='double_buffer', action='store_false', default=None, help='Disable double buffering.')
+
+    return parser.parse_args()
--- a/scripts/pytouhou	Thu Jun 12 18:41:01 2014 +0200
+++ b/scripts/pytouhou	Wed Jun 18 22:39:11 2014 +0200
@@ -13,61 +13,17 @@
 ## GNU General Public License for more details.
 ##
 
-import argparse
-import os
-
-
-pathsep = os.path.pathsep
+from os.path import pathsep
 default_data = (pathsep.join(('CM.DAT', 'th06*_CM.DAT', '*CM.DAT', '*cm.dat')),
                 pathsep.join(('ST.DAT', 'th6*ST.DAT', '*ST.DAT', '*st.dat')),
                 pathsep.join(('IN.DAT', 'th6*IN.DAT', '*IN.DAT', '*in.dat')),
                 pathsep.join(('MD.DAT', 'th6*MD.DAT', '*MD.DAT', '*md.dat')),
                 pathsep.join(('102h.exe', '102*.exe', '東方紅魔郷.exe', '*.exe')))
 
-
-parser = argparse.ArgumentParser(description='Libre reimplementation of the Touhou 6 engine.')
-
-parser.add_argument('data', metavar='DAT', default=default_data, nargs='*', help='Game’s data files')
-parser.add_argument('-p', '--path', metavar='DIRECTORY', default='.', help='Game directory path.')
-parser.add_argument('--debug', action='store_true', help='Set unlimited continues, and perhaps other debug features.')
-parser.add_argument('--verbosity', metavar='VERBOSITY', choices=['DEBUG', 'INFO', 'WARNING', 'ERROR', 'CRITICAL'], help='Select the wanted logging level.')
-
-game_group = parser.add_argument_group('Game options')
-game_group.add_argument('-s', '--stage', metavar='STAGE', type=int, default=None, help='Stage, 1 to 7 (Extra), nothing means story mode.')
-game_group.add_argument('-r', '--rank', metavar='RANK', type=int, default=0, help='Rank, from 0 (Easy, default) to 3 (Lunatic).')
-game_group.add_argument('-c', '--character', metavar='CHARACTER', type=int, default=0, help='Select the character to use, from 0 (ReimuA, default) to 3 (MarisaB).')
-game_group.add_argument('-b', '--boss-rush', action='store_true', help='Fight only bosses.')
-game_group.add_argument('--game', metavar='GAME', choices=['EoSD'], default='EoSD', help='Select the game engine to use.')
-game_group.add_argument('--interface', metavar='INTERFACE', choices=['EoSD', 'Sample'], default='EoSD', help='Select the interface to use.')
-game_group.add_argument('--hints', metavar='HINTS', default=None, help='Hints file, to display text while playing.')
-
-replay_group = parser.add_argument_group('Replay options')
-replay_group.add_argument('--replay', metavar='REPLAY', help='Select a file to replay.')
-replay_group.add_argument('--save-replay', metavar='REPLAY', help='Save the upcoming game into a replay file.')
-replay_group.add_argument('--skip-replay', action='store_true', help='Skip the replay and start to play when it’s finished.')
+defaults = {'data': default_data}
 
-netplay_group = parser.add_argument_group('Netplay options')
-netplay_group.add_argument('--port', metavar='PORT', type=int, default=0, help='Local port to use.')
-netplay_group.add_argument('--remote', metavar='REMOTE', default=None, help='Remote address.')
-netplay_group.add_argument('--friendly-fire', action='store_true', help='Allow friendly-fire during netplay.')
-
-graphics_group = parser.add_argument_group('Graphics options')
-graphics_group.add_argument('--backend', metavar='BACKEND', choices=['opengl', 'sdl'], default=['opengl', 'sdl'], nargs='*', help='Which backend to use (opengl or sdl).')
-graphics_group.add_argument('--fps-limit', metavar='FPS', default=-1, type=int, help='Set fps limit. A value of 0 disables fps limiting, while a negative value limits to 60 fps if and only if vsync doesn’t work.')
-graphics_group.add_argument('--no-background', action='store_false', help='Disable background display (huge performance boost on slow systems).')
-graphics_group.add_argument('--no-particles', action='store_false', help='Disable particles handling (huge performance boost on slow systems).')
-graphics_group.add_argument('--no-sound', action='store_false', help='Disable music and sound effects.')
-
-opengl_group = parser.add_argument_group('OpenGL backend options')
-opengl_group.add_argument('--gl-flavor', choices=['core', 'es', 'compatibility', 'legacy'], default='compatibility', help='OpenGL profile to use.')
-opengl_group.add_argument('--gl-version', default=2.1, type=float, help='OpenGL version to use.')
-
-double_buffer = opengl_group.add_mutually_exclusive_group()
-double_buffer.add_argument('--double-buffer', dest='double_buffer', action='store_true', default=None, help='Enable double buffering.')
-double_buffer.add_argument('--single-buffer', dest='double_buffer', action='store_false', default=None, help='Disable double buffering.')
-
-args = parser.parse_args()
-
+from pytouhou.options import parse_arguments
+args = parse_arguments(defaults)
 
 import sys
 import logging