Skip to content

Commit

Permalink
Update italy_yaml loader to support get_statement boolean
Browse files Browse the repository at this point in the history
  • Loading branch information
wil93 authored and stefano-maggiolo committed Aug 5, 2015
1 parent 518bcc4 commit 2e3c7f9
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 16 deletions.
4 changes: 3 additions & 1 deletion cmscontrib/loaders/base_loader.py
Expand Up @@ -86,9 +86,11 @@ class TaskLoader(BaseLoader):
def __init__(self, path, file_cacher):
super(TaskLoader, self).__init__(path, file_cacher)

def get_task(self):
def get_task(self, get_statement):
"""Produce a Task object.
get_statement (boolean): whether the statement should be imported.
return (Task): the Task object.
"""
Expand Down
32 changes: 17 additions & 15 deletions cmscontrib/loaders/italy_yaml.py
Expand Up @@ -344,7 +344,7 @@ def get_user(self):

return User(**args)

def get_task(self):
def get_task(self, get_statement):
"""See docstring in class Loader.
"""
Expand Down Expand Up @@ -387,21 +387,23 @@ def get_task(self):
primary_language = load(conf, None, "primary_language")
if primary_language is None:
primary_language = 'it'
paths = [os.path.join(self.path, "statement", "statement.pdf"),
os.path.join(self.path, "testo", "testo.pdf")]
for path in paths:
if os.path.exists(path):
digest = self.file_cacher.put_file_from_path(
path,
"Statement for task %s (lang: %s)" % (name,
primary_language))
break
else:
logger.critical("Couldn't find any task statement, aborting...")
sys.exit(1)
args["statements"] = [Statement(primary_language, digest)]

args["primary_statements"] = '["%s"]' % (primary_language)
if get_statement:
paths = [os.path.join(self.path, "statement", "statement.pdf"),
os.path.join(self.path, "testo", "testo.pdf")]
for path in paths:
if os.path.exists(path):
digest = self.file_cacher.put_file_from_path(
path,
"Statement for task %s (lang: %s)" % (name,
primary_language))
break
else:
logger.critical("Couldn't find any task statement, aborting...")
sys.exit(1)
args["statements"] = [Statement(primary_language, digest)]

args["primary_statements"] = '["%s"]' % (primary_language)

args["attachments"] = [] # FIXME Use auxiliary

Expand Down

0 comments on commit 2e3c7f9

Please sign in to comment.