Refactoring player generation scripts. Fixes #16

4 files changed, 23 insertions, 19 deletions

diff --git a/Makefile b/Makefile
index bbae274..d95b9b3 100644
--- a/Makefile
+++ b/Makefile
@@ -21,10 +21,14 @@ editions: $(rankfiles)
 $(rankfiles):
 	python scripts/rankings-editions.py $(patsubst %.ed,%,$@)
 
-players: menus player-pages
+players: player-pages player-data
 
-player-pages:
-	bin/players-build.sh http
+player-pages: menus
+	mkdir -p http/players
+	python scripts/players-prepare-template.py http/players http/players/.menu.html
+
+player-data:
+	python scripts/players-compile.py config/dates.json http/players
 
 statics:
 	python scripts/menus-compile.py config/static.json http http > http/.menu.html
diff --git a/bin/players-build.sh b/bin/players-build.sh
deleted file mode 100755
index 06fdf4f..0000000
--- a/bin/players-build.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-DIR=$1
-mkdir -p $DIR/players
-python scripts/players-compile.py $DIR/players $DIR/players/.menu.html
diff --git a/scripts/players-compile.py b/scripts/players-compile.py
index 66750d1..4007cfa 100644
--- a/scripts/players-compile.py
+++ b/scripts/players-compile.py
@@ -1,22 +1,13 @@
-import copy, os, sys
+import os, sys
 import simplejson as json
-from bs4 import BeautifulSoup as bs4
 from math import ceil
 from pyranking.fetch import fetch_ranking
 
-output_directory = sys.argv[1]
+output_directory = sys.argv[2]
 pagesize = 100.0
 
-template = bs4(file('templates/player.html'), 'lxml')
-menu_file = sys.argv[2]
-menu_content = bs4(file(menu_file), 'html.parser')
-menu = template.select('div.static-menu')[0]
-menu.append(copy.copy(menu_content))
-
-file(os.path.join(output_directory, 'index.html'), 'w').write(template.prettify().encode('utf-8'))
-
 dates = {}
-for date_config in json.load(file('config/dates.json')):
+for date_config in json.load(file(sys.argv[1])):
     dates[date_config['date']] = date_config['url']
 
 players = {}
diff --git a/scripts/players-prepare-template.py b/scripts/players-prepare-template.py
new file mode 100644
index 0000000..3d81482
--- /dev/null
+++ b/scripts/players-prepare-template.py
@@ -0,0 +1,13 @@
+import copy, os, sys
+import simplejson as json
+from bs4 import BeautifulSoup as bs4
+
+output_directory = sys.argv[1]
+
+template = bs4(file('templates/player.html'), 'lxml')
+menu_file = sys.argv[2]
+menu_content = bs4(file(menu_file), 'html.parser')
+menu = template.select('div.static-menu')[0]
+menu.append(copy.copy(menu_content))
+
+file(os.path.join(output_directory, 'index.html'), 'w').write(template.prettify().encode('utf-8'))