From 6a54c7817bb71fde9234e7b89e87f1f349920ea1 Mon Sep 17 00:00:00 2001
From: Tomas Bzatek <tbzatek@users.sourceforge.net>
Date: Sat, 11 Apr 2009 12:59:58 +0200
Subject: User customizable image directories

---
 src/generators.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/generators.c')

diff --git a/src/generators.c b/src/generators.c
index ff88a73..8100196 100644
--- a/src/generators.c
+++ b/src/generators.c
@@ -91,7 +91,7 @@ generate_image (TGallerySetup *setup,
     /*  Generate thumbnail  */
     g_assert (thumb_src_full != NULL);
     get_image_sizes (thumb_src_full, &thumb_w, &thumb_h);
-    thumb_dst = g_strconcat (dst_dir, "/", THUMBNAIL_DIR, "/", item->gen_thumb, NULL);
+    thumb_dst = g_strconcat (dst_dir, "/", setup->thumbnail_dir, "/", item->gen_thumb, NULL);
 
     if ((thumb_w > 0) && (thumb_h > 0)) {
       if (! item->gen_portrait)
@@ -109,7 +109,7 @@ generate_image (TGallerySetup *setup,
     /*  Generate/copy preview and original image  */
     if (items->type == GALLERY_TYPE_ALBUM)
     {
-      big_dst = g_strconcat (dst_dir, "/", IMG_BIG_DIR, "/", item->gen_img_src, NULL);
+      big_dst = g_strconcat (dst_dir, "/", setup->img_big_dir, "/", item->gen_img_src, NULL);
       if (item->preview == NULL) {
         /*  No preview image supplied, generate it from original  */
         bigq = setup->preview_quality;
@@ -155,7 +155,7 @@ generate_image (TGallerySetup *setup,
       if (item->force_fullsize || (items->fullsize && ! item->force_nofullsize) ||
           (! item->force_nofullsize && ! items->nofullsize && ! setup->nofullsize))
       {
-        orig_dst = g_strconcat (dst_dir, "/", IMG_ORIG_DIR, "/", item->gen_img_src, NULL);
+        orig_dst = g_strconcat (dst_dir, "/", setup->img_orig_dir, "/", item->gen_img_src, NULL);
         if (! copy_file(img_src_full, orig_dst))
           fprintf (stderr, "generate_image: error copying original image %s\n", img_src_full);
         modify_exif (orig_dst, setup->erase_exif_thumbnail, setup->add_copyright);
@@ -376,7 +376,7 @@ write_html_album (TGallerySetup *setup,
               replace_table_add_key (local_replace_table, "IMG_DESCRIPTION", item->title_description);
               replace_table_add_key_printf (local_replace_table, "IMG_LIST_ID", "i%d", i + 1);
               if (item->gen_thumb != NULL)
-                replace_table_add_key_printf (local_replace_table, "IMG_THUMBNAIL", "%s/%s", THUMBNAIL_DIR, item->gen_thumb);
+                replace_table_add_key_printf (local_replace_table, "IMG_THUMBNAIL", "%s/%s", setup->thumbnail_dir, item->gen_thumb);
               replace_table_add_key (local_replace_table, "IMG_FILENAME", item->gen_img_src);
               if (items->type == GALLERY_TYPE_INDEX) {
                 s3 = g_strconcat (items->base_dir, "/", item->path, "/index.xml", NULL);
@@ -517,12 +517,12 @@ write_html_image (TGallerySetup *setup,
   imgname = g_path_get_basename ((item->path == NULL && item->preview) ? item->preview : item->path);
   if (next_item && setup->preload) {
     s1 = g_path_get_basename ((next_item->path == NULL && next_item->preview) ? next_item->preview : next_item->path);
-    preload_imgname = g_strconcat (IMG_BIG_DIR, "/", s1, NULL);
+    preload_imgname = g_strconcat (setup->img_big_dir, "/", s1, NULL);
     g_free (s1);
   }
   s1 = g_path_get_dirname (dst);
-  big_dst = g_strconcat (s1, "/", IMG_BIG_DIR, "/", imgname, NULL);
-  orig_dst = g_strconcat (s1, "/", IMG_ORIG_DIR, "/", imgname, NULL);
+  big_dst = g_strconcat (s1, "/", setup->img_big_dir, "/", imgname, NULL);
+  orig_dst = g_strconcat (s1, "/", setup->img_orig_dir, "/", imgname, NULL);
   g_free (s1);
   res = TRUE;
 
@@ -596,8 +596,8 @@ write_html_image (TGallerySetup *setup,
   replace_table_add_key_int (replace_table, "IMG_SIZE_BIG_H", img_big_h);
   replace_table_add_key_int (replace_table, "IMG_SIZE_ORIG_W", img_orig_w);
   replace_table_add_key_int (replace_table, "IMG_SIZE_ORIG_H", img_orig_h);
-  replace_table_add_key_printf (replace_table, "IMG_SRC_BIG", "%s/%s", IMG_BIG_DIR, imgname);
-  replace_table_add_key_printf (replace_table, "IMG_SRC_FULL", "%s/%s", IMG_ORIG_DIR, imgname);
+  replace_table_add_key_printf (replace_table, "IMG_SRC_BIG", "%s/%s", setup->img_big_dir, imgname);
+  replace_table_add_key_printf (replace_table, "IMG_SRC_FULL", "%s/%s", setup->img_orig_dir, imgname);
   replace_table_add_key (replace_table, "IMG_SRC_PRELOAD", preload_imgname ? preload_imgname : "");
 
   /*  Navigation bar  (NOTE: 'int level' is used below + favicon)  */
-- 
cgit v1.2.3