From bcfe17bc87035129a83cfae769f54a5575f8ce7f Mon Sep 17 00:00:00 2001 From: Nick Sweeting Date: Thu, 11 Apr 2019 03:40:37 -0400 Subject: [PATCH] define database file in config.py --- archivebox/core/settings.py | 10 +++------- archivebox/legacy/config.py | 1 + 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/archivebox/core/settings.py b/archivebox/core/settings.py index 14ba519b..b7ffbe18 100644 --- a/archivebox/core/settings.py +++ b/archivebox/core/settings.py @@ -1,10 +1,8 @@ -import os +__package__ = 'archivebox.core' -from legacy.config import ( - REPO_DIR, - OUTPUT_DIR, +from ..legacy.config import ( TEMPLATES_DIR, - DATABASE_DIR, + DATABASE_FILE, ) @@ -52,8 +50,6 @@ TEMPLATES = [ WSGI_APPLICATION = 'core.wsgi.application' - -DATABASE_FILE = os.path.join(DATABASE_DIR, 'database.sqlite3') DATABASES = { 'default': { 'ENGINE': 'django.db.backends.sqlite3', diff --git a/archivebox/legacy/config.py b/archivebox/legacy/config.py index 413bed68..2197d4c7 100644 --- a/archivebox/legacy/config.py +++ b/archivebox/legacy/config.py @@ -91,6 +91,7 @@ DATABASE_DIR_NAME = 'database' ARCHIVE_DIR = os.path.join(OUTPUT_DIR, ARCHIVE_DIR_NAME) SOURCES_DIR = os.path.join(OUTPUT_DIR, SOURCES_DIR_NAME) DATABASE_DIR = os.path.join(OUTPUT_DIR, DATABASE_DIR_NAME) +DATABASE_FILE = os.path.join(DATABASE_DIR, 'database.sqlite3') PYTHON_DIR = os.path.join(REPO_DIR, 'archivebox') LEGACY_DIR = os.path.join(PYTHON_DIR, 'legacy')