Fix new user defaults and bump to 0.3.9 bcs im dumb

Pushed 0.3.8 to PyPI and Docker hub thinking i'd already fixed a problem
with new user defaults. I hadn't.

.gitignore

@@ -21,3 +21,4 @@ scss/bs5/*.css*
 scss/bs4/*.css*
 mail/*.html
 jellyfin_accounts/data/*.html
+jellyfin_accounts/data/*.txt

jellyfin_accounts/__init__.py

@@ -1,5 +1,5 @@
 # Runs it!
-__version__ = "0.3.7"
+__version__ = "0.3.9"
 
 import secrets
 import configparser

jellyfin_accounts/data/created.txt

@@ -1,7 +0,0 @@
-A user was created using code {{ code }}.
-
-Name: {{ username }}
-Address: {{ address }}
-Time: {{ time }}
-
-Note: Notification emails can be toggled on the admin dashboard.

jellyfin_accounts/data/email.txt

@@ -1,10 +0,0 @@
-Hi {{ username }},
-
-Someone has recently requests a password reset on Jellyfin.
-If this was you, enter the below pin into the prompt.
-This code will expire on {{ expiry_date }}, at {{ expiry_time }} , which is in {{ expires_in }}.
-If this wasn't you, please ignore this email.
-
-PIN: {{ pin }}
-
-{{ message }}

jellyfin_accounts/data/expired.txt

@@ -1,5 +0,0 @@
-Invite expired.
-
-Code {{ code }} expired at {{ expiry }}.
-
-Note: Notification emails can be toggled on the admin dashboard.

jellyfin_accounts/data/invite-email.txt

@@ -1,8 +0,0 @@
-Hi,
-You've been invited to Jellyfin.
-To join, follow the below link.
-This invite will expire on {{ expiry_date }}, at {{ expiry_time }}, which is in {{ expires_in }}, so act quick.
-
-{{ invite_link }}
-
-{{ message }}

jellyfin_accounts/data/templates/admin.html

@@ -214,18 +214,31 @@
                 </div>
             </div>
         </div>
-        <div class="modal fade" id="restartModal" role="dialog" aria-labelledby"Restart Warning" aria-hidden="true">
+        <div class="modal fade" id="restartModal" role="dialog" aria-labelledby="Restart Warning" aria-hidden="true">
             <div class="modal-dialog modal-dialog-centered" role="document">
                 <div class="modal-content">
                     <div class="modal-header">
                         <h5 class="modal-title">Warning</h5>
                     </div>
                     <div class="modal-body">
-                        <p>A restart is needed to apply some settings. This must be done manually. Apply now?</p>
+                        <p>A restart is needed to apply some settings. Restart now, later, or cancel?</p>
                     </div>
                     <div class="modal-footer">
-                        <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
-                        <button type="button" class="btn btn-primary" id="applyRestarts" data-dismiss="alert">Apply</button>
+                        <button type="button" class="btn btn-light" data-dismiss="modal">Cancel</button>
+                        <button type="button" class="btn btn-secondary" id="applyRestarts" data-dismiss="modal">Apply, Restart later</button>
+                        <button type="button" class="btn btn-primary" id="applyAndRestart" data-dismiss="modal">Apply &amp; Restart</button>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="modal fade" id="refreshModal" role="dialog" aria-labelledby="Refresh page notice" aria-hidden="true">
+            <div class="modal-dialog modal-dialog-centered" role="document">
+                <div class="modal-content">
+                    <div class="modal-header">
+                        <h5 class="modal-title">Settings applied.</h5>
+                    </div>
+                    <div class="modal-body">
+                        <p>Refresh the page in a few seconds.</p>
                     </div>
                 </div>
             </div>

jellyfin_accounts/data/templates/admin.js

@@ -157,6 +157,7 @@ var settingsModal = createModal('settingsMenu');
 var userDefaultsModal = createModal('userDefaults');
 var usersModal = createModal('users');
 var restartModal = createModal('restartModal');
+var refreshModal = createModal('refreshModal');
 
 // Parsed invite: [<code>, <expires in _>, <1: Empty invite (no delete/link), 0: Actual invite>, <email address>, <remaining uses>, [<used-by>], <date created>, <notify on expiry>, <notify on creation>]
 function parseInvite(invite, empty = false) {
@@ -650,11 +651,11 @@ document.getElementById('openDefaultsWizard').onclick = function() {
                 for (user of users) {
                     let radio = document.createElement('div');
                     radio.classList.add('radio');
+                    let checked = 'checked';
                     if (first) {
-                        const checked = 'checked';
                         first = false;
                     } else {
-                        const checked = '';
+                        checked = '';
                     };
                     radio.innerHTML =
                         `<label><input type="radio" name="defaultRadios" id="default_${user['name']}" style="margin-right: 1rem;" ${checked}>${user['name']}</label>`;
@@ -961,8 +962,12 @@ document.getElementById('openSettings').onclick = function () {
 
 triggerTooltips();
 
-function sendConfig(modalId) {
+function sendConfig(modalId, restart = false) {
     let modal = document.getElementById(modalId);
+    modifiedConfig['restart-program'] = false;
+    if (restart) {
+        modifiedConfig['restart-program'] = true;
+    }
     let send = JSON.stringify(modifiedConfig);
     let req = new XMLHttpRequest();
     req.open("POST", "/modifyConfig", true);
@@ -975,6 +980,8 @@ function sendConfig(modalId) {
                 if (modalId != 'settingsMenu') {
                     settingsModal.hide();
                 }
+            } else if (restart) {
+                refreshModal.show();
             }
         }
     };
@@ -1010,7 +1017,8 @@ document.getElementById('settingsSave').onclick = function() {
         }
     }
     if (restart_setting_changed) {
-        document.getElementById('applyRestarts').onclick = function(){sendConfig('restartModal');};
+        document.getElementById('applyRestarts').onclick = function(){ sendConfig('restartModal'); };
+        document.getElementById('applyAndRestart').onclick = function(){ sendConfig('restartModal', restart=true); };
         settingsModal.hide();
         restartModal.show();
     } else if (settings_changed) {

jellyfin_accounts/data/templates/setup.html

@@ -355,7 +355,7 @@
                             <div class="card-body text-center">
                                 <h5 class="card-title">Finished!</h5>
                                 <p class="card-text">
-                                Press the button below to submit your settings. The program will quit, so run it again, then refresh this page.
+                                Press the button below to submit your settings. The program will restart. Once it's done, refresh this page.
                                 </p>
                                 <button id="submitButton" class="btn btn-primary">Submit</button>
                             </div>

jellyfin_accounts/email.py

@@ -8,7 +8,7 @@ from email.mime.text import MIMEText
 from email.mime.multipart import MIMEMultipart
 from pathlib import Path
 from dateutil import parser as date_parser
-from jinja2 import Environment, FileSystemLoader
+from jinja2 import Template
 from jellyfin_accounts import config
 from jellyfin_accounts import email_log as log
 
@@ -35,9 +35,16 @@ class Email:
                 + f"({self.from_name})"
             )
         )
+        # sp = Path(config["invite_emails"]["email_
+        # template_loader = FileSystemLoader(searchpath=sp)
+        # template_loader = PackageLoader("jellyfin_accounts", "data")
+        # self.template_env = Environment(loader=template_loader)
 
-    def pretty_time(self, expiry):
-        current_time = datetime.datetime.now()
+    def pretty_time(self, expiry, tzaware=False):
+        if tzaware:
+            current_time = datetime.datetime.utcnow().replace(tzinfo=pytz.utc)
+        else:
+            current_time = datetime.datetime.now()
         date = expiry.strftime(config["email"]["date_format"])
         if config.getboolean("email", "use_24h"):
             log.debug(f"{self.address}: Using 24h time")
@@ -68,12 +75,9 @@ class Email:
         invite_link = config["invite_emails"]["url_base"]
         invite_link += "/" + invite["code"]
         for key in ["text", "html"]:
-            sp = Path(config["invite_emails"]["email_" + key]) / ".."
-            sp = str(sp.resolve()) + "/"
-            template_loader = FileSystemLoader(searchpath=sp)
-            template_env = Environment(loader=template_loader)
-            fname = Path(config["invite_emails"]["email_" + key]).name
-            template = template_env.get_template(fname)
+            fpath = Path(config["invite_emails"]["email_" + key])
+            with open(fpath, 'r') as f:
+                template = Template(f.read())
             c = template.render(
                 expiry_date=pretty["date"],
                 expiry_time=pretty["time"],
@@ -89,12 +93,9 @@ class Email:
         log.debug(f'Constructing expiry notification for {invite["code"]}')
         expiry = format_datetime(invite["expiry"])
         for key in ["text", "html"]:
-            sp = Path(config["notifications"]["expiry_" + key]) / ".."
-            sp = str(sp.resolve()) + "/"
-            template_loader = FileSystemLoader(searchpath=sp)
-            template_env = Environment(loader=template_loader)
-            fname = Path(config["notifications"]["expiry_" + key]).name
-            template = template_env.get_template(fname)
+            fpath = Path(config["notifications"]["expiry_" + key])
+            with open(fpath, 'r') as f:
+                template = Template(f.read())
             c = template.render(code=invite["code"], expiry=expiry)
             self.content[key] = c
             log.info(f"{self.address}: {key} constructed")
@@ -102,19 +103,16 @@ class Email:
 
     def construct_created(self, invite):
         self.subject = "Notice: User created"
-        log.debug(f'Constructing expiry notification for {invite["code"]}')
+        log.debug(f'Constructing user creation notification for {invite["code"]}')
         created = format_datetime(invite["created"])
         if config.getboolean("email", "no_username"):
             email = "n/a"
         else:
             email = invite["address"]
         for key in ["text", "html"]:
-            sp = Path(config["notifications"]["created_" + key]) / ".."
-            sp = str(sp.resolve()) + "/"
-            template_loader = FileSystemLoader(searchpath=sp)
-            template_env = Environment(loader=template_loader)
-            fname = Path(config["notifications"]["created_" + key]).name
-            template = template_env.get_template(fname)
+            fpath = Path(config["notifications"]["created_" + key])
+            with open(fpath, 'r') as f:
+                template = Template(f.read())
             c = template.render(
                 code=invite["code"],
                 username=invite["username"],
@@ -131,22 +129,18 @@ class Email:
         log.debug(f"{self.address}: Constructing email content")
         try:
             expiry = date_parser.parse(reset["ExpirationDate"])
-            expiry = expiry.replace(tzinfo=None)
         except:
             log.error(f"{self.address}: Couldn't parse expiry time")
             return False
-        current_time = datetime.datetime.now()
+        current_time = datetime.datetime.utcnow().replace(tzinfo=pytz.utc)
         if expiry >= current_time:
             log.debug(f"{self.address}: Invite valid")
-            pretty = self.pretty_time(expiry)
+            pretty = self.pretty_time(expiry, tzaware=True)
             email_message = config["email"]["message"]
             for key in ["text", "html"]:
-                sp = Path(config["password_resets"]["email_" + key]) / ".."
-                sp = str(sp.resolve()) + "/"
-                template_loader = FileSystemLoader(searchpath=sp)
-                template_env = Environment(loader=template_loader)
-                fname = Path(config["password_resets"]["email_" + key]).name
-                template = template_env.get_template(fname)
+                fpath = Path(config["password_resets"]["email_" + key])
+                with open(fpath, 'r') as f:
+                    template = Template(f.read())
                 c = template.render(
                     username=reset["UserName"],
                     expiry_date=pretty["date"],
@@ -169,6 +163,11 @@ class Email:
 
 
 class Mailgun(Email):
+    errors = {
+        400: "Mailgun failed with 400: Bad request",
+        401: "Mailgun failed with 401: Invalid API key",
+    }
+
     def __init__(self, address):
         super().__init__(address)
         self.api_url = config["mailgun"]["api_url"]
@@ -190,7 +189,12 @@ class Mailgun(Email):
         if response.ok:
             log.info(f"{self.address}: Sent via mailgun.")
             return True
-        log.debug(f"{self.address}: Mailgun: {response.status_code}")
+        elif response.status_code in Mailgun.errors:
+            log.error(f"{self.address}: {Mailgun.errors[response.status_code]}")
+        else:
+            log.error(
+                f"{self.address}: Mailgun failed with error {response.status_code}"
+            )
         return response
 
 
@@ -238,9 +242,9 @@ class Smtp(Email):
                     log.info(f"{self.address}: Sent via smtp (starttls)")
                     return True
         except Exception as e:
-            err = f"{self.address}: Failed to send via smtp: "
-            err += type(e).__name__
-            log.error(err)
+            log.error(
+                f"{self.address}: Failed to send via smtp ({type(e).__name__}: {e.args})"
+            )
             try:
                 log.error(e.smtp_error)
             except:

jellyfin_accounts/invite_daemon.py

@@ -35,7 +35,8 @@ class Repeat:
 def checkInvites():
     invites = dict(data_store.invites)
     # checkInvite already loops over everything, no point running it multiple times.
-    checkInvite(list(invites.keys())[0])
+    if len(invites) != 0:
+        checkInvite(list(invites.keys())[0])
 
 
 if config.getboolean("notifications", "enabled"):

jellyfin_accounts/jf_api.py

@@ -44,7 +44,7 @@ class Jellyfin:
 
         pass
 
-    def __init__(self, server, client, version, device, deviceId):
+    def __init__(self, server, client, version, device, deviceId, cacheMinutes=30):
         """
         Initializes the Jellyfin object. All parameters except server
         have no effect on the client's capability.
@@ -61,7 +61,7 @@ class Jellyfin:
         self.version = version
         self.device = device
         self.deviceId = deviceId
-        self.timeout = 30 * 60
+        self.timeout = cacheMinutes * 60
         self.userCacheAge = time.time() - self.timeout - 1
         self.userCachePublicAge = self.userCacheAge
         self.useragent = f"{self.client}/{self.version}"
@@ -83,6 +83,16 @@ class Jellyfin:
             self.info = requests.get(self.server + "/System/Info/Public").json()
         except:
             pass
+    
+    def reloadCache(self):
+        """ Forces a reload of the user caches """
+        self.userCachePublicAge = time.time() - self.timeout - 1
+        self.getUsers()
+        try:
+            self.userCacheAge = self.userCachePublicAge
+            self.getUsers(public=False)
+        except self.AuthenticationRequiredError:
+            pass
 
     def getUsers(self, username: str = "all", userId: str = "all", public: bool = True):
         """

jellyfin_accounts/pw_reset.py

@@ -19,7 +19,8 @@ class Watcher:
         self.observer.schedule(event_handler, self.dir, recursive=True)
         try:
             self.observer.start()
-        except NotADirectoryError:
+        except (NotADirectoryError,
+                FileNotFoundError):
             log.error(f"Directory {self.dir} does not exist")
         try:
             while True:

jellyfin_accounts/setup.py

@@ -5,6 +5,8 @@ from jellyfin_accounts.jf_api import Jellyfin
 from jellyfin_accounts import config, config_path, app, first_run, resp
 from jellyfin_accounts import web_log as log
 import os
+import psutil
+import sys
 
 if first_run:
 
@@ -51,8 +53,16 @@ if first_run:
         with open(config_path, "w") as config_file:
             temp_config.write(config_file)
         log.debug("Config written")
-        # ugly exit, sorry
-        os._exit(1)
+        log.info('Restarting...')
+        try:
+            p = psutil.Process(os.getpid())
+            for handler in p.open_files() + p.connections():
+                os.close(handler.fd)
+        except:
+            pass
+
+        python = sys.executable
+        os.execl(python, python, *sys.argv)
         return resp()
 
     @app.route("/testJF", methods=["GET", "POST"])

jellyfin_accounts/web.py

@@ -28,7 +28,6 @@ def page_not_found(e):
 
 @app.route("/", methods=["GET", "POST"])
 def admin():
-    # return app.send_static_file('admin.html')
     return render_template(
         "admin.html",
         bs5=config.getboolean("ui", "bs5"),

jellyfin_accounts/web_api.py

@@ -5,6 +5,10 @@ import json
 import datetime
 import secrets
 import time
+import threading
+import os
+import sys
+import psutil
 from jellyfin_accounts import (
     config,
     config_path,
@@ -61,7 +65,7 @@ def checkInvite(code, used=False, username=None):
                             if email.construct_expiry(
                                 {"code": invite, "expiry": expiry}
                             ):
-                                email.send()
+                                threading.Thread(target=email.send).start()
             del data_store.invites[invite]
         elif invite == code:
             match = True
@@ -222,7 +226,7 @@ def newUser():
                                     "created": datetime.datetime.now(),
                                 }
                             ):
-                                email.send()
+                                threading.Thread(target=email.send).start()
             if user.status_code == 200:
                 try:
                     policy = data_store.user_template
@@ -439,7 +443,7 @@ def modifyConfig():
     )
     temp_config.read(config_path)
     for section in data:
-        if section in temp_config:
+        if section in temp_config and 'restart-program' not in section:
             for item in data[section]:
                 temp_config[section][item] = data[section][item]
                 data[section][item] = True
@@ -447,7 +451,18 @@ def modifyConfig():
     with open(config_path, "w") as config_file:
         temp_config.write(config_file)
     config.trigger_reload()
-    log.info("Config written. Restart may be needed to load settings.")
+    log.info("Config written.")
+    if 'restart-program' in data:
+        if data['restart-program']:
+            log.info('Restarting...')
+            try:
+                proc = psutil.Process(os.getpid())
+                for handler in proc.open_files() + proc.connections():
+                    os.close(handler.fd)
+            except Exception as e:
+                log.error(f'Failed restart: {type(e).__name__}')
+            python = sys.executable
+            os.execl(python, python, *sys.argv)
     return resp()
 
 

mail/email.mjml

@@ -23,7 +23,7 @@
           <p>Hi {{ username }},</p>
           <p> Someone has recently requested a password reset on Jellyfin.</p>
           <p>If this was you, enter the below pin into the prompt.</p>
-          <p>The code will expire on {{ expiry_date }}, at {{ expiry_time }}, which is in {{ expires_in }}.</p>
+          <p>The code will expire on {{ expiry_date }}, at {{ expiry_time }} UTC, which is in {{ expires_in }}.</p>
           <p>If this wasn't you, please ignore this email.</p>
         </mj-text>
         <mj-button mj-class="blue bold">{{ pin }}</mj-button>
@@ -37,4 +37,4 @@
       </mj-column>
     </mj-section>
     </body>
-</mjml>
+</mjml>

mail/email.txt

@@ -2,7 +2,7 @@ Hi {{ username }},
 
 Someone has recently requests a password reset on Jellyfin.
 If this was you, enter the below pin into the prompt.
-This code will expire on {{ expiry_date }}, at {{ expiry_time }} , which is in {{ expires_in }}.
+This code will expire on {{ expiry_date }}, at {{ expiry_time }} UTC, which is in {{ expires_in }}.
 If this wasn't you, please ignore this email.
 
 PIN: {{ pin }}

poetry.lock

@@ -46,7 +46,7 @@ description = "Python package for providing Mozilla's CA Bundle."
 name = "certifi"
 optional = false
 python-versions = "*"
-version = "2020.4.5.2"
+version = "2020.6.20"
 
 [[package]]
 category = "main"
@@ -119,7 +119,7 @@ description = "Basic and Digest HTTP authentication for Flask routes"
 name = "flask-httpauth"
 optional = false
 python-versions = "*"
-version = "3.3.0"
+version = "4.1.0"
 
 [package.dependencies]
 Flask = "*"
@@ -138,7 +138,7 @@ description = "Internationalized Domain Names in Applications (IDNA)"
 name = "idna"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
-version = "2.9"
+version = "2.10"
 
 [[package]]
 category = "main"
@@ -242,6 +242,17 @@ optional = false
 python-versions = "*"
 version = "0.1.2"
 
+[[package]]
+category = "main"
+description = "Cross-platform lib for process and system monitoring in Python."
+name = "psutil"
+optional = false
+python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
+version = "5.7.2"
+
+[package.extras]
+test = ["ipaddress", "mock", "unittest2", "enum34", "pywin32", "wmi"]
+
 [[package]]
 category = "main"
 description = "C parser in Python"
@@ -315,7 +326,7 @@ description = "Alternative regular expression module, to replace re."
 name = "regex"
 optional = false
 python-versions = "*"
-version = "2020.6.8"
+version = "2020.7.14"
 
 [[package]]
 category = "main"
@@ -323,7 +334,7 @@ description = "Python HTTP for Humans."
 name = "requests"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
-version = "2.23.0"
+version = "2.24.0"
 
 [package.dependencies]
 certifi = ">=2017.4.17"
@@ -401,7 +412,7 @@ description = "Filesystem events monitoring"
 name = "watchdog"
 optional = false
 python-versions = "*"
-version = "0.10.2"
+version = "0.10.3"
 
 [package.dependencies]
 pathtools = ">=0.1.1"
@@ -422,7 +433,7 @@ dev = ["pytest", "pytest-timeout", "coverage", "tox", "sphinx", "pallets-sphinx-
 watchdog = ["watchdog"]
 
 [metadata]
-content-hash = "fa8b5fb1ded41b673b8062a2bfc6467e6a484ff62b578147bec001d7d9d8ca16"
+content-hash = "1c2741c9be187d9d0be662509fb4a87f5978e5f44420e5049a20504824c29a59"
 python-versions = "^3.6"
 
 [metadata.files]
@@ -439,8 +450,8 @@ black = [
     {file = "black-19.10b0.tar.gz", hash = "sha256:c2edb73a08e9e0e6f65a0e6af18b059b8b1cdd5bef997d7a0b181df93dc81539"},
 ]
 certifi = [
-    {file = "certifi-2020.4.5.2-py2.py3-none-any.whl", hash = "sha256:9cd41137dc19af6a5e03b630eefe7d1f458d964d406342dd3edf625839b944cc"},
-    {file = "certifi-2020.4.5.2.tar.gz", hash = "sha256:5ad7e9a056d25ffa5082862e36f119f7f7cec6457fa07ee2f8c339814b80c9b1"},
+    {file = "certifi-2020.6.20-py2.py3-none-any.whl", hash = "sha256:8fc0819f1f30ba15bdb34cceffb9ef04d99f420f68eb75d901e9560b8749fc41"},
+    {file = "certifi-2020.6.20.tar.gz", hash = "sha256:5930595817496dd21bb8dc35dad090f1c2cd0adfaf21204bf6732ca5d8ee34d3"},
 ]
 cffi = [
     {file = "cffi-1.14.0-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:1cae98a7054b5c9391eb3249b86e0e99ab1e02bb0cc0575da191aedadbdf4384"},
@@ -506,8 +517,8 @@ flask = [
     {file = "Flask-1.1.2.tar.gz", hash = "sha256:4efa1ae2d7c9865af48986de8aeb8504bf32c7f3d6fdc9353d34b21f4b127060"},
 ]
 flask-httpauth = [
-    {file = "Flask-HTTPAuth-3.3.0.tar.gz", hash = "sha256:6ef8b761332e780f9ff74d5f9056c2616f52babc1998b01d9f361a1e439e61b9"},
-    {file = "Flask_HTTPAuth-3.3.0-py2.py3-none-any.whl", hash = "sha256:0149953720489407e51ec24bc2f86273597b7973d71cd51f9443bd0e2a89bd72"},
+    {file = "Flask-HTTPAuth-4.1.0.tar.gz", hash = "sha256:9e028e4375039a49031eb9ecc40be4761f0540476040f6eff329a31dabd4d000"},
+    {file = "Flask_HTTPAuth-4.1.0-py2.py3-none-any.whl", hash = "sha256:29e0288869a213c7387f0323b6bf2c7191584fb1da8aa024d9af118e5cd70de7"},
 ]
 greenlet = [
     {file = "greenlet-0.4.16-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:80cb0380838bf4e48da6adedb0c7cd060c187bb4a75f67a5aa9ec33689b84872"},
@@ -529,8 +540,8 @@ greenlet = [
     {file = "greenlet-0.4.16.tar.gz", hash = "sha256:6e06eac722676797e8fce4adb8ad3dc57a1bb3adfb0dd3fdf8306c055a38456c"},
 ]
 idna = [
-    {file = "idna-2.9-py2.py3-none-any.whl", hash = "sha256:a068a21ceac8a4d63dbfd964670474107f541babbd2250d61922f029858365fa"},
-    {file = "idna-2.9.tar.gz", hash = "sha256:7588d1c14ae4c77d74036e8c22ff447b26d0fde8f007354fd48a7814db15b7cb"},
+    {file = "idna-2.10-py2.py3-none-any.whl", hash = "sha256:b97d804b1e9b523befed77c48dacec60e6dcb0b5391d57af6a65a312a90648c0"},
+    {file = "idna-2.10.tar.gz", hash = "sha256:b307872f855b18632ce0c21c5e45be78c0ea7ae4c15c828c20788b26921eb3f6"},
 ]
 itsdangerous = [
     {file = "itsdangerous-1.1.0-py2.py3-none-any.whl", hash = "sha256:b12271b2047cb23eeb98c8b5622e2e5c5e9abd9784a153e9d8ef9cb4dd09d749"},
@@ -628,6 +639,19 @@ pathspec = [
 pathtools = [
     {file = "pathtools-0.1.2.tar.gz", hash = "sha256:7c35c5421a39bb82e58018febd90e3b6e5db34c5443aaaf742b3f33d4655f1c0"},
 ]
+psutil = [
+    {file = "psutil-5.7.2-cp27-none-win32.whl", hash = "sha256:f2018461733b23f308c298653c8903d32aaad7873d25e1d228765e91ae42c3f2"},
+    {file = "psutil-5.7.2-cp27-none-win_amd64.whl", hash = "sha256:66c18ca7680a31bf16ee22b1d21b6397869dda8059dbdb57d9f27efa6615f195"},
+    {file = "psutil-5.7.2-cp35-cp35m-win32.whl", hash = "sha256:5e9d0f26d4194479a13d5f4b3798260c20cecf9ac9a461e718eb59ea520a360c"},
+    {file = "psutil-5.7.2-cp35-cp35m-win_amd64.whl", hash = "sha256:4080869ed93cce662905b029a1770fe89c98787e543fa7347f075ade761b19d6"},
+    {file = "psutil-5.7.2-cp36-cp36m-win32.whl", hash = "sha256:d8a82162f23c53b8525cf5f14a355f5d1eea86fa8edde27287dd3a98399e4fdf"},
+    {file = "psutil-5.7.2-cp36-cp36m-win_amd64.whl", hash = "sha256:0ee3c36428f160d2d8fce3c583a0353e848abb7de9732c50cf3356dd49ad63f8"},
+    {file = "psutil-5.7.2-cp37-cp37m-win32.whl", hash = "sha256:ff1977ba1a5f71f89166d5145c3da1cea89a0fdb044075a12c720ee9123ec818"},
+    {file = "psutil-5.7.2-cp37-cp37m-win_amd64.whl", hash = "sha256:a5b120bb3c0c71dfe27551f9da2f3209a8257a178ed6c628a819037a8df487f1"},
+    {file = "psutil-5.7.2-cp38-cp38-win32.whl", hash = "sha256:10512b46c95b02842c225f58fa00385c08fa00c68bac7da2d9a58ebe2c517498"},
+    {file = "psutil-5.7.2-cp38-cp38-win_amd64.whl", hash = "sha256:68d36986ded5dac7c2dcd42f2682af1db80d4bce3faa126a6145c1637e1b559f"},
+    {file = "psutil-5.7.2.tar.gz", hash = "sha256:90990af1c3c67195c44c9a889184f84f5b2320dce3ee3acbd054e3ba0b4a7beb"},
+]
 pycparser = [
     {file = "pycparser-2.20-py2.py3-none-any.whl", hash = "sha256:7582ad22678f0fcd81102833f60ef8d0e57288b6b5fb00323d101be910e35705"},
     {file = "pycparser-2.20.tar.gz", hash = "sha256:2d475327684562c3a96cc71adf7dc8c4f0565175cf86b6d7a404ff4c771f15f0"},
@@ -652,31 +676,31 @@ pytz = [
     {file = "pytz-2020.1.tar.gz", hash = "sha256:c35965d010ce31b23eeb663ed3cc8c906275d6be1a34393a1d73a41febf4a048"},
 ]
 regex = [
-    {file = "regex-2020.6.8-cp27-cp27m-win32.whl", hash = "sha256:fbff901c54c22425a5b809b914a3bfaf4b9570eee0e5ce8186ac71eb2025191c"},
-    {file = "regex-2020.6.8-cp27-cp27m-win_amd64.whl", hash = "sha256:112e34adf95e45158c597feea65d06a8124898bdeac975c9087fe71b572bd938"},
-    {file = "regex-2020.6.8-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:92d8a043a4241a710c1cf7593f5577fbb832cf6c3a00ff3fc1ff2052aff5dd89"},
-    {file = "regex-2020.6.8-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:bae83f2a56ab30d5353b47f9b2a33e4aac4de9401fb582b55c42b132a8ac3868"},
-    {file = "regex-2020.6.8-cp36-cp36m-manylinux2010_i686.whl", hash = "sha256:b2ba0f78b3ef375114856cbdaa30559914d081c416b431f2437f83ce4f8b7f2f"},
-    {file = "regex-2020.6.8-cp36-cp36m-manylinux2010_x86_64.whl", hash = "sha256:95fa7726d073c87141f7bbfb04c284901f8328e2d430eeb71b8ffdd5742a5ded"},
-    {file = "regex-2020.6.8-cp36-cp36m-win32.whl", hash = "sha256:e3cdc9423808f7e1bb9c2e0bdb1c9dc37b0607b30d646ff6faf0d4e41ee8fee3"},
-    {file = "regex-2020.6.8-cp36-cp36m-win_amd64.whl", hash = "sha256:c78e66a922de1c95a208e4ec02e2e5cf0bb83a36ceececc10a72841e53fbf2bd"},
-    {file = "regex-2020.6.8-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:08997a37b221a3e27d68ffb601e45abfb0093d39ee770e4257bd2f5115e8cb0a"},
-    {file = "regex-2020.6.8-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:2f6f211633ee8d3f7706953e9d3edc7ce63a1d6aad0be5dcee1ece127eea13ae"},
-    {file = "regex-2020.6.8-cp37-cp37m-manylinux2010_i686.whl", hash = "sha256:55b4c25cbb3b29f8d5e63aeed27b49fa0f8476b0d4e1b3171d85db891938cc3a"},
-    {file = "regex-2020.6.8-cp37-cp37m-manylinux2010_x86_64.whl", hash = "sha256:89cda1a5d3e33ec9e231ece7307afc101b5217523d55ef4dc7fb2abd6de71ba3"},
-    {file = "regex-2020.6.8-cp37-cp37m-win32.whl", hash = "sha256:690f858d9a94d903cf5cada62ce069b5d93b313d7d05456dbcd99420856562d9"},
-    {file = "regex-2020.6.8-cp37-cp37m-win_amd64.whl", hash = "sha256:1700419d8a18c26ff396b3b06ace315b5f2a6e780dad387e4c48717a12a22c29"},
-    {file = "regex-2020.6.8-cp38-cp38-manylinux1_i686.whl", hash = "sha256:654cb773b2792e50151f0e22be0f2b6e1c3a04c5328ff1d9d59c0398d37ef610"},
-    {file = "regex-2020.6.8-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:52e1b4bef02f4040b2fd547357a170fc1146e60ab310cdbdd098db86e929b387"},
-    {file = "regex-2020.6.8-cp38-cp38-manylinux2010_i686.whl", hash = "sha256:cf59bbf282b627130f5ba68b7fa3abdb96372b24b66bdf72a4920e8153fc7910"},
-    {file = "regex-2020.6.8-cp38-cp38-manylinux2010_x86_64.whl", hash = "sha256:5aaa5928b039ae440d775acea11d01e42ff26e1561c0ffcd3d805750973c6baf"},
-    {file = "regex-2020.6.8-cp38-cp38-win32.whl", hash = "sha256:97712e0d0af05febd8ab63d2ef0ab2d0cd9deddf4476f7aa153f76feef4b2754"},
-    {file = "regex-2020.6.8-cp38-cp38-win_amd64.whl", hash = "sha256:6ad8663c17db4c5ef438141f99e291c4d4edfeaacc0ce28b5bba2b0bf273d9b5"},
-    {file = "regex-2020.6.8.tar.gz", hash = "sha256:e9b64e609d37438f7d6e68c2546d2cb8062f3adb27e6336bc129b51be20773ac"},
+    {file = "regex-2020.7.14-cp27-cp27m-win32.whl", hash = "sha256:e46d13f38cfcbb79bfdb2964b0fe12561fe633caf964a77a5f8d4e45fe5d2ef7"},
+    {file = "regex-2020.7.14-cp27-cp27m-win_amd64.whl", hash = "sha256:6961548bba529cac7c07af2fd4d527c5b91bb8fe18995fed6044ac22b3d14644"},
+    {file = "regex-2020.7.14-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:c50a724d136ec10d920661f1442e4a8b010a4fe5aebd65e0c2241ea41dbe93dc"},
+    {file = "regex-2020.7.14-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:8a51f2c6d1f884e98846a0a9021ff6861bdb98457879f412fdc2b42d14494067"},
+    {file = "regex-2020.7.14-cp36-cp36m-manylinux2010_i686.whl", hash = "sha256:9c568495e35599625f7b999774e29e8d6b01a6fb684d77dee1f56d41b11b40cd"},
+    {file = "regex-2020.7.14-cp36-cp36m-manylinux2010_x86_64.whl", hash = "sha256:51178c738d559a2d1071ce0b0f56e57eb315bcf8f7d4cf127674b533e3101f88"},
+    {file = "regex-2020.7.14-cp36-cp36m-win32.whl", hash = "sha256:9eddaafb3c48e0900690c1727fba226c4804b8e6127ea409689c3bb492d06de4"},
+    {file = "regex-2020.7.14-cp36-cp36m-win_amd64.whl", hash = "sha256:14a53646369157baa0499513f96091eb70382eb50b2c82393d17d7ec81b7b85f"},
+    {file = "regex-2020.7.14-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:1269fef3167bb52631ad4fa7dd27bf635d5a0790b8e6222065d42e91bede4162"},
+    {file = "regex-2020.7.14-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:d0a5095d52b90ff38592bbdc2644f17c6d495762edf47d876049cfd2968fbccf"},
+    {file = "regex-2020.7.14-cp37-cp37m-manylinux2010_i686.whl", hash = "sha256:4c037fd14c5f4e308b8370b447b469ca10e69427966527edcab07f52d88388f7"},
+    {file = "regex-2020.7.14-cp37-cp37m-manylinux2010_x86_64.whl", hash = "sha256:bc3d98f621898b4a9bc7fecc00513eec8f40b5b83913d74ccb445f037d58cd89"},
+    {file = "regex-2020.7.14-cp37-cp37m-win32.whl", hash = "sha256:46bac5ca10fb748d6c55843a931855e2727a7a22584f302dd9bb1506e69f83f6"},
+    {file = "regex-2020.7.14-cp37-cp37m-win_amd64.whl", hash = "sha256:0dc64ee3f33cd7899f79a8d788abfbec168410be356ed9bd30bbd3f0a23a7204"},
+    {file = "regex-2020.7.14-cp38-cp38-manylinux1_i686.whl", hash = "sha256:5ea81ea3dbd6767873c611687141ec7b06ed8bab43f68fad5b7be184a920dc99"},
+    {file = "regex-2020.7.14-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:bbb332d45b32df41200380fff14712cb6093b61bd142272a10b16778c418e98e"},
+    {file = "regex-2020.7.14-cp38-cp38-manylinux2010_i686.whl", hash = "sha256:c11d6033115dc4887c456565303f540c44197f4fc1a2bfb192224a301534888e"},
+    {file = "regex-2020.7.14-cp38-cp38-manylinux2010_x86_64.whl", hash = "sha256:75aaa27aa521a182824d89e5ab0a1d16ca207318a6b65042b046053cfc8ed07a"},
+    {file = "regex-2020.7.14-cp38-cp38-win32.whl", hash = "sha256:d6cff2276e502b86a25fd10c2a96973fdb45c7a977dca2138d661417f3728341"},
+    {file = "regex-2020.7.14-cp38-cp38-win_amd64.whl", hash = "sha256:7a2dd66d2d4df34fa82c9dc85657c5e019b87932019947faece7983f2089a840"},
+    {file = "regex-2020.7.14.tar.gz", hash = "sha256:3a3af27a8d23143c49a3420efe5b3f8cf1a48c6fc8bc6856b03f638abc1833bb"},
 ]
 requests = [
-    {file = "requests-2.23.0-py2.py3-none-any.whl", hash = "sha256:43999036bfa82904b6af1d99e4882b560e5e2c68e5c4b0aa03b655f3d7d73fee"},
-    {file = "requests-2.23.0.tar.gz", hash = "sha256:b3f43d496c6daba4493e7c431722aeb7dbc6288f52a6e04e7b6023b0247817e6"},
+    {file = "requests-2.24.0-py2.py3-none-any.whl", hash = "sha256:fe75cc94a9443b9246fc7049224f75604b113c36acb93f87b80ed42c44cbb898"},
+    {file = "requests-2.24.0.tar.gz", hash = "sha256:b3559a131db72c33ee969480840fff4bb6dd111de7dd27c8ee1f820f4f00231b"},
 ]
 six = [
     {file = "six-1.15.0-py2.py3-none-any.whl", hash = "sha256:8b74bedcbbbaca38ff6d7491d76f2b06b3592611af620f8426e82dddb04a5ced"},
@@ -722,7 +746,7 @@ waitress = [
     {file = "waitress-1.4.4.tar.gz", hash = "sha256:1bb436508a7487ac6cb097ae7a7fe5413aefca610550baf58f0940e51ecfb261"},
 ]
 watchdog = [
-    {file = "watchdog-0.10.2.tar.gz", hash = "sha256:c560efb643faed5ef28784b2245cf8874f939569717a4a12826a173ac644456b"},
+    {file = "watchdog-0.10.3.tar.gz", hash = "sha256:4214e1379d128b0588021880ccaf40317ee156d4603ac388b9adcf29165e0c04"},
 ]
 werkzeug = [
     {file = "Werkzeug-1.0.1-py2.py3-none-any.whl", hash = "sha256:2de2a5db0baeae7b2d2664949077c2ac63fbd16d98da0ff71837f7d1dea3fd43"},

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "jellyfin-accounts"
-version = "0.3.7"
+version = "0.3.9"
 readme = "README.md"
 description = "A simple account management system for Jellyfin"
 authors = ["Harvey Tindall <harveyltindall@gmail.com>"]
@@ -29,6 +29,7 @@ python-dateutil = "^2.8.1"
 watchdog = "^0.10.2"
 waitress = "^1.4.3"
 packaging = "^20.4"
+psutil = "^5.7.2"
 
 [tool.poetry.dev-dependencies]
 neovim = "^0.3.1"