FaSTTUBe
/
ftracker
54
1
Fork 0
Code Issues 2 Pull Requests Releases 1 Wiki Activity

Switch from `os` to `pathlib` because it's more modern i guess? 

(Resolves #19)
This commit is contained in:
Oskar Winkels 2020-12-15 23:40:38 +01:00
parent ca8f962102
commit 2241b3c2d0
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ftracker/__main__.py
View File

@ -1,4 +1,4 @@
import os from pathlib import Path
from .core import app from .core import app
# Start the flask server if run from terminal # Start the flask server if run from terminal
@ -14,7 +14,7 @@ if __name__ == "__main__":
# Prettier URLs by auto-loading <path>.html # Prettier URLs by auto-loading <path>.html
# Our nginx config does this as well # Our nginx config does this as well
if not os.path.isfile(fpath): if not Path(fpath).is_file():
return app.send_static_file(path + '.html') return app.send_static_file(path + '.html')
return app.send_static_file(path) return app.send_static_file(path)

7
ftracker/config.py
View File

@ -1,4 +1,5 @@
import sys, os import sys
from pathlib import Path
from configparser import ConfigParser from configparser import ConfigParser
class Config: class Config:
@ -8,9 +9,9 @@ class Config:
def findConfigFile(): def findConfigFile():
if len(sys.argv) > 1: if len(sys.argv) > 1:
return sys.argv[1] return sys.argv[1]
elif os.path.isfile('config.ini'): elif Path('config.ini').is_file():
return 'config.ini' return 'config.ini'
elif os.path.isfile('/etc/ftracker/config.ini'): elif Path('/etc/ftracker/config.ini').is_file():
return '/etc/ftracker/config.ini' return '/etc/ftracker/config.ini'
else: else:
return None return None