recently taken reporter

intracer · Mar 17, 2024 · 7394e16 · 7394e16
1 parent e7874f6
commit 7394e16
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/scalawiki-core/src/main/scala/org/scalawiki/dto/Image.scala b/scalawiki-core/src/main/scala/org/scalawiki/dto/Image.scala
@@ -8,14 +8,20 @@ import org.scalawiki.dto.markup.Gallery
 import org.scalawiki.wikitext.TemplateParser
 import org.sweble.wikitext.engine.nodes.EngPage
 
+import scala.util.Try
+
 case class ImageMetadata(data: Map[String, String]) {
 
   def camera: Option[String] = data.get("Model")
 
   def date: Option[ZonedDateTime] =
     data
-      .get("DateTime")
-      .map(s => LocalDateTime.parse(s, ImageMetadata.df).atZone(ZoneOffset.UTC))
+      .get("DateTimeOriginal")
+      .flatMap { s =>
+        val parsed = Try(LocalDateTime.parse(s, ImageMetadata.df).atZone(ZoneOffset.UTC))
+        parsed.failed.foreach(println)
+        parsed.toOption
+      }
 }
 
 object ImageMetadata {

diff --git a/scalawiki-wlx/src/main/scala/org/scalawiki/wlx/stat/reports/RecentlyTaken.scala b/scalawiki-wlx/src/main/scala/org/scalawiki/wlx/stat/reports/RecentlyTaken.scala
@@ -15,8 +15,8 @@ class RecentlyTaken(val stat: ContestStat) extends Reporter {
       val images = db.images.filter(_.metadata.exists(_.date.exists(_.isAfter(jun30))))
       images.map{ i =>
         List(
-          s"[[File:${i.title}]]",
-          s"[[User:${i.author}|${i.author}]]",
+          s"[[:${i.title}]]",
+          s"[[User:${i.author.getOrElse("")}|${i.author.getOrElse("")}]]",
           i.metadata.flatMap(_.date.map(_.toString)).getOrElse("")
         )