joachim/openwebrx-clone
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

handle empty file

Browse Source
This commit is contained in:
Jakob Ketterl 2021-02-12 17:00:35 +01:00
parent 5068bcd347
commit 7d88d83c36
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
owrx/users.py
View File

@ -149,7 +149,12 @@ class UserList(object):
return "{data_directory}/users.json".format(data_directory=config.get_data_directory()) return "{data_directory}/users.json".format(data_directory=config.get_data_directory())
def _getUsersFileModifiedTimestamp(self): def _getUsersFileModifiedTimestamp(self):
return datetime.fromtimestamp(os.path.getmtime(self._getUsersFile()), timezone.utc) timestamp = 0
try:
timestamp = os.path.getmtime(self._getUsersFile())
except FileNotFoundError:
pass
return datetime.fromtimestamp(timestamp, timezone.utc)
def _loadUsers(self): def _loadUsers(self):
usersFile = self._getUsersFile() usersFile = self._getUsersFile()
@ -164,6 +169,7 @@ class UserList(object):
self.file_modified = modified self.file_modified = modified
return users return users
except FileNotFoundError: except FileNotFoundError:
self.file_modified = modified
return {} return {}
except json.JSONDecodeError: except json.JSONDecodeError:
logger.exception("error while parsing users file %s", usersFile) logger.exception("error while parsing users file %s", usersFile)