瀏覽代碼

cleaner output dir spec in config

Nick Sweeting 6 年之前
父節點
當前提交
32c39d0fd0
共有 1 個文件被更改,包括 9 次插入4 次删除
  1. 9 4
      archivebox/config.py

+ 9 - 4
archivebox/config.py

@@ -44,15 +44,20 @@ WGET_BINARY =            os.getenv('WGET_BINARY',            'wget')
 YOUTUBEDL_BINARY =       os.getenv('YOUTUBEDL_BINARY',       'youtube-dl')
 CHROME_BINARY =          os.getenv('CHROME_BINARY',          None)
 
-### Paths
-REPO_DIR = os.path.abspath(os.path.join(os.path.dirname(os.path.abspath(__file__)), '..'))
+try:
+    OUTPUT_DIR = os.path.abspath(os.getenv('OUTPUT_DIR'))
+except Exception:
+    OUTPUT_DIR = None
 
-OUTPUT_DIR = os.path.abspath(os.getenv('OUTPUT_DIR', os.path.join(REPO_DIR, 'output')))
 
 # ******************************************************************************
-# ********************** Do not edit below this point **************************
+# **************************** Derived Settings ********************************
 # ******************************************************************************
 
+REPO_DIR = os.path.abspath(os.path.join(os.path.dirname(os.path.abspath(__file__)), '..'))
+if not OUTPUT_DIR:
+    OUTPUT_DIR = os.path.join(REPO_DIR, 'output')
+
 ARCHIVE_DIR_NAME = 'archive'
 SOURCES_DIR_NAME = 'sources'
 ARCHIVE_DIR = os.path.join(OUTPUT_DIR, ARCHIVE_DIR_NAME)