valid xhtml5

See https://github.com/shlomif/pysolfc-website/ - do not remove.

.gitignore

@@ -1,6 +1,7 @@
 *.pyc
 /.tidyall.d/
 /MANIFEST
+/_Inline/
 /build/*
 /data/cardsets/*
 /data/html/*
@@ -16,14 +17,10 @@
 /po/ru.po
 /tests/individually-importing/*.py
 /tests/unit-generated/*.py
-
-# output of min card actions
-# mask out folder/archives
-PySolFC-Cardsets--Minimal-2.0/
 PySolFC-Cardsets--Minimal-2.0.*
-PySolFC-Cardsets-2.0/
+PySolFC-Cardsets--Minimal-2.0/
 PySolFC-Cardsets-2.0.*
-
-android/bin/keystore
-android/*.zip
+PySolFC-Cardsets-2.0/
 android/*.apk
+android/*.zip
+android/bin/keystore

Makefile

@@ -21,8 +21,16 @@ dist: all_games_html rules mo
 rpm: all_games_html rules mo
 	python3 setup.py bdist_rpm
 
-all_games_html: rules
-	cd data/html && $(CURDIR)/scripts/all_games.py html id rules > all_games.html
+DOCS_DIR = docs
+HTML_DIR = data/html
+ALL_GAMES_HTML_BASE = all_games.html
+ALL_GAMES_HTML = $(HTML_DIR)/$(ALL_GAMES_HTML_BASE)
+ALL_GAMES_HTML__FOR_WEBSITE = $(DOCS_DIR)/$(ALL_GAMES_HTML_BASE)
+all_games_html: $(ALL_GAMES_HTML)
+
+$(ALL_GAMES_HTML) $(ALL_GAMES_HTML__FOR_WEBSITE): rules
+	cd $(HTML_DIR) && $(CURDIR)/scripts/all_games.py html id rules > $(ALL_GAMES_HTML_BASE)
+	./scripts/all_games.py html id doc/rules bare > $(ALL_GAMES_HTML__FOR_WEBSITE)
 
 rules:
 	cd html-src && ./gen-html.py

pysollib/game/__init__.py

@@ -360,9 +360,79 @@ class GameTexts(NewStruct):
     list = attr.ib(factory=list)
 
 
+@attr.s
+class GameHints(NewStruct):
+    list = attr.ib(default=None)
+    index = attr.ib(default=-1)
+    level = attr.ib(default=-1)
+
+
+@attr.s
+class GameStatsStruct(NewStruct):
+    hints = attr.ib(default=0)                  # number of hints consumed
+    # number of highlight piles consumed
+    highlight_piles = attr.ib(default=0)
+    # number of highlight matching cards consumed
+    highlight_cards = attr.ib(default=0)
+    # number of highlight same rank consumed
+    highlight_samerank = attr.ib(default=0)
+    undo_moves = attr.ib(default=0)             # number of undos
+    redo_moves = attr.ib(default=0)             # number of redos
+    # number of total moves in this game
+    total_moves = attr.ib(default=0)
+    player_moves = attr.ib(default=0)           # number of moves
+    # number of moves while in demo mode
+    demo_moves = attr.ib(default=0)
+    autoplay_moves = attr.ib(default=0)         # number of moves
+    quickplay_moves = attr.ib(default=0)        # number of quickplay moves
+    goto_bookmark_moves = attr.ib(default=0)    # number of goto bookmark
+    shuffle_moves = attr.ib(default=0)          # number of shuffles (Mahjongg)
+    # did this game already update the demo stats ?
+    demo_updated = attr.ib(default=0)
+    update_time = attr.ib()
+    @update_time.default
+    def _foofoo(self):
+        return time.time()  # for updateTime()
+    elapsed_time = attr.ib(default=0.0)
+    pause_start_time = attr.ib(default=0.0)
+
+    def _reset_statistics(self):
+        """docstring for _reset_stats"""
+        self.undo_moves = 0
+        self.redo_moves = 0
+        self.player_moves = 0
+        self.demo_moves = 0
+        self.total_moves = 0
+        self.quickplay_moves = 0
+        self.goto_bookmark_moves = 0
+
+
+_GLOBAL_U_PLAY = 0
+
+
+@attr.s
+class GameGlobalStatsStruct(NewStruct):
+    holded = attr.ib(default=0)                 # is this a holded game
+    # number of times this game was loaded
+    loaded = attr.ib(default=0)
+    # number of times this game was saved
+    saved = attr.ib(default=0)
+    # number of times this game was restarted
+    restarted = attr.ib(default=0)
+    goto_bookmark_moves = attr.ib(default=0)    # number of goto bookmark
+    # did this game already update the player stats ?
+    updated = attr.ib(default=_GLOBAL_U_PLAY)
+    start_time = attr.ib()
+    @start_time.default
+    def _foofoo(self):
+        return time.time()  # for updateTime()
+    total_elapsed_time = attr.ib(default=0.0)
+    start_player = attr.ib(default=None)
+
+
 class Game(object):
     # for self.gstats.updated
-    U_PLAY = 0
+    U_PLAY = _GLOBAL_U_PLAY
     U_WON = -2
     U_LOST = -3
     U_PERFECT = -4
@@ -604,11 +674,7 @@ class Game(object):
         self.filename = ""
         self.demo = None
         self.solver = None
-        self.hints = Struct(
-            list=None,                # list of hints for the current move
-            index=-1,
-            level=-1,
-        )
+        self.hints = GameHints()
         self.saveinfo = Struct(         # needed for saving a game
             stack_caps=[],
         )
@@ -620,43 +686,12 @@ class Game(object):
         self.snapshots = []
         self.failed_snapshots = []
         # local statistics are reset on each game restart
-        self.stats = Struct(
-            hints=0,                  # number of hints consumed
-            highlight_piles=0,        # number of highlight piles consumed
-            # number of highlight matching cards consumed
-            highlight_cards=0,
-            highlight_samerank=0,     # number of highlight same rank consumed
-            undo_moves=0,             # number of undos
-            redo_moves=0,             # number of redos
-            total_moves=0,            # number of total moves in this game
-            player_moves=0,           # number of moves
-            demo_moves=0,             # number of moves while in demo mode
-            autoplay_moves=0,         # number of moves
-            quickplay_moves=0,        # number of quickplay moves
-            goto_bookmark_moves=0,    # number of goto bookmark
-            shuffle_moves=0,          # number of shuffles (Mahjongg)
-            # did this game already update the demo stats ?
-            demo_updated=0,
-            update_time=time.time(),  # for updateTime()
-            elapsed_time=0.0,
-            pause_start_time=0.0,
-        )
+        self.stats = GameStatsStruct()
         self.startMoves()
         if restart:
             return
         # global statistics survive a game restart
-        self.gstats = Struct(
-            holded=0,                 # is this a holded game
-            loaded=0,                 # number of times this game was loaded
-            saved=0,                  # number of times this game was saved
-            restarted=0,              # number of times this game was restarted
-            goto_bookmark_moves=0,    # number of goto bookmark
-            # did this game already update the player stats ?
-            updated=self.U_PLAY,
-            start_time=time.time(),   # game start time
-            total_elapsed_time=0.0,
-            start_player=None,
-        )
+        self.gstats = GameGlobalStatsStruct()
         # global saveinfo survives a game restart
         self.gsaveinfo = Struct(
             bookmarks={},
@@ -887,7 +922,7 @@ class Game(object):
             return
         if restart:
             if self.moves.index > 0 and self.getPlayerMoves() > 0:
-                self.gstats.restarted = self.gstats.restarted + 1
+                self.gstats.restarted += 1
             return
         self.updateStats()
         stats = self.app.stats
@@ -2731,14 +2766,7 @@ class Game(object):
             index=0,
             current=[],        # atomic moves for the current move
         )
-        # reset statistics
-        self.stats.undo_moves = 0
-        self.stats.redo_moves = 0
-        self.stats.player_moves = 0
-        self.stats.demo_moves = 0
-        self.stats.total_moves = 0
-        self.stats.quickplay_moves = 0
-        self.stats.goto_bookmark_moves = 0
+        self.stats._reset_statistics()
 
     def __storeMove(self, am):
         if self.S_DEAL <= self.moves.state <= self.S_PLAY:
@@ -3082,7 +3110,7 @@ class Game(object):
         game = None
         with open(filename, "rb") as f:
             game = self._undumpGame(Unpickler(f), app)
-            game.gstats.loaded = game.gstats.loaded + 1
+            game.gstats.loaded += 1
         return game
 
     def _undumpGame(self, p, app):

scripts/all_games.py

@@ -150,7 +150,7 @@ def all_games(sort_by='id'):
         if gt == 'French':
             gt = 'French (%s)' % GAME_BY_TYPE[gi.si.game_type]
         name = gi.name
-        altnames = '<br>'.join(gi.altnames)
+        altnames = '<br/>'.join(gi.altnames)
         fn = os.path.join(rules_dir, rules_fn)
         if 1 and os.path.exists(fn):
             print('''<tr>

scripts/cardconv

@@ -34,9 +34,15 @@ convdir() {
   mkdir -p "$2"
 
   # Convert all images
-  for i in $1/*.$ifo; do
-    convert "$i" "$2/$(basename $i .$ifo).$ofo"
-  done
+  if [ $ofo == 'png' ]; then
+    for i in $1/*.$ifo; do
+      convert "$i" "-matte" "-quality" "95" "png32:$2/$(basename $i .$ifo).$ofo"
+    done
+  else
+    for i in $1/*.$ifo; do
+      convert "$i" "$2/$(basename $i .$ifo).$ofo"
+    done
+  fi
 
   # Convert config.txt
   if [ -f $1/config.txt ]; then