From 0d49b56883dc525a8b687d84f070e29363625144 Mon Sep 17 00:00:00 2001 From: Ozzie Isaacs Date: Mon, 21 Mar 2022 18:50:02 +0100 Subject: [PATCH] Update gmail.json location --- README.md | 2 +- cps/services/gmail.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index d9c50f7f..fb8bcd7f 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,7 @@ Calibre-Web is a web app providing a clean interface for browsing, reading and d 1. To avoid problems with already installed python dependencies, it's recommended to create a virtual environment for Calibre-Web 2. Install Calibre-Web via pip with the command `pip install calibreweb` (Depending on your OS and or distro the command could also be `pip3`). 3. Optional features can also be installed via pip, please refer to [this page](https://github.com/janeczku/calibre-web/wiki/Dependencies-in-Calibre-Web-Linux-Windows) for details -4. Calibre-Web can be started afterwards by typing `cps` or `python3 -m cps` +4. Calibre-Web can be started afterwards by typing `cps` In the Wiki there are also examples for a [manual installation](https://github.com/janeczku/calibre-web/wiki/Manual-installation) and for installation on [Linux Mint](https://github.com/janeczku/calibre-web/wiki/How-To:Install-Calibre-Web-in-Linux-Mint-19-or-20) diff --git a/cps/services/gmail.py b/cps/services/gmail.py index ff36b308..3a4eab7f 100644 --- a/cps/services/gmail.py +++ b/cps/services/gmail.py @@ -25,7 +25,7 @@ from google.oauth2.credentials import Credentials from datetime import datetime import base64 from flask_babel import gettext as _ -from ..constants import BASE_DIR +from ..constants import CONFIG_DIR from .. import logger @@ -53,11 +53,11 @@ def setup_gmail(token): if creds and creds.expired and creds.refresh_token: creds.refresh(Request()) else: - cred_file = os.path.join(BASE_DIR, 'gmail.json') + cred_file = os.path.join(CONFIG_DIR, 'gmail.json') if not os.path.exists(cred_file): raise Exception(_("Found no valid gmail.json file with OAuth information")) flow = InstalledAppFlow.from_client_secrets_file( - os.path.join(BASE_DIR, 'gmail.json'), SCOPES) + os.path.join(CONFIG_DIR, 'gmail.json'), SCOPES) creds = flow.run_local_server(port=0) user_info = get_user_info(creds) return {