anthonycicc/PySolFC
1
0
Fork 0
mirror of https://github.com/shlomif/PySolFC.git synced 2025-04-05 00:02:29 -04:00
Code Releases Activity

Fix for command line parameters not checking compatible cardsets

Browse source
This commit is contained in:
Joe R 2024-10-17 23:28:28 -04:00
parent cc32c0373e
commit 910f927727
2 changed files with 45 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
pysollib/app.py
View file

@ -812,11 +812,13 @@ class Application:
def checkCompatibleCardsetType(self, gi, cs): def checkCompatibleCardsetType(self, gi, cs):
assert gi is not None assert gi is not None
assert cs is not None cs_type = "None"
cs_subtype = "None"
gc = gi.category gc = gi.category
gs = gi.subcategory gs = gi.subcategory
cs_type = cs.si.type if cs is not None:
cs_subtype = cs.si.subtype cs_type = cs.si.type
cs_subtype = cs.si.subtype
t0, t1 = None, None t0, t1 = None, None
if gc == GI.GC_FRENCH: if gc == GI.GC_FRENCH:
t0 = "French" t0 = "French"
@ -908,14 +910,14 @@ class Application:
# ask # ask
return None, 0, t return None, 0, t
def requestCompatibleCardsetType(self, id): def requestCompatibleCardsetType(self, id, progress=None):
gi = self.getGameInfo(id) gi = self.getGameInfo(id)
# #
cs, cs_update_flag, t = self.getCompatibleCardset(gi, self.cardset) cs, cs_update_flag, t = self.getCompatibleCardset(gi, self.cardset)
if cs is self.cardset: if cs is self.cardset:
return 0 return 0
if cs is not None: if cs is not None:
self.loadCardset(cs, update=1) self.loadCardset(cs, update=1, progress=progress)
return 1 return 1
self.requestCompatibleCardsetTypeDialog(self.cardset, gi, t) self.requestCompatibleCardsetTypeDialog(self.cardset, gi, t)
@ -923,7 +925,7 @@ class Application:
cs = self.__selectCardsetDialog(t) cs = self.__selectCardsetDialog(t)
if cs is None: if cs is None:
return -1 return -1
self.loadCardset(cs, id=id) self.loadCardset(cs, id=id, progress=progress)
return 1 return 1
def requestCompatibleCardsetTypeDialog(self, cardset, gi, t): def requestCompatibleCardsetTypeDialog(self, cardset, gi, t):

54
pysollib/main.py
View file

@ -108,7 +108,7 @@ def parse_option(argv):
for i in optlist: for i in optlist:
if i[0] in ("-h", "--help"): if i[0] in ("-h", "--help"):
opts["help"] = True opts["help"] = True
elif i[0] in ("--deal"): elif i[0] == "--deal":
opts["deal"] = i[1] opts["deal"] = i[1]
elif i[0] in ("-g", "--game"): elif i[0] in ("-g", "--game"):
opts["game"] = i[1] opts["game"] = i[1]
@ -127,11 +127,12 @@ def parse_option(argv):
if opts["help"]: if opts["help"]:
print(_("""Usage: %s [OPTIONS] [FILE] print(_("""Usage: %s [OPTIONS] [FILE]
-g --game=GAMENAME start game GAMENAME -g --game=GAMENAME start game GAMENAME
-i --gameid=GAMEID -i --gameid=GAMEID start game with ID GAMEID
--french-only --deal=DEAL start game deal by number DEAL
--sound-mod=MOD --french-only disable non-french games
--sound-mod=MOD use a certain sound module
--nosound disable sound support --nosound disable sound support
--noplugins disable load plugins --noplugins disable loading plugins
-h --help display this help and exit -h --help display this help and exit
FILE - file name of a saved game FILE - file name of a saved game
@ -403,19 +404,38 @@ Cardsets package is up to date.
app.loadImages3() app.loadImages3()
app.loadImages4() app.loadImages4()
# load cardset startgameid = app.opt.last_gameid
progress = app.intro.progress
if not app.loadCardset(cardset, progress=progress, id=app.opt.last_gameid):
if not cardset:
for cardset in app.cardset_manager.getAll():
progress.reset()
if app.loadCardset(cardset, progress=progress, if app.commandline.loadgame:
id=app.opt.last_gameid): pass
break elif app.commandline.game is not None:
else: gameid = app.gdb.getGameByName(app.commandline.game)
fatal_no_cardsets(app) if gameid is None:
return 3 print_err(_("can't find game: %(game)s") % {
'game': app.commandline.game})
sys.exit(-1)
else:
startgameid = gameid
elif app.commandline.gameid is not None:
startgameid = app.commandline.gameid
progress = app.intro.progress
# load cardset
if startgameid != app.opt.last_gameid:
success = app.requestCompatibleCardsetType(startgameid,
progress=progress)
else:
success = app.loadCardset(cardset, progress=progress, id=startgameid)
if not success and not cardset:
for cardset in app.cardset_manager.getAll():
progress.reset()
if app.loadCardset(cardset, progress=progress,
id=startgameid):
break
else:
fatal_no_cardsets(app)
return 3
# ok # ok
return 0 return 0