bugfix and switch huntnum to 2

dlareau · Sep 30, 2015 · 08dc181 · 08dc181
1 parent d33646d
commit 08dc181
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/huntserver/puzzle.py b/huntserver/puzzle.py
@@ -68,13 +68,21 @@ def unlock_puzzles(team):
 # Has to also get number of pages so that the whole pdf doesn't become one image
 def download_puzzles(hunt):
     directory = "/home/hunt/puzzlehunt_server/huntserver/static/huntserver/puzzles"
+    # TODO: maybe move folder, see if success, then delete.
+    # maybe overwrite files with wget?
+
+    # Remove old folder
     call(["rm", "-r", directory])
     call(["mkdir", directory])
+
     curr_hunt = Hunt.objects.get(hunt_number=settings.CURRENT_HUNT_NUM)
     for puzzle in curr_hunt.puzzle_set.all():
+        # Get the file
         file_str = directory + "/" +  puzzle.puzzle_id + ".pdf"
         call(["wget", puzzle.link, "-O", file_str])
+        # get file info
         pages = int(check_output("pdfinfo " + file_str + " | grep Pages | awk '{print $2}'", shell=True))
+        # convert file page by page
         for i in range(pages):
             call(["convert", "-density", "200", "-scale", "x1000", file_str + "[" + str(i) + "]", directory + "/" + puzzle.puzzle_id + "-" + str(i) + ".png"])
 

diff --git a/huntserver/redis.py b/huntserver/redis.py
@@ -49,7 +49,7 @@ def send_status_update(puzzle, team, status_type):
 # Displays a chat message to the relevant users
 def send_chat_message(message):
     redis_publisher = RedisPublisher(facility='chat_message',
-                      users=[settings.ADMIN_ACCT[0], message.team.login_info.username])
+                      users=[settings.ADMIN_ACCTS[0], message.team.login_info.username])
     packet = dict()
     packet['team_pk'] = message.team.pk
     packet['team_name'] = message.team.team_name

diff --git a/puzzlehunt_server/settings.py b/puzzlehunt_server/settings.py
@@ -14,7 +14,7 @@
 from secret_settings import *
 
 """ PLEASE UPDATE BEFORE STARTING HUNT DEVELOPMENT """
-CURRENT_HUNT_NUM = 1
+CURRENT_HUNT_NUM = 2
 
 """ !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! """