.gitignore

@@ -1,104 +0,0 @@
-# Byte-compiled / optimized / DLL files
-__pycache__/
-*.py[cod]
-*$py.class
-
-# C extensions
-*.so
-
-# Distribution / packaging
-.Python
-build/
-develop-eggs/
-dist/
-downloads/
-eggs/
-.eggs/
-lib/
-lib64/
-parts/
-sdist/
-var/
-wheels/
-*.egg-info/
-.installed.cfg
-*.egg
-MANIFEST
-
-# PyInstaller
-#  Usually these files are written by a python script from a template
-#  before PyInstaller builds the exe, so as to inject date/other infos into it.
-*.manifest
-*.spec
-
-# Installer logs
-pip-log.txt
-pip-delete-this-directory.txt
-
-# Unit test / coverage reports
-htmlcov/
-.tox/
-.coverage
-.coverage.*
-.cache
-nosetests.xml
-coverage.xml
-*.cover
-.hypothesis/
-.pytest_cache/
-
-# Translations
-*.mo
-*.pot
-
-# Django stuff:
-*.log
-local_settings.py
-db.sqlite3
-
-# Flask stuff:
-instance/
-.webassets-cache
-
-# Scrapy stuff:
-.scrapy
-
-# Sphinx documentation
-docs/_build/
-
-# PyBuilder
-target/
-
-# Jupyter Notebook
-.ipynb_checkpoints
-
-# pyenv
-.python-version
-
-# celery beat schedule file
-celerybeat-schedule
-
-# SageMath parsed files
-*.sage.py
-
-# Environments
-.env
-.venv
-env/
-venv/
-ENV/
-env.bak/
-venv.bak/
-
-# Spyder project settings
-.spyderproject
-.spyproject
-
-# Rope project settings
-.ropeproject
-
-# mkdocs documentation
-/site
-
-# mypy
-.mypy_cache/

LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2018 Antoine
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

README.html

@@ -0,0 +1,40 @@
+<h1>PhotoReport</h1>
+<h2>Dépendences</h2>
+<ul>
+<li>Python 3</li>
+</ul>
+<h2>Installation</h2>
+<ul>
+<li>Créer un environnement virtuel python3 (e.g. : <code>virtulenv3 PhotoReport &amp;&amp; source bin/activate</code>)</li>
+<li>Cloner le dépôts (<code>git clone https://git.antoineve.me/PhotoReport/</code>)</li>
+<li>Installer les dépendances (Note : pour l'instant, version 0.1, ce n'est pas nécessaire)</li>
+</ul>
+<h2>Utilisation en ligne de commande</h2>
+<h3>exv.py</h3>
+<p>L'aide est disponible avec <code>./exv.py --help</code>.</p>
+<p>Exemple d'utilisation :</p>
+<pre><code>./exv.py -R -x jpg ~/Nextcloud/Photos/2019/
+</code></pre>
+<p>Exemple de sortie : <a href="https://git.antoineve.me/PhotoReport/tree/sortie_exemple.json">sortie_exemple.json</a></p>
+<h2>Comment contribuer ?</h2>
+<ul>
+<li>Cloner le dépôt : <code>git clone https://git.antoineve.me/PhotoReport/</code></li>
+<li>Créer une branche : <code>git checkout -b &lt;new_feature&gt;</code></li>
+<li>Coder et commiter : <code>git commit -a -m &lt;description&gt;</code></li>
+<li>Créer le patch : <code>git format-patch $(git merge-base --fork-point master)..&lt;new_feature&gt;</code></li>
+<li>M'envoyer le patch par mail : <a href="mailto:antoine+photoreport@van-elstraete.net">antoine+photoreport@van-elstraete.net</a></li>
+<li>J'applique le patch avec <code>git am --signoff -k &lt; &lt;new_feature&gt;.patch</code></li>
+</ul>
+<h2>BUGS &amp; TODO</h2>
+<ul>
+<li>Pour le moment, pas de sortie en PDF</li>
+<li>La base de donnée de darktable a changé depuis la première écriture du script</li>
+<li>La vitesse d'obturation n'est pas arrondie, est-ce souhaitable ? (16.666 ≠ 16.666666666666668 ?)</li>
+</ul>
+<h2>Features requests et développement prévu</h2>
+<ul>
+<li>Créer une option pour filtrer par objectif <strong>-&gt; branche filters/lens</strong></li>
+<li>Créer une option pour filtrer par boitier <strong>-&gt; branche filters/camera</strong></li>
+<li>Sortie PDF fonctionnelle <strong>-&gt; branche output/pdf_via_md</strong></li>
+<li>Créer une option pour une sortie exploitable par LaTeX</li>
+</ul>

README.md

@@ -3,7 +3,6 @@
 ## Dépendences
 
  - Python 3
- - exiv2
 
 ## Installation
 

exv.py

@@ -58,7 +58,7 @@ def extractor(input_files, start, end, recursive, extensions):
         input_files = files
 
     for input_file in input_files:
-        exif_dict = usefull_exif
+        exif_dict = usefull_exif.copy()
         if not isfile(input_file):
             raise ValueError("{} doesn't exist here.".format(input_file))
         exif_dict.update({'file': input_file})
@@ -98,7 +98,7 @@ def extractor(input_files, start, end, recursive, extensions):
                     exif_tags['0th'][0x0132].decode(), "%Y:%m:%d %H:%M:%S")
         if exif_dict['Pixels']:
             exif_dict.update({'Dimension': round((exif_dict['Pixels']/10**6), 1)})
-        exif_dict_list.append(exif_dict)
+        exif_dict_list.append(exif_dict.copy())
     cameras, lenses, focals, apertures, exposures = {}, {}, {}, {}, {}
     isos, dimensions, cameras_lenses, dates = {}, {}, {}, {}
     cameras_list, lenses_list, focals_list, apertures_list, exposures_list = [], [], [], [], []

report.py

@@ -153,6 +153,7 @@ def camera_and_lens(informations, language, colors, temp_dir):
     '''
     Informations about cameras and lenses used.
     '''
+    image1, image2 = None, None
     with open("helpers/dictionary.json") as file:
         helper = json.load(file)
     text = _("Cameras & lenses")
@@ -200,7 +201,7 @@ def camera_and_lens(informations, language, colors, temp_dir):
                 "helpers/lenses/{}.jpg".format(top_lens.replace(" ", "_").replace("/", "_")),
                 "{}/{}.jpg".format(temp_dir, top_lens.replace(" ", "_").replace("/", "_")))
         image2 = "{}/{}.jpg".format(temp_dir, top_lens.replace(" ", "_").replace("/", "_"))
-    if image1 or image2:
+    if image1 and image2:
         run(["montage", image1, image2, "-geometry", "+10+0", "-quality", "94", "{}/top_camera_lens.jpg".format(temp_dir)], check=True)
         text += ".. image:: {}.jpg\n\t:height: 5cm\n\n".format("top_camera_lens")
     if len(informations['cameras']) > 1: