Merge pull request #1146 from aaronwmorris/dev

script to populate thumbnails

Author: aaronwmorris

indi_allsky/flask/forms.py

@@ -3215,6 +3215,7 @@ def getImages(self, year, month, day, hour):
 
 
             image_dict = dict()
+            image_dict['date'] = img.createDate.strftime('%H:%M:%S')
             image_dict['url'] = str(image_url)
             image_dict['width'] = img.width
             image_dict['height'] = img.height

indi_allsky/flask/templates/gallery.html

@@ -162,28 +162,31 @@
     $('#allsky-gallery').empty();
 
     gallery_data.forEach(item => {
-        var a_div = $('<a />', {
+        var a_tag = $('<a />', {
             'href'        : item['url'],
             'data-pswp-width'  : item['width'],
             'data-pswp-height' : item['height'],
             'target'      : "_blank",
             'rel'         : "noopener noreferrer",
             'class'       : "text-decoration-none",
         });
-        a_div.appendTo($('#allsky-gallery'));
+        a_tag.appendTo($('#allsky-gallery'));
 
-        var img_div = $('<img />', {
-            'src' : item['thumbnail_url'],
-            'alt' : "thumbnail",
+        var img_tag = $('<img />', {
+            'src'       : item['thumbnail_url'],
+            'loading'   : 'lazy',
+            'alt'       : item['date'],
         });
-        img_div.appendTo(a_div);
+        img_tag.appendTo(a_tag);
 
     });
 
 
     lightbox = new PhotoSwipeLightbox({
         gallery: '#allsky-gallery',
         children: 'a',
+        preloadFirstSlide: false,
+        preloaderDelay: 0,
         // dynamic import is not supported in UMD version
         pswpModule: PhotoSwipe
     });

indi_allsky/video.py

@@ -71,6 +71,9 @@
 
 class VideoWorker(Process):
 
+    thumbnail_keogram_width = 1000
+    thumbnail_startrail_width = 300
+
 
     def __init__(
         self,
@@ -918,7 +921,7 @@ def generateKeogramStarTrails(self, task, timespec, img_folder, night, camera):
             keogram_metadata,
             camera.id,
             keogram_thumbnail_metadata,
-            new_width=1000,
+            new_width=self.thumbnail_keogram_width,
         )
 
 
@@ -947,7 +950,7 @@ def generateKeogramStarTrails(self, task, timespec, img_folder, night, camera):
                 startrail_metadata,
                 camera.id,
                 startrail_thumbnail_metadata,
-                new_width=300,
+                new_width=self.thumbnail_startrail_width,
             )
 
 

misc/create_thumbnails.py

@@ -0,0 +1,142 @@
+#!/usr/bin/env python3
+
+import sys
+import time
+from pathlib import Path
+import logging
+
+#from sqlalchemy.sql.expression import true as sa_true
+from sqlalchemy.sql.expression import null as sa_null
+from sqlalchemy.orm.exc import NoResultFound
+
+
+sys.path.append(str(Path(__file__).parent.absolute().parent))
+
+from indi_allsky.flask import create_app
+
+# setup flask context for db access
+app = create_app()
+app.app_context().push()
+
+#from indi_allsky.flask import db
+from indi_allsky.config import IndiAllSkyConfig
+from indi_allsky.flask.miscDb import miscDb
+
+from indi_allsky.flask.models import IndiAllSkyDbImageTable
+from indi_allsky.flask.models import IndiAllSkyDbKeogramTable
+from indi_allsky.flask.models import IndiAllSkyDbStarTrailsTable
+#from indi_allsky.flask.models import IndiAllSkyDbThumbnailTable
+
+from indi_allsky import constants
+
+
+logging.basicConfig(level=logging.INFO)
+logger = logging
+
+
+class CreateThumbnails(object):
+
+    thumbnail_keogram_width = 1000
+    thumbnail_startrail_width = 300
+
+    def __init__(self):
+        try:
+            self._config_obj = IndiAllSkyConfig()
+            #logger.info('Loaded config id: %d', self._config_obj.config_id)
+        except NoResultFound:
+            logger.error('No config file found, please import a config')
+            sys.exit(1)
+
+        self.config = self._config_obj.config
+
+
+        self._miscDb = miscDb(self.config)
+
+
+    def main(self):
+
+        keograms_nothumbnail = IndiAllSkyDbKeogramTable.query\
+            .filter(IndiAllSkyDbKeogramTable.thumbnail_uuid == sa_null())\
+            .order_by(IndiAllSkyDbKeogramTable.createDate.desc())
+
+        startrails_nothumbnail = IndiAllSkyDbStarTrailsTable.query\
+            .filter(IndiAllSkyDbStarTrailsTable.thumbnail_uuid == sa_null())\
+            .order_by(IndiAllSkyDbStarTrailsTable.createDate.desc())
+
+        images_nothumbnail = IndiAllSkyDbImageTable.query\
+            .filter(IndiAllSkyDbImageTable.thumbnail_uuid == sa_null())\
+            .order_by(IndiAllSkyDbImageTable.createDate.desc())
+
+
+
+        print('Keograms without thumbnails:   {0:d}'.format(keograms_nothumbnail.count()))
+        print('Startrails without thumbnails: {0:d}'.format(startrails_nothumbnail.count()))
+        print('Images without thumbnails:     {0:d}'.format(images_nothumbnail.count()))
+        print()
+        print('Running in 10 seconds... control-c to cancel')
+        print()
+
+        time.sleep(10.0)
+
+
+        for keogram_entry in keograms_nothumbnail:
+            logger.info('Creating keogram thumbnail for %d', keogram_entry.id)
+
+            keogram_thumbnail_metadata = {
+                'type'       : constants.THUMBNAIL,
+                'createDate' : keogram_entry.createDate.timestamp(),
+                'night'      : keogram_entry.night,
+                'camera_uuid': keogram_entry.camera.uuid,
+            }
+
+            self._miscDb.addThumbnail(
+                keogram_entry,
+                {},  # keogram metadata not used
+                keogram_entry.camera_id,
+                keogram_thumbnail_metadata,
+                new_width=self.thumbnail_keogram_width,
+            )
+
+
+        for startrail_entry in startrails_nothumbnail:
+            logger.info('Creating startrail thumbnail for %d', startrail_entry.id)
+
+            startrail_thumbnail_metadata = {
+                'type'       : constants.THUMBNAIL,
+                'createDate' : startrail_entry.createDate.timestamp(),
+                'night'      : startrail_entry.night,
+                'camera_uuid': startrail_entry.camera.uuid,
+            }
+
+            self._miscDb.addThumbnail(
+                startrail_entry,
+                {},  # startrail metadata not used
+                startrail_entry.camera_id,
+                startrail_thumbnail_metadata,
+                new_width=self.thumbnail_startrail_width,
+            )
+
+
+        for image_entry in images_nothumbnail:
+            logger.info('Creating image thumbnail for %d', image_entry.id)
+
+            image_thumbnail_metadata = {
+                'type'       : constants.THUMBNAIL,
+                'createDate' : image_entry.createDate.timestamp(),
+                'night'      : image_entry.night,
+                'camera_uuid': image_entry.camera.uuid,
+            }
+
+            self._miscDb.addThumbnail(
+                image_entry,
+                {},  # image metadata not used
+                image_entry.camera_id,
+                image_thumbnail_metadata,
+            )
+
+
+
+
+if __name__ == "__main__":
+    ct = CreateThumbnails()
+    ct.main()