mirror of
https://github.com/shlomif/PySolFC.git
synced 2025-04-05 00:02:29 -04:00
Extract a method or a function.
This is Refactoring / code cleanup. See: * https://refactoring.com/catalog/extractMethod.html * https://en.wikipedia.org/wiki/Code_refactoring * https://www.refactoring.com/ * https://www.joelonsoftware.com/2002/01/23/rub-a-dub-dub/ Some small optimisations may have slipped in as well.
This commit is contained in:
Shlomi Fish
parent
62005c7c42
commit
7934babad2
1 changed files with 64 additions and 64 deletions
|
|
@ -298,6 +298,24 @@ class StackRegions(object):
|
||||||
info.append((stacks, newrect))
|
info.append((stacks, newrect))
|
||||||
self.info = tuple(info)
|
self.info = tuple(info)
|
||||||
|
|
||||||
|
def optimize(self, remaining):
|
||||||
|
"""docstring for optimize"""
|
||||||
|
# sort data by priority
|
||||||
|
self.data.sort()
|
||||||
|
self.data.reverse()
|
||||||
|
# copy (stacks, rect) to info
|
||||||
|
self.info = []
|
||||||
|
for d in self.data:
|
||||||
|
self.info.append((d[2], d[3]))
|
||||||
|
self.info = tuple(self.info)
|
||||||
|
# determine remaining stacks
|
||||||
|
for stacks, rect in self.info:
|
||||||
|
for stack in stacks:
|
||||||
|
while stack in remaining:
|
||||||
|
remaining.remove(stack)
|
||||||
|
self.remaining = tuple(remaining)
|
||||||
|
self.init_info = self.info
|
||||||
|
|
||||||
|
|
||||||
class Game(object):
|
class Game(object):
|
||||||
# for self.gstats.updated
|
# for self.gstats.updated
|
||||||
|
|
@ -385,7 +403,6 @@ class Game(object):
|
||||||
assert hasattr(self.s.talon, "max_rounds")
|
assert hasattr(self.s.talon, "max_rounds")
|
||||||
if DEBUG:
|
if DEBUG:
|
||||||
self._checkGame()
|
self._checkGame()
|
||||||
# optimize regions
|
|
||||||
self.optimizeRegions()
|
self.optimizeRegions()
|
||||||
# create cards
|
# create cards
|
||||||
if not self.cards:
|
if not self.cards:
|
||||||
|
|
@ -561,7 +578,6 @@ class Game(object):
|
||||||
for stack in self.allstacks:
|
for stack in self.allstacks:
|
||||||
stack.prepareStack()
|
stack.prepareStack()
|
||||||
stack.assertStack()
|
stack.assertStack()
|
||||||
# optimize regions
|
|
||||||
self.optimizeRegions()
|
self.optimizeRegions()
|
||||||
# create cards
|
# create cards
|
||||||
self.cards = self.createCards()
|
self.cards = self.createCards()
|
||||||
|
|
@ -1734,22 +1750,7 @@ class Game(object):
|
||||||
# as getClosestStack() is called within the mouse motion handler
|
# as getClosestStack() is called within the mouse motion handler
|
||||||
# event it is worth optimizing a little bit
|
# event it is worth optimizing a little bit
|
||||||
def optimizeRegions(self):
|
def optimizeRegions(self):
|
||||||
# sort regions.data by priority
|
return self.regions.optimize(list(self.sg.openstacks))
|
||||||
self.regions.data.sort()
|
|
||||||
self.regions.data.reverse()
|
|
||||||
# copy (stacks, rect) to regions.info
|
|
||||||
self.regions.info = []
|
|
||||||
for d in self.regions.data:
|
|
||||||
self.regions.info.append((d[2], d[3]))
|
|
||||||
self.regions.info = tuple(self.regions.info)
|
|
||||||
# determine remaining stacks
|
|
||||||
remaining = list(self.sg.openstacks)
|
|
||||||
for stacks, rect in self.regions.info:
|
|
||||||
for stack in stacks:
|
|
||||||
while stack in remaining:
|
|
||||||
remaining.remove(stack)
|
|
||||||
self.regions.remaining = tuple(remaining)
|
|
||||||
self.regions.init_info = self.regions.info
|
|
||||||
|
|
||||||
def getInvisibleCoords(self):
|
def getInvisibleCoords(self):
|
||||||
# for InvisibleStack, etc
|
# for InvisibleStack, etc
|
||||||
|
|
@ -1876,18 +1877,20 @@ class Game(object):
|
||||||
top_msg = ''
|
top_msg = ''
|
||||||
if ret:
|
if ret:
|
||||||
if ret[0] and ret[1]:
|
if ret[0] and ret[1]:
|
||||||
top_msg = _('''
|
top_msg = _(
|
||||||
You have reached
|
'''\nYou have reached\n''' +
|
||||||
# %d in the %s of playing time
|
'# %d in the %s of playing time' +
|
||||||
and # %d in the %s of moves.''') % (ret[0], TOP_TITLE, ret[1], TOP_TITLE)
|
'\nand # %d in the %s of moves.') % \
|
||||||
|
(ret[0], TOP_TITLE, ret[1], TOP_TITLE)
|
||||||
elif ret[0]: # playing time
|
elif ret[0]: # playing time
|
||||||
top_msg = _('''
|
top_msg = _(
|
||||||
You have reached
|
'''\nYou have reached\n''' +
|
||||||
# %d in the %s of playing time.''') % (ret[0], TOP_TITLE)
|
'''# %d in the %s of playing time.''') \
|
||||||
|
% (ret[0], TOP_TITLE)
|
||||||
elif ret[1]: # moves
|
elif ret[1]: # moves
|
||||||
top_msg = _('''
|
top_msg = _(
|
||||||
You have reached
|
'''\nYou have reached\n''' +
|
||||||
# %d in the %s of moves.''') % (ret[1], TOP_TITLE)
|
'# %d in the %s of moves.') % (ret[1], TOP_TITLE)
|
||||||
return top_msg
|
return top_msg
|
||||||
elif not demo:
|
elif not demo:
|
||||||
# only update the session log
|
# only update the session log
|
||||||
|
|
@ -1923,14 +1926,10 @@ You have reached
|
||||||
'''Your playing time is %s\nfor %d moves.''',
|
'''Your playing time is %s\nfor %d moves.''',
|
||||||
self.moves.index)
|
self.moves.index)
|
||||||
text = text % (time, self.moves.index)
|
text = text % (time, self.moves.index)
|
||||||
d = MfxMessageDialog(self.top, title=_("Game won"),
|
d = MfxMessageDialog(
|
||||||
text=_('''
|
self.top, title=_("Game won"),
|
||||||
Congratulations, this
|
text=_('\nCongratulations, this\nwas a truly perfect game !' +
|
||||||
was a truly perfect game !
|
'\n\n%s\n%s\n') % (text, top_msg),
|
||||||
|
|
||||||
%s
|
|
||||||
%s
|
|
||||||
''') % (text, top_msg),
|
|
||||||
strings=(_("&New game"), None, _("&Cancel")),
|
strings=(_("&New game"), None, _("&Cancel")),
|
||||||
image=self.app.gimages.logos[5])
|
image=self.app.gimages.logos[5])
|
||||||
elif status == 1:
|
elif status == 1:
|
||||||
|
|
@ -1943,13 +1942,12 @@ was a truly perfect game !
|
||||||
'''Your playing time is %s\nfor %d moves.''',
|
'''Your playing time is %s\nfor %d moves.''',
|
||||||
self.moves.index)
|
self.moves.index)
|
||||||
text = text % (time, self.moves.index)
|
text = text % (time, self.moves.index)
|
||||||
d = MfxMessageDialog(self.top, title=_("Game won"),
|
d = MfxMessageDialog(
|
||||||
text=_('''
|
self.top, title=_("Game won"),
|
||||||
Congratulations, you did it !
|
text=(
|
||||||
|
_('\nCongratulations, you did it !\n\n%s\n%s\n') %
|
||||||
%s
|
(text, top_msg)
|
||||||
%s
|
),
|
||||||
''') % (text, top_msg),
|
|
||||||
strings=(_("&New game"), None, _("&Cancel")),
|
strings=(_("&New game"), None, _("&Cancel")),
|
||||||
image=self.app.gimages.logos[4])
|
image=self.app.gimages.logos[4])
|
||||||
elif self.gstats.updated < 0:
|
elif self.gstats.updated < 0:
|
||||||
|
|
@ -3022,11 +3020,10 @@ Congratulations, you did it !
|
||||||
self.setCursor(cursor=self.app.top_cursor)
|
self.setCursor(cursor=self.app.top_cursor)
|
||||||
MfxMessageDialog(
|
MfxMessageDialog(
|
||||||
self.top, title=_("Load game error"), bitmap="error",
|
self.top, title=_("Load game error"), bitmap="error",
|
||||||
text=_("""\
|
text=_(
|
||||||
Error while loading game.
|
"Error while loading game.\n\n" +
|
||||||
|
"Probably the game file is damaged,\n" +
|
||||||
Probably the game file is damaged,
|
"but this could also be a bug you might want to report."))
|
||||||
but this could also be a bug you might want to report."""))
|
|
||||||
traceback.print_exc()
|
traceback.print_exc()
|
||||||
except UnpicklingError as ex:
|
except UnpicklingError as ex:
|
||||||
self.updateMenus()
|
self.updateMenus()
|
||||||
|
|
@ -3036,11 +3033,11 @@ but this could also be a bug you might want to report."""))
|
||||||
except Exception:
|
except Exception:
|
||||||
self.updateMenus()
|
self.updateMenus()
|
||||||
self.setCursor(cursor=self.app.top_cursor)
|
self.setCursor(cursor=self.app.top_cursor)
|
||||||
MfxMessageDialog(self.top, title=_("Load game error"),
|
MfxMessageDialog(
|
||||||
bitmap="error", text=_("""\
|
self.top, title=_("Load game error"),
|
||||||
Internal error while loading game.
|
bitmap="error", text=_(
|
||||||
|
"""Internal error while loading game.\n\n""" +
|
||||||
Please report this bug."""))
|
"Please report this bug."))
|
||||||
traceback.print_exc()
|
traceback.print_exc()
|
||||||
else:
|
else:
|
||||||
if self.pause:
|
if self.pause:
|
||||||
|
|
@ -3103,9 +3100,11 @@ Please report this bug."""))
|
||||||
version = pload(str)
|
version = pload(str)
|
||||||
# validate(isinstance(version, str) and len(version) <= 20, err_txt)
|
# validate(isinstance(version, str) and len(version) <= 20, err_txt)
|
||||||
version_tuple = pload(tuple)
|
version_tuple = pload(tuple)
|
||||||
validate(version_tuple >= (1, 0), _('''\
|
validate(
|
||||||
Cannot load games saved with
|
version_tuple >= (1, 0),
|
||||||
%s version %s''') % (PACKAGE, version))
|
_('''Cannot load games saved with\n%s version %s''') % (
|
||||||
|
PACKAGE,
|
||||||
|
version))
|
||||||
game_version = 1
|
game_version = 1
|
||||||
bookmark = pload(int)
|
bookmark = pload(int)
|
||||||
validate(0 <= bookmark <= 2, err_txt)
|
validate(0 <= bookmark <= 2, err_txt)
|
||||||
|
|
@ -3120,10 +3119,11 @@ Cannot load games saved with
|
||||||
if not game.canLoadGame(version_tuple, game_version):
|
if not game.canLoadGame(version_tuple, game_version):
|
||||||
destruct(game)
|
destruct(game)
|
||||||
game = None
|
game = None
|
||||||
validate(game is not None, _('''\
|
validate(
|
||||||
Cannot load this game from version %s
|
game is not None,
|
||||||
as the game rules have changed
|
_('Cannot load this game from version %s\n' +
|
||||||
in the current implementation.''') % version)
|
'as the game rules have changed\n' +
|
||||||
|
'in the current implementation.') % version)
|
||||||
game.version = version
|
game.version = version
|
||||||
game.version_tuple = version_tuple
|
game.version_tuple = version_tuple
|
||||||
#
|
#
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue