From 373f8b7be97b6b2301c5da84b218c860cce94112 Mon Sep 17 00:00:00 2001 From: shypike <> Date: Thu, 29 Nov 2007 16:57:24 +0000 Subject: [PATCH] Put "download_dir" and "complete_dir" in $HOME/downloads. Empty dirscan_dir is default. --- .../Default/templates/config_directories.tmpl | 20 ++++++++++---------- .../NOVA_0.3.2/templates/config_directories.tmpl | 20 ++++++++++---------- .../NOVA_0.4.5/templates/config_directories.tmpl | 20 ++++++++++---------- main/sabnzbd/__init__.py | 4 ++-- main/sabnzbd/constants.py | 6 +++--- main/sabnzbd/interface.py | 2 +- 6 files changed, 36 insertions(+), 36 deletions(-) diff --git a/main/interfaces/Default/templates/config_directories.tmpl b/main/interfaces/Default/templates/config_directories.tmpl index eea9e1a..2997d3b 100644 --- a/main/interfaces/Default/templates/config_directories.tmpl +++ b/main/interfaces/Default/templates/config_directories.tmpl @@ -33,6 +33,16 @@
User directories In "$my_home"

+ Download Directory:
+ Location to put unprocessed downloads in.
+ +
+
+ Minimum free space for Download Directory:
+ Auto-pause when free space is beneath this value (MB).
+ +
+
Complete Directory:
Location to put completed downloads in.
@@ -55,16 +65,6 @@
System directories In "$my_lcldata"

- Download Directory:
- Location to put unprocessed downloads in.
- -
-
- Minimum free space for Download Directory:
- Auto-pause when free space is beneath this value (MB).
- -
-
Cache Directory:
Location for temporary storage.
diff --git a/main/interfaces/NOVA_0.3.2/templates/config_directories.tmpl b/main/interfaces/NOVA_0.3.2/templates/config_directories.tmpl index 6cef74b..d301999 100644 --- a/main/interfaces/NOVA_0.3.2/templates/config_directories.tmpl +++ b/main/interfaces/NOVA_0.3.2/templates/config_directories.tmpl @@ -75,6 +75,16 @@
User directories In "$my_home"

+ Download Directory:
+ Location to put unprocessed downloads in.
+ +
+
+ Minimum free space for Download Directory:
+ Auto-pause when free space is beneath this value (MB).
+ +
+
Complete Directory:
Location to put completed downloads in.
@@ -97,16 +107,6 @@
System directories In "$my_lcldata"

- Download Directory:
- Location to put unprocessed downloads in.
- -
-
- Minimum free space for Download Directory:
- Auto-pause when free space is beneath this value (MB).
- -
-
Cache Directory:
Location for temporary storage.
diff --git a/main/interfaces/NOVA_0.4.5/templates/config_directories.tmpl b/main/interfaces/NOVA_0.4.5/templates/config_directories.tmpl index 792036a..5da268d 100644 --- a/main/interfaces/NOVA_0.4.5/templates/config_directories.tmpl +++ b/main/interfaces/NOVA_0.4.5/templates/config_directories.tmpl @@ -30,6 +30,16 @@
User directories In "$my_home"

+ Download Directory:
+ Location to put unprocessed downloads in.
+ +
+
+ Minimum free space for Download Directory:
+ Auto-pause when free space is beneath this value (MB).
+ +
+
Complete Directory:
Location to put completed downloads in.
@@ -52,16 +62,6 @@
System directories In "$my_lcldata"

- Download Directory:
- Location to put unprocessed downloads in.
- -
-
- Minimum free space for Download Directory:
- Auto-pause when free space is beneath this value (MB).
- -
-
Cache Directory:
Location for temporary storage.
diff --git a/main/sabnzbd/__init__.py b/main/sabnzbd/__init__.py index 0889fe0..c052312 100644 --- a/main/sabnzbd/__init__.py +++ b/main/sabnzbd/__init__.py @@ -254,7 +254,7 @@ def initialize(pause_downloader = False, clean_up = False, force_save= False): logging.debug("CREATE_CAT_FOLDERS -> %s", CREATE_CAT_FOLDERS) logging.debug("CREATE_CAT_SUB -> %s", CREATE_CAT_SUB) - DOWNLOAD_DIR = dir_setup(CFG, "download_dir", DIR_LCLDATA, DEF_DOWNLOAD_DIR) + DOWNLOAD_DIR = dir_setup(CFG, "download_dir", DIR_HOME, DEF_DOWNLOAD_DIR) if DOWNLOAD_DIR == "": return False @@ -282,7 +282,7 @@ def initialize(pause_downloader = False, clean_up = False, force_save= False): try: defdir = CFG['misc']['dirscan_dir'] except: - defdir = "nzb" + defdir = DEF_NZB_DIR dirscan_dir = dir_setup(CFG, "dirscan_dir", DIR_HOME, defdir) dirscan_speed = check_setting_int(CFG, 'misc', 'dirscan_speed', DEF_SCANRATE) diff --git a/main/sabnzbd/constants.py b/main/sabnzbd/constants.py index 4896f9a..e118679 100644 --- a/main/sabnzbd/constants.py +++ b/main/sabnzbd/constants.py @@ -54,11 +54,11 @@ BYTES_FILE_NAME = 'bytes.sab' QUEUE_FILE_NAME = 'queue.sab' RSS_FILE_NAME = 'rss.sab' -DEF_DOWNLOAD_DIR = 'incomplete' -DEF_COMPLETE_DIR = 'downloads' +DEF_DOWNLOAD_DIR = 'downloads/incomplete' +DEF_COMPLETE_DIR = 'downloads/complete' DEF_CACHE_DIR = 'cache' DEF_LOG_DIR = 'logs' -DEF_NZB_DIR = 'nzb_backup' +DEF_NZB_DIR = '' DEF_NZBBACK_DIR = '' DEF_INTERFACES = 'interfaces' DEF_STDINTF = 'Default' diff --git a/main/sabnzbd/interface.py b/main/sabnzbd/interface.py index 5449612..908a527 100644 --- a/main/sabnzbd/interface.py +++ b/main/sabnzbd/interface.py @@ -641,7 +641,7 @@ class ConfigDirectories(ProtectedClass): cache_dir = None, nzb_backup_dir = None, dirscan_dir = None, dirscan_speed = None, extern_proc = None): - dd = create_real_path('download_dir', sabnzbd.DIR_LCLDATA, download_dir) + dd = create_real_path('download_dir', sabnzbd.DIR_HOME, download_dir) if not dd: return "Error: cannot create download directory %s." % dd