Skip to content

Commit bb0a9c6

Browse files
JoshuaLavarinemauromsl
authored andcommitted
RCT-363 | Update prepare_temp_folder outside of HTTP request context
1 parent 1cfd543 commit bb0a9c6

File tree

1 file changed

+13
-8
lines changed

1 file changed

+13
-8
lines changed

janeway_ftp/helpers.py

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,32 +11,37 @@
1111
from core import files
1212

1313

14-
def prepare_temp_folder(request=None, issue=None, article=None, loc_code=None):
14+
def prepare_temp_folder(request=None, issue=None, article=None, loc_code=None, journal_code=None):
1515
"""
16-
Perpares a temp folder to store files for zipping
16+
Prepares a temp folder to store files for zipping
1717
:param request: Request object
1818
:param issue: Issue Object
1919
:param article: Article object
2020
:param loc_code: string
21+
:param journal_code: string
2122
:return: Folder path, string
2223
"""
2324
folder_string = str(uuid.uuid4())
25+
request_journal_code = getattr(getattr(request, "journal", None), "code", None)
2426

25-
if article and issue and request:
27+
if journal_code is None and request_journal_code:
28+
journal_code = request_journal_code
29+
30+
if article and issue and journal_code:
2631
folder_string = '{journal_code}_{vol}_{issue}_{pk}'.format(
27-
journal_code=request.journal.code,
32+
journal_code=journal_code,
2833
vol=issue.volume,
2934
issue=issue.issue,
3035
pk=article.pk)
31-
elif issue and request:
36+
elif issue and journal_code:
3237
folder_string = '{journal_code}_{vol}_{issue}_{year}'.format(
33-
journal_code=request.journal.code,
38+
journal_code=journal_code,
3439
vol=issue.volume,
3540
issue=issue.issue,
3641
year=issue.date.year)
37-
elif article and request:
42+
elif article and journal_code:
3843
folder_string = '{journal_code}_{article_id}'.format(
39-
journal_code=request.journal.code,
44+
journal_code=journal_code,
4045
article_id=article.pk)
4146
elif loc_code:
4247
folder_string = loc_code

0 commit comments

Comments
 (0)