From 6cc611773e93d95dc312f4baa62d7156ab6ef15c Mon Sep 17 00:00:00 2001
From: Simon <contact@saimon.org>
Date: Fri, 9 Nov 2012 13:50:07 +0100
Subject: [PATCH] rename settings and use strings for default settings
 otherwise an error is raised if a setting is not in the config file.

Renames:
- big_img to keep_orig
- bigimg_dir to orig_dir
---
 sigal/gallery.py        | 10 +++++-----
 sigal/settings.py       | 14 +++++++-------
 tests/sample/sigal.conf |  4 ++--
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/sigal/gallery.py b/sigal/gallery.py
index 54a6c24..a214743 100644
--- a/sigal/gallery.py
+++ b/sigal/gallery.py
@@ -117,9 +117,9 @@ class Gallery:
         # Create thumbnails directory and optionally the one for original img
         check_or_create_dir(os.path.join(img_out, self.settings['thumb_dir']))
 
-        if self.settings['big_img']:
-            bigimg_dir = os.path.join(img_out, self.settings['bigimg_dir'])
-            check_or_create_dir(bigimg_dir)
+        if self.settings['keep_orig']:
+            orig_dir = os.path.join(img_out, self.settings['orig_dir'])
+            check_or_create_dir(orig_dir)
 
         # loop on images
         for f in progress.bar(imglist):
@@ -133,8 +133,8 @@ class Gallery:
             self.logger.info(filename)
             img = Image(f)
 
-            if self.settings['big_img']:
-                img.save(os.path.join(bigimg_dir, filename),
+            if self.settings['keep_orig']:
+                img.save(os.path.join(orig_dir, filename),
                          quality=self.settings['jpg_quality'])
 
             img.resize(self.settings['img_size'])
diff --git a/sigal/settings.py b/sigal/settings.py
index cd3f649..bf62ef6 100644
--- a/sigal/settings.py
+++ b/sigal/settings.py
@@ -26,16 +26,16 @@ import os
 
 _DEFAULT_CONFIG = {
     'img_size': '640x480',
-    'make_thumbs': 1,
+    'make_thumbs': '1',
     'thumb_prefix': '',
     'thumb_suffix': '',
     'thumb_size': '150x112',
     'thumb_dir': '',
-    'thumb_fit': 1,
-    'big_img': 0,
-    'bigimg_dir': 'big',
-    'jpg_quality': 90,
-    'exif': 0,
+    'thumb_fit': '1',
+    'keep_orig': '0',
+    'orig_dir': 'original',
+    'jpg_quality': '90',
+    'exif': '0',
     'copyright': '',
     'ext_list': '.jpg,.jpeg,.JPG,.JPEG,.png',
     'theme': 'default'
@@ -76,7 +76,7 @@ def read_settings(filename=None):
     settings['img_size'] = get_size(settings['img_size'])
     settings['thumb_size'] = get_size(settings['thumb_size'])
     settings['jpg_quality'] = config.getint('sigal', 'jpg_quality')
-    settings['big_img'] = config.getboolean('sigal', 'big_img')
+    settings['keep_orig'] = config.getboolean('sigal', 'keep_orig')
     settings['exif'] = config.getboolean('sigal', 'exif')
     settings['make_thumbs'] = config.getboolean('sigal', 'make_thumbs')
     settings['thumb_fit'] = config.getboolean('sigal', 'thumb_fit')
diff --git a/tests/sample/sigal.conf b/tests/sample/sigal.conf
index 0414a36..c762624 100644
--- a/tests/sample/sigal.conf
+++ b/tests/sample/sigal.conf
@@ -23,8 +23,8 @@ thumb_size = 200x150
 thumb_fit = 1
 
 # keep big image
-big_img = 1
-bigimg_dir = original
+keep_orig = 1
+orig_dir = original
 
 # jpeg quality
 jpg_quality = 90