Skip to content

Commit 05186f6

Browse files
committed
Save current status
1 parent daf0e3e commit 05186f6

File tree

5 files changed

+18
-29
lines changed

5 files changed

+18
-29
lines changed

django_dev_protector/app_data.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"status": false}

django_dev_protector/middleware.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ def process_request(self, request):
1616
if data['key'] == settings.SECRET_KEY:
1717
from .setup import save_status
1818
environ[PROTECT_STATUS_VARIABLE] = str(data['status'])
19-
save_status(str(data['status']))
19+
save_status(data['status'])
2020
return redirect('/')
2121

2222
if environ.get(PROTECT_STATUS_VARIABLE) == 'True':

django_dev_protector/protect_status.conf

Lines changed: 0 additions & 1 deletion
This file was deleted.

django_dev_protector/settings.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
PROTECT_STATUS_DEFAULT = False
77

88
PROTECT_STATUS_VARIABLE = 'PROTECT_STATUS_VARIABLE'
9-
PROTECT_STATUS_FILE = '/protect_status.conf'
9+
PROTECT_STATUS_FILE = '/app_data.json'
1010

1111
TEMPLATE_NAME = 'django_dev_protector/index.html' if not hasattr(settings, 'PROTECT_TEMPLATE_NAME') else settings.PROTECT_TEMPLATE_NAME
1212

django_dev_protector/setup.py

Lines changed: 15 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,32 @@
11
import os
2+
import json
23

34
from .settings import (PROTECT_STATUS_FILE, PROTECT_STATUS_VARIABLE,
45
PROTECT_STATUS_DEFAULT, DIR_NAME)
56

67
STATUS_FILE_NAME = DIR_NAME + PROTECT_STATUS_FILE
78

89

9-
def save_to_file(text, file_name):
10+
def save_status(status):
11+
"""Save current status to file"""
1012
try:
11-
f = open(file_name, 'w')
12-
f.write(str(text))
13+
f = open(STATUS_FILE_NAME, 'w')
14+
f.write(json.dumps({
15+
'status': status
16+
}))
1317
f.close()
14-
except:
18+
except (NameError, FileNotFoundError):
1519
pass
1620

1721

18-
def get_from_file(file_name):
19-
"""Gets first word from file"""
22+
def get_status():
23+
"""Get status from file"""
2024
try:
21-
f = open(file_name, 'r')
25+
f = open(STATUS_FILE_NAME, 'r')
2226
data = f.read()
2327
f.close()
24-
25-
import re
26-
data = re.findall('\w+', data)
27-
return data[0]
28-
except:
29-
return ''
30-
31-
32-
def save_status(status):
33-
"""Save current status to file"""
34-
save_to_file(status, STATUS_FILE_NAME)
35-
36-
37-
def get_status():
38-
"""Get status from file"""
39-
res = get_from_file(STATUS_FILE_NAME)
40-
if not res:
28+
res = json.loads(data)['status']
29+
except (NameError, FileNotFoundError):
4130
save_status(PROTECT_STATUS_DEFAULT)
42-
return str(PROTECT_STATUS_DEFAULT)
43-
return res
31+
res = (PROTECT_STATUS_DEFAULT)
32+
return str(res)

0 commit comments

Comments
 (0)