utils: Use toml instead of pytoml for config

iamkroot · Jun 13, 2019 · ebfe3db · ebfe3db
1 parent 9166da7
commit ebfe3db
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 13 deletions.
diff --git a/Pipfile b/Pipfile
@@ -5,11 +5,11 @@ name = "pypi"
 
 [packages]
 requests = "*"
-pytoml = "*"
 guessit = "*"
 pywin32 = {version = "*", sys_platform = "== 'win32'"}
 win10toast = {version = "*", sys_platform = "== 'win32'"}
 notify2 = {version = "*", sys_platform = "!= 'win32'"}
 dbus-python = {version = "*", sys_platform = "!= 'win32'"}
+toml = "*"
 
 [dev-packages]
diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/trakt_scrobbler/utils.py b/trakt_scrobbler/utils.py
@@ -1,17 +1,24 @@
 import json
 import logging
-import pytoml
+import toml
 import requests
 from pathlib import Path
 
 DATA_DIR = Path('data')
-DATA_DIR.mkdir(exist_ok=True)
 logger = logging.getLogger('trakt_scrobbler')
 
 
 def read_config(config_path=DATA_DIR / 'config.toml'):
-    with open(config_path) as f:
+    try:
-        return pytoml.load(f)
+        with open(config_path) as f:
+            try:
+                return toml.load(f)
+            except toml.TomlDecodeError:
+                logger.error('Unable to load config.toml!')
+                exit(1)
+    except FileNotFoundError:
+        logger.error('config.toml not found!')
+        exit(1)
 
 
 config = read_config()