# HG changeset patch
# User Riwad Salim
# Date 1530788765 -7200
# Node ID e46a1986a2f0da00b47aa62165cf59f0dc1da097
# Parent  e3f96cf6b4841e87e3ad0d35eaebd222df736b01
removing partners images from static folder

diff -r e3f96cf6b484 -r e46a1986a2f0 src/iconolab_episteme/management/commands/importimages.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/iconolab_episteme/management/commands/importimages.py	Thu Jul 05 13:06:05 2018 +0200
@@ -0,0 +1,100 @@
+# -*- coding: UTF-8 -*-
+import json
+import logging
+import os
+import imghdr
+
+from django.conf import settings
+
+from iconolab.management.commands.importimages import BaseImportImagesCommand
+from iconolab.models import (Collection, ItemMetadata)
+
+if settings.IMPORT_LOGGER_NAME and settings.LOGGING['loggers'].get(settings.IMPORT_LOGGER_NAME, ''):
+    logger = logging.getLogger(settings.IMPORT_LOGGER_NAME)
+else:
+    logger = logging.getLogger(__name__)
+
+class Command(BaseImportImagesCommand):
+    help = 'import images from a directory into the media folder and creates item and image objects'
+
+    def add_arguments(self, parser):
+        parser.add_argument('source_dir')
+        parser.add_argument(
+            '--collection-name',
+            dest='collection_name',
+            default=False,
+            help='insert extracted data into the specified collection'
+
+        )
+        parser.add_argument(
+            '--no-jpg-conversion',
+            dest='no-jpg-conversion',
+            default=False,
+            help='use this option if you only want the image copied and not converted'
+        )
+
+
+    def handle(self, *args, **options):
+
+        print('# Logging with logger '+logger.name)
+        logger.debug('# Initializing command with args: %r', options)
+      
+        self.source_dir = options.get('source_dir')
+
+        collection_name = options.get('collection_name')
+
+        if collection_name:
+            print('## Finding collection with id ' + 
+                  collection_name)
+            try:
+                collection = Collection.objects.get(
+                    name=collection_name)
+            except Collection.DoesNotExist:
+                raise ValueError('!!! Collection with primary key ' +
+                                 collection_name +' was not found, aborting !!!')
+        else:
+            raise ValueError(
+                '!!! No collection fixture or collection id, aborting because we can\'t properly generate data. !!!')
+
+
+        '''Listing image files in target directory'''
+
+        print(
+            '## Converting image and moving it to static dir, creating Image and Item objects')
+        print('### Images will be stored in ' + os.path.join(settings.MEDIA_ROOT, 'uploads'))
+
+        for dirname, dirs, files in os.walk(self.source_dir):
+            for filename in files:
+                filename_without_extension, extension = os.path.splitext(filename)
+                if imghdr.what(os.path.join(dirname, filename)) is None:
+                    continue
+
+                json_path = os.path.join(dirname, filename_without_extension + ".json")
+                if not os.path.isfile(json_path):
+                    continue
+
+                with open(json_path) as json_data:
+                    eso_data = json.load(json_data)
+                    eso_image = eso_data['image']
+                
+                    path_images = os.path.join(filename_without_extension, filename)
+                    image_list = [path_images]
+                    image_dir = filename_without_extension
+
+                    natural_key = ItemMetadata.get_natural_key(collection, eso_image['id'])
+
+                    if ItemMetadata.objects.filter(
+                            item__collection=collection, natural_key=natural_key).exists():
+                        print('#### An item with ' +
+                              natural_key +' for natural key, already exists in database in the import collection')
+                    else:
+                        try:
+                            os.mkdir(os.path.join(settings.MEDIA_ROOT, 'uploads', image_dir))
+                            print(image_dir, "directory created")
+                        except FileExistsError:
+                            print(image_dir, "directory already exists")
+
+                        self.create_item_and_metadata(
+                            natural_key, collection, eso_data, image_list, options, self.source_dir)
+
+        print('# All done!')
\ No newline at end of file
diff -r e3f96cf6b484 -r e46a1986a2f0 src/iconolab_episteme/static/iconolab_episteme/img/logo_chs_footer.png
Binary file src/iconolab_episteme/static/iconolab_episteme/img/logo_chs_footer.png has changed
diff -r e3f96cf6b484 -r e46a1986a2f0 src/iconolab_episteme/static/iconolab_episteme/img/logo_mediapart_footer.png
Binary file src/iconolab_episteme/static/iconolab_episteme/img/logo_mediapart_footer.png has changed