From e87e6fbc67c4c3a0090d8faca9d12cf609312a21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= <mike_faehrmann@web.de>
Date: Tue, 21 Feb 2017 22:11:02 +0100
Subject: [PATCH] change some config keys

directory_fmt     -> directory
filename_fmt      -> filename
download-original -> original
---
 gallery-dl.conf                  | 12 ++++++++----
 gallery_dl/extractor/exhentai.py |  2 +-
 gallery_dl/path.py               |  4 ++--
 test/test_extractors.py          |  2 +-
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/gallery-dl.conf b/gallery-dl.conf
index 68c52054..82fb39cb 100644
--- a/gallery-dl.conf
+++ b/gallery-dl.conf
@@ -1,16 +1,20 @@
 {
     "base-directory": "/tmp/",
+    "cache":
+    {
+        "file": "/tmp/.gallery-dl.cache"
+    },
     "extractor":
     {
         "pixiv":
         {
             "user":
             {
-                "directory_fmt": ["{category}", "{artist-id}"]
+                "directory": ["{category}", "{artist-id}"]
             },
             "bookmark":
             {
-                "directory_fmt": ["{category}", "my bookmarks"]
+                "directory": ["{category}", "my bookmarks"]
             },
             "ugoira": true,
             "username": null,
@@ -25,7 +29,7 @@
         {
             "wait-min": 3,
             "wait-max": 6,
-            "download-original": true,
+            "original": true,
             "username": null,
             "password": null
         },
@@ -41,7 +45,7 @@
         },
         "gelbooru":
         {
-            "filename_fmt": "{category}_{id:>07}_{md5}.{extension}"
+            "filename": "{category}_{id:>07}_{md5}.{extension}"
         }
     }
 }
diff --git a/gallery_dl/extractor/exhentai.py b/gallery_dl/extractor/exhentai.py
index 7e1c451d..e212a8c6 100644
--- a/gallery_dl/extractor/exhentai.py
+++ b/gallery_dl/extractor/exhentai.py
@@ -43,7 +43,7 @@ class ExhentaiGalleryExtractor(Extractor):
         self.count = 0
         self.gid, self.token = match.groups()
         self.original = config.interpolate(
-            ("extractor", "exhentai", "download-original"), True)
+            ("extractor", "exhentai", "original"), True)
         self.wait_min = config.interpolate(
             ("extractor", "exhentai", "wait-min"), 3)
         self.wait_max = config.interpolate(
diff --git a/gallery_dl/path.py b/gallery_dl/path.py
index b80ad9b0..16ccab93 100644
--- a/gallery_dl/path.py
+++ b/gallery_dl/path.py
@@ -17,10 +17,10 @@ class PathFormat():
         if extractor.subcategory:
             key.append(extractor.subcategory)
         self.filename_fmt = config.interpolate(
-            key + ["filename_fmt"], default=extractor.filename_fmt
+            key + ["filename"], default=extractor.filename_fmt
         )
         self.directory_fmt = config.interpolate(
-            key + ["directory_fmt"], default=extractor.directory_fmt
+            key + ["directory"], default=extractor.directory_fmt
         )
         self.has_extension = False
         self.keywords = {}
diff --git a/test/test_extractors.py b/test/test_extractors.py
index c5e7ca17..e8293a8d 100644
--- a/test/test_extractors.py
+++ b/test/test_extractors.py
@@ -48,7 +48,7 @@ def _generate_test(extr, tcase):
 
 
 # enable selective testing for direct calls
-skip = ["exhentai", "kissmanga", "mangafox"]
+skip = ["3dbooru", "exhentai", "kissmanga", "mangafox"]
 if __name__ == '__main__' and len(sys.argv) > 1:
     extractors = [
         extr for extr in extractor.extractors()