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

Refactoring: extract common logic.

Browse source
This commit is contained in:
Shlomi Fish 2018-03-12 21:38:30 +02:00
parent e6586a6e78
commit ed07eaf3fb
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pysollib/app.py
View file

@ -1257,17 +1257,16 @@ Please select a %s type %s.
return None return None
return gi.short_name return gi.short_name
def _calcGameFn(self, n):
return re.sub(r"[^\w]", "", latin1_to_ascii(n).lower())
def getGameRulesFilename(self, id): def getGameRulesFilename(self, id):
gi = self.gdb.get(id) gi = self.gdb.get(id)
if gi is None: if gi is None:
return None return None
if gi.rules_filename is not None: if gi.rules_filename is not None:
return gi.rules_filename return gi.rules_filename
n = gi.en_name # english name n = self._calcGameFn(gi.en_name) + '.html' # english name
# n = re.sub(r"[\[\(].*$", "", n)
n = latin1_to_ascii(n)
n = re.sub(r"[^\w]", "", n)
n = n.lower() + ".html"
f = os.path.join(self.dataloader.dir, "html", "rules", n) f = os.path.join(self.dataloader.dir, "html", "rules", n)
if not os.path.exists(f): if not os.path.exists(f):
n = '' n = ''
@ -1280,8 +1279,7 @@ Please select a %s type %s.
n = self.gdb.get(id).en_name # english name n = self.gdb.get(id).en_name # english name
if not n: if not n:
return None return None
return re.sub(r"[^\w]", "", re.sub(r"[\s]", "_", return re.sub(r"[\s]", "_", self._calcGameFn(n))
latin1_to_ascii(n).lower()))
def getRandomGameId(self, games=None): def getRandomGameId(self, games=None):
if games is None: if games is None: