Removing photography from the random folder selection

Author: lucas-a-meyer

content/folder/folder_content.py

@@ -67,7 +67,7 @@ def get_random_post(self, days_ago: int = 180) -> dict:
         if days_ago > 0:
             date = datetime.now(timezone.utc) - timedelta(days=days_ago)
             date_str = date.isoformat()
-            query = f"SELECT * FROM c WHERE NOT IS_DEFINED(c.last_posted) OR c.last_posted < '{date_str}'"
+            query = f"SELECT * FROM c WHERE c.folder_name != 'photography' AND (NOT IS_DEFINED(c.last_posted) OR c.last_posted < '{date_str}')"
         else:
             query = "SELECT * FROM c"
 

utils/darktable/darktable.py

@@ -157,6 +157,8 @@ def generate_dict(self, id: str, src_path: str, blob_url: str, description: str,
                 exif_d["Lens"] = exif_d["EXIF LensModel"]
             del exif_d["EXIF LensModel"]
 
+        exif_d["Lens"] = exif_d["Lens"].replace("M.Zuiko Digital ED ", "M.Zuiko ")
+
         if "EXIF DateTimeOriginal" in exif_d:
             date = exif_d["EXIF DateTimeOriginal"].split(" ")[0]
             date = date.split(":")
@@ -194,7 +196,7 @@ def generate_dict(self, id: str, src_path: str, blob_url: str, description: str,
             exif_d["Focal Length"] = f"{exif_d['EXIF FocalLength']}mm"
             del exif_d["EXIF FocalLength"]
 
-        j["text"] = f"{description}\n📷:{exif_d['Camera']} • 🔍:{exif_d['Focal Length']} • f:{exif_d['FNumber']} • {exif_d['ISO']} ISO • {exif_d['Exposure']}\n{exif_d['date']}"
+        j["text"] = f"{description}\n📷:{exif_d['Camera']}\n🔍:{exif_d['Lens']}@{exif_d['Focal Length']}\nf:{exif_d['FNumber']} • {exif_d['ISO']} ISO • {exif_d['Exposure']}\n{exif_d['date']}"
 
         return j