Fixed tag search. Support min/max start/end dates by themselves. Added more metrics (#107)

Author: apavlo

dbdb/core/management/commands/create_twitter_cards.py

@@ -19,6 +19,8 @@ class Command(BaseCommand):
     def add_arguments(self, parser):
         parser.add_argument('system', metavar='S', type=str, nargs='?',
                     help='System to force twiter card creation')
+        parser.add_argument('--skip-errors', action='store_true',
+                            help="Ignore errors and keep processing")
         return
 
     def handle(self, *args, **options):
@@ -50,7 +52,11 @@ def handle(self, *args, **options):
                         continue
                 elif os.path.exists(card_img):
                     continue
-            ver.create_twitter_card()
+            try:
+                ver.create_twitter_card()
+            except:
+                self.stdout.write("FAIL: %s -> %s" % (ver.system.name, card_img))
+                if not options['skip_errors']: raise
             self.stdout.write("%s -> %s" % (ver.system.name, card_img))
         # FOR
         return

dbdb/core/management/commands/process_visits.py

@@ -67,6 +67,21 @@ def handle(self, *args, **options):
             return
         # IF
 
+        # Get the total # of visits per system so that we can update
+        # the System objects for our stats calculation
+        visits_per_system = { }
+        with connection.cursor() as cursor:
+            sql = "SELECT system_id, count(*) AS cnt FROM core_systemvisit GROUP BY system_id"
+            cursor.execute(sql)
+            visits_per_system = dict([ (row[0],int(row[1])) for row in cursor.fetchall() ])
+        # WITH
+        for system_id, visits in visits_per_system.items():
+            system = System.objects.get(id=system_id)
+            system.view_count = visits
+            system.save()
+            #print(system, "=>", visits_per_system[system_id])
+        #sys.exit(0)
+
         # Get the list of all unique IPs
         ip_addresses = [ ]
         with connection.cursor() as cursor:

dbdb/core/migrations/0027_feature_description.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.1.14 on 2022-07-04 19:26
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0026_auto_20220626_1511'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='feature',
+            name='description',
+            field=models.TextField(blank=True, help_text='This field supports Markdown Syntax'),
+        ),
+    ]

dbdb/core/models.py

@@ -36,6 +36,7 @@ class Feature(models.Model):
     slug = models.SlugField(db_index=True, unique=True)
     label = models.CharField(max_length=100, unique=True)
     multivalued = models.BooleanField(default=True)
+    description = models.TextField(blank=True, help_text='This field supports Markdown Syntax')
 
     class Meta:
         ordering = ('label',)
@@ -490,14 +491,15 @@ def get_twitter_card_image(self):
 
     def create_twitter_card(self):
         from PIL import Image, ImageDraw, ImageFont
+        from cairosvg import svg2png
+        import tempfile
 
         # Create a nicely formatted version of the logo for the twitter card
         template = os.path.join(settings.BASE_DIR, "static", settings.TWITTER_CARD_TEMPLATE)
         im1 = Image.open(template).convert("RGBA")
         new_im = Image.new('RGBA', (im1.width, im1.height))
         new_im.paste(im1, (0, 0))
 
-
         # If there is no logo, then we will create an image of just the name
         if not self.logo:
             font = ImageFont.truetype("/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf", 128)
@@ -516,6 +518,14 @@ def create_twitter_card(self):
             text_draw = ImageDraw.Draw(logo)
             text_draw.text((0, 0), name, font=font, fill=(70,70,70,255))
 
+        # SVG
+        elif self.logo.path.lower().endswith("svg"):
+            temp_name = os.path.join(tempfile.gettempdir(), next(tempfile._get_candidate_names()) + ".png")
+            with open(self.logo.path) as fd:
+                svg2png(bytestring=fd.read(),write_to=temp_name, scale=3)
+            logo = Image.open(temp_name).convert("RGBA")
+
+        # PNG
         else:
             logo = Image.open(self.logo).convert("RGBA")