From 476171fee5772aa65c9e4dd06fd1ea04a352cab2 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Mon, 11 Dec 2017 16:51:54 +0100
Subject: [PATCH] m.images: display long exposure as 1.5 s instead of 3/2 s.

---
 pelican-plugins/m/images.py                    |   6 +++++-
 pelican-plugins/m/test/images/longexposure.jpg | Bin 0 -> 888 bytes
 pelican-plugins/m/test/images/page.html        |   8 ++++++--
 pelican-plugins/m/test/images/page.rst         |   1 +
 pelican-plugins/m/test/test_images.py          |   2 +-
 5 files changed, 13 insertions(+), 4 deletions(-)
 create mode 100644 pelican-plugins/m/test/images/longexposure.jpg

diff --git a/pelican-plugins/m/images.py b/pelican-plugins/m/images.py
index 2ebc16db..b8e12176 100644
--- a/pelican-plugins/m/images.py
+++ b/pelican-plugins/m/images.py
@@ -197,7 +197,11 @@ class ImageGrid(rst.Directive):
                 if 'FNumber' in exif:
                     caption += ["F{}".format(float(float(exif['FNumber'][0])/float(exif['FNumber'][1])))]
                 if 'ExposureTime' in exif:
-                    caption += ["{}/{} s".format(exif['ExposureTime'][0], exif['ExposureTime'][1])]
+                    numerator, denominator = exif['ExposureTime']
+                    if int(numerator) > int(denominator):
+                        caption += ["{} s".format(float(numerator)/float(denominator))]
+                    else:
+                        caption += ["{}/{} s".format(numerator, denominator)]
                 if 'ISOSpeedRatings' in exif:
                     caption += ["ISO {}".format(exif['ISOSpeedRatings'])]
                 caption = ', '.join(caption)
diff --git a/pelican-plugins/m/test/images/longexposure.jpg b/pelican-plugins/m/test/images/longexposure.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..1da8accd2989fb70cccb9e2a030927cf51656c52
GIT binary patch
literal 888
zcmex=<Nrg3HLewzX$%a$z6@Fn3=A9$tc+3&tUwkc5PLC7!`VTM8Vt-}aV7=^CSfQW
zsH#1afd#5Q3P^*12M~kwLul5fS#VS4OkiMO2g<M*7#SN*WQ4F8nV1<Cz{Cv=3>Gj#
zO#lBMs1gD|HZ%Rd&EU+y!N$hU#>&CY&d$ln!NnuO%frphBPk@zFCr@?FDEM{Bcq_A
zr>>x+qbwt%VXmoTU}$1uBCl>~Yhh%gXKZ2wGK7(nlaq&=M}n7E!bnj@(THU5{{Vv^
z2ZI0u7c-+01Ct;lvmoRDBMkCDU$ZiT0nFV%ud%SQv2$>8aRU`>6<}auWM*b!VP<7z
z0R|dlEy(LEf~-P{hK_8)fr;!&g(60c6BlwQJ8e8D8g%i4ig8j=6DOCLxP+vXs+zin
zrk07RnYo3fm9vYho4bdnS8zyZSa?KaRB}pcT6#uiR&hybS$RceRdY*gTYE=m*QCi)
zrcRqaW9F<yi<c~2wtU6PRhu?%*}84}j-9&>9X@jO*zpr5PhGlv<?6NTH*Vf~_~`MI
zr_Y|hc=_t%r_W!$e*6C8=P!`IfbjwG7LbJa49#DHKz}i@urRZ*gZ#zFR1U<<f-J0x
zhHOHPf$WKe!b(Ps93oB=7j8VrscandK{To8BA1wo$wSqTAg_UaMx4i*$nqK7V+eoU
zV&GwB1V$dSAcH-_<1M`D?!EUo6Sr?l+pcll*zGf$GE3e2iSvwS&HTEzGIpB8q>RQx
zUOF-Cva^@hZM~UkCZ)GC^BcD=-?__g^rR~F1p7XoIBDx~uAn@5ZT$R0_Za6@s{VHQ
bn4fenrnn{a<T<8q%$K+7W$g7i|NkZcxVH=c

literal 0
HcmV?d00001

diff --git a/pelican-plugins/m/test/images/page.html b/pelican-plugins/m/test/images/page.html
index abf048f5..3ddd6adc 100644
--- a/pelican-plugins/m/test/images/page.html
+++ b/pelican-plugins/m/test/images/page.html
@@ -85,15 +85,19 @@ Yes.</span>
 <p>Image grid with a PNG file and a JPEG with sparse EXIF data:</p>
 <div class="m-imagegrid m-container-inflate">
 <div>
-<figure style="width: 70.588%">
+<figure style="width: 54.545%">
 <a href="./tiny.png"><img src="./tiny.png" /><div>
 </div>
 </a>
 </figure>
-<figure style="width: 29.412%">
+<figure style="width: 22.727%">
 <a href="./sparseexif.jpg"><img src="./sparseexif.jpg" /><figcaption>F2.8</figcaption>
 </a>
 </figure>
+<figure style="width: 22.727%">
+<a href="./longexposure.jpg"><img src="./longexposure.jpg" /><figcaption>1.5 s</figcaption>
+</a>
+</figure>
 </div>
 </div>
 <!-- /content -->
diff --git a/pelican-plugins/m/test/images/page.rst b/pelican-plugins/m/test/images/page.rst
index 13fe99aa..273d9838 100644
--- a/pelican-plugins/m/test/images/page.rst
+++ b/pelican-plugins/m/test/images/page.rst
@@ -63,3 +63,4 @@ Image grid with a PNG file and a JPEG with sparse EXIF data:
 
     {filename}/tiny.png
     {filename}/sparseexif.jpg
+    {filename}/longexposure.jpg
diff --git a/pelican-plugins/m/test/test_images.py b/pelican-plugins/m/test/test_images.py
index 699e1f09..84725d60 100644
--- a/pelican-plugins/m/test/test_images.py
+++ b/pelican-plugins/m/test/test_images.py
@@ -31,7 +31,7 @@ class Images(PluginTestCase):
     def test(self):
         self.run_pelican({
             'PLUGINS': ['m.htmlsanity', 'm.images'],
-            'STATIC_PATHS': ['tiny.png', 'ship.jpg', 'flowers.jpg', 'sparseexif.jpg']
+            'STATIC_PATHS': ['tiny.png', 'ship.jpg', 'flowers.jpg', 'sparseexif.jpg', 'longexposure.jpg']
         })
 
         #
-- 
2.30.2