From 34db72cffa0735cf76fde7578aad68de1a63bb93 Mon Sep 17 00:00:00 2001
From: Adrien Beudin <beudbeud@beudibox.fr>
Date: Sun, 4 Jun 2017 16:15:37 +0200
Subject: [PATCH 01/12] better catch error

---
 prosopopee/prosopopee.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/prosopopee/prosopopee.py b/prosopopee/prosopopee.py
index 0be5fae..f0c06d8 100644
--- a/prosopopee/prosopopee.py
+++ b/prosopopee/prosopopee.py
@@ -357,7 +357,14 @@ def process_directory(gallery_name, settings, parent_templates, parent_gallery_p
     else:
         gallery_path = gallery_name
 
-    gallery_settings = yaml.safe_load(open(Path(".").joinpath(gallery_path, "settings.yaml").abspath(), "r"))
+    try:
+        gallery_settings = yaml.load(open(Path(".").joinpath(gallery_path, "settings.yaml").abspath(), "r"))
+    except yaml.YAMLError, exc:
+        if hasattr(exc, 'problem_mark'):
+            mark = exc.problem_mark
+            error(False, "There are something wrong in %s/settings.yaml line %s" % (gallery_path, mark.line+1))
+        else:
+            erro(False, "There are omething wrong in %s/settings.yaml" % (gallery_path))
 
     error(isinstance(gallery_settings, dict), "Your %s should be a dict" % gallery_name.joinpath("settings.yaml"))
     error(gallery_settings.get("title"), "You should specify a title in %s" % gallery_name.joinpath("settings.yaml"))

From 59f96c0b240ffe1e9466fe9f8f22f17db2a35d5e Mon Sep 17 00:00:00 2001
From: Adrien Beudin <beudbeud@beudibox.fr>
Date: Sun, 4 Jun 2017 16:28:09 +0200
Subject: [PATCH 02/12] add background color for audio player

---
 docs/sections.rst                                        | 1 +
 prosopopee/themes/exposure/templates/sections/audio.html | 2 +-
 prosopopee/themes/material/templates/sections/audio.html | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/sections.rst b/docs/sections.rst
index fe718cf..8ca16e5 100644
--- a/docs/sections.rst
+++ b/docs/sections.rst
@@ -151,6 +151,7 @@ This section is for add audio file with HTML5 player.::
   - type: audio
     title: Title of song 
     image: song.ogg
+    color: "#000" (optional)
 
 
 Author
diff --git a/prosopopee/themes/exposure/templates/sections/audio.html b/prosopopee/themes/exposure/templates/sections/audio.html
index cf99913..7cb88b2 100644
--- a/prosopopee/themes/exposure/templates/sections/audio.html
+++ b/prosopopee/themes/exposure/templates/sections/audio.html
@@ -6,7 +6,7 @@
 {% set format = extension %}
 {% endif %}
 {{ audio.copy() }}
-<div class="audio-player">
+<div class="audio-player" {% if section.color %} style="background: {{ section.color  }};"{% endif %}>
   <h2>{% if section.title %}{{ section.title }}{% else %}{{ audio }}{% endif %}</h2>
 <audio controls preload=none>
   <source src="{{ audio }}.{{ extension }}" type="audio/{{ format }}">
diff --git a/prosopopee/themes/material/templates/sections/audio.html b/prosopopee/themes/material/templates/sections/audio.html
index cf99913..7cb88b2 100644
--- a/prosopopee/themes/material/templates/sections/audio.html
+++ b/prosopopee/themes/material/templates/sections/audio.html
@@ -6,7 +6,7 @@
 {% set format = extension %}
 {% endif %}
 {{ audio.copy() }}
-<div class="audio-player">
+<div class="audio-player" {% if section.color %} style="background: {{ section.color  }};"{% endif %}>
   <h2>{% if section.title %}{{ section.title }}{% else %}{{ audio }}{% endif %}</h2>
 <audio controls preload=none>
   <source src="{{ audio }}.{{ extension }}" type="audio/{{ format }}">

From c4ddefd45a3d6d5e651d7979d156a1383c7744be Mon Sep 17 00:00:00 2001
From: Adrien Beudin <beudbeud@beudibox.fr>
Date: Sun, 4 Jun 2017 20:03:37 +0200
Subject: [PATCH 03/12] catch error in root settings

---
 prosopopee/prosopopee.py | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/prosopopee/prosopopee.py b/prosopopee/prosopopee.py
index f0c06d8..18286fe 100644
--- a/prosopopee/prosopopee.py
+++ b/prosopopee/prosopopee.py
@@ -273,7 +273,14 @@ def get_settings():
     error(Path("settings.yaml").exists(), "I can't find a "
           "settings.yaml in the current working directory")
 
-    settings = yaml.safe_load(open("settings.yaml", "r"))
+    try:
+        settings = yaml.safe_load(open("settings.yaml", "r"))
+    except yaml.YAMLError, exc:
+        if hasattr(exc, 'problem_mark'):
+            mark = exc.problem_mark
+            error(False, "There are something wrong in settings.yaml line %s" % (mark.line+1))
+        else:
+            erro(False, "There are omething wrong in settings.yaml")
 
     error(isinstance(settings, dict), "Your settings.yaml should be a dict")
 
@@ -358,7 +365,7 @@ def process_directory(gallery_name, settings, parent_templates, parent_gallery_p
         gallery_path = gallery_name
 
     try:
-        gallery_settings = yaml.load(open(Path(".").joinpath(gallery_path, "settings.yaml").abspath(), "r"))
+        gallery_settings = yaml.safe_load(open(Path(".").joinpath(gallery_path, "settings.yaml").abspath(), "r"))
     except yaml.YAMLError, exc:
         if hasattr(exc, 'problem_mark'):
             mark = exc.problem_mark

From 95358281ef72f487029514527214b15aa6486046 Mon Sep 17 00:00:00 2001
From: Adrien Beudin <beudbeud@beudibox.fr>
Date: Sun, 4 Jun 2017 21:54:04 +0200
Subject: [PATCH 04/12] fix fullscreen video on click

---
 .../exposure/templates/gallery-index.html     | 22 +++++++++----------
 .../templates/sections/bordered-picture.html  |  2 +-
 .../templates/sections/pictures-group.html    |  2 +-
 .../material/templates/gallery-index.html     | 22 +++++++++----------
 .../templates/sections/bordered-picture.html  |  2 +-
 .../templates/sections/pictures-group.html    |  2 +-
 6 files changed, 24 insertions(+), 28 deletions(-)

diff --git a/prosopopee/themes/exposure/templates/gallery-index.html b/prosopopee/themes/exposure/templates/gallery-index.html
index 521e9df..1f5086c 100644
--- a/prosopopee/themes/exposure/templates/gallery-index.html
+++ b/prosopopee/themes/exposure/templates/gallery-index.html
@@ -79,18 +79,16 @@ $('audio').mediaelementplayer({
 });
 {% endif %}
 
-var video = $("video");
-video.on('click', function(e){
-  var vid = video[0];
-  vid.play();
-  if (vid.requestFullscreen) {
-    vid.requestFullscreen();
-  } else if (vid.mozRequestFullScreen) {
-    vid.mozRequestFullScreen();
-  } else if (vid.webkitRequestFullscreen) {
-    vid.webkitRequestFullscreen();
-  }
-});
+function goFullscreen(id) {
+  var element = document.getElementById(id);
+  if (element.requestFullscreen) {
+    element.requestFullscreen();
+  } else if (element.mozRequestFullScreen) {
+    element.mozRequestFullScreen();
+  } else if (element.webkitRequestFullScreen) {
+    element.webkitRequestFullScreen();
+  }  
+}
 
 $(function() {
   $("img.lazy").lazyload({
diff --git a/prosopopee/themes/exposure/templates/sections/bordered-picture.html b/prosopopee/themes/exposure/templates/sections/bordered-picture.html
index c88f415..d1ab5cf 100644
--- a/prosopopee/themes/exposure/templates/sections/bordered-picture.html
+++ b/prosopopee/themes/exposure/templates/sections/bordered-picture.html
@@ -9,7 +9,7 @@
   <section class="bordered-picture baguette" style="position: relative;">
     <div class="caption">
       <img class="lazy" data-original="{{ video.generate_thumbnail("2000") }}" src="" alt="">
-      <video class="lazy responsive-video" id="video" poster="{{ video.generate_thumbnail("2000") }}" alt="" autoplay="autoplay" loop="loop" preload="none" muted>
+      <video class="lazy responsive-video" id="{{ video }}" onclick="goFullscreen('{{ video }}');" poster="{{ video.generate_thumbnail("2000") }}" alt="" autoplay="autoplay" loop="loop" preload="none" muted>
         <source src="{{ video }}.{{ format }}" type="video/{{ format }}">
       </video>
       {% if caption %}
diff --git a/prosopopee/themes/exposure/templates/sections/pictures-group.html b/prosopopee/themes/exposure/templates/sections/pictures-group.html
index 8f2ebe9..563e9ae 100644
--- a/prosopopee/themes/exposure/templates/sections/pictures-group.html
+++ b/prosopopee/themes/exposure/templates/sections/pictures-group.html
@@ -12,7 +12,7 @@
         {% set format = settings.ffmpeg.extension %}
         {{ video.copy() }}
         <img class="lazy" data-original="{{ video.generate_thumbnail("600") }}" src="" alt="">
-        <video class="lazy responsive-video" id="video" poster="{{ video.generate_thumbnail("600") }}" alt="" autoplay="autoplay" loop="loop" preload="auto" muted>
+        <video class="lazy responsive-video" id="{{ video }}" onclick="goFullscreen('{{ video }}');" poster="{{ video.generate_thumbnail("600") }}" alt="" autoplay="autoplay" loop="loop" preload="auto" muted>
           <source src="{{ video }}.{{ format }}" type="video/{{ format }}">
         </video>
         {% if caption %}
diff --git a/prosopopee/themes/material/templates/gallery-index.html b/prosopopee/themes/material/templates/gallery-index.html
index d50019c..c8f4d56 100644
--- a/prosopopee/themes/material/templates/gallery-index.html
+++ b/prosopopee/themes/material/templates/gallery-index.html
@@ -62,18 +62,16 @@ $(document).ready(function(){
   $('.parallax').parallax();
 });    
 
-var video = $("video.lazy");
-video.on('click', function(e){
-  var vid = video[0];
-  vid.play();
-  if (vid.requestFullscreen) {
-    vid.requestFullscreen();
-  } else if (vid.mozRequestFullScreen) {
-    vid.mozRequestFullScreen();
-  } else if (vid.webkitRequestFullscreen) {
-    vid.webkitRequestFullscreen();
-  }
-});
+function goFullscreen(id) {
+  var element = document.getElementById(id);
+  if (element.requestFullscreen) {
+    element.requestFullscreen();
+  } else if (element.mozRequestFullScreen) {
+    element.mozRequestFullScreen();
+  } else if (element.webkitRequestFullScreen) {
+    element.webkitRequestFullScreen();
+  }  
+}
 
 {% if gallery.audio_enabled %}
 $('audio').mediaelementplayer({
diff --git a/prosopopee/themes/material/templates/sections/bordered-picture.html b/prosopopee/themes/material/templates/sections/bordered-picture.html
index 4c9795b..9ae2547 100644
--- a/prosopopee/themes/material/templates/sections/bordered-picture.html
+++ b/prosopopee/themes/material/templates/sections/bordered-picture.html
@@ -12,7 +12,7 @@
   <div class="bordered-picture baguette caption">
     {% if video %}
     <img class="responsive-img lazy z-depth-2" data-original="{{ video.generate_thumbnail("2000") }}" alt="">
-    <video class="lazy responsive-video" poster="{{ video.generate_thumbnail("2000") }}" alt="" autoplay="autoplay" loop="loop" preload="auto" muted="">
+    <video class="lazy responsive-video" id="{{ video }}" onclick="goFullscreen('{{ video }}');" poster="{{ video.generate_thumbnail("2000") }}" alt="" autoplay="autoplay" loop="loop" preload="auto" muted>
       <source src="{{ video }}.{{ format }}" type="video/{{ format }}">
     </video>
     {% else %}
diff --git a/prosopopee/themes/material/templates/sections/pictures-group.html b/prosopopee/themes/material/templates/sections/pictures-group.html
index 9f9eabb..6732a5f 100644
--- a/prosopopee/themes/material/templates/sections/pictures-group.html
+++ b/prosopopee/themes/material/templates/sections/pictures-group.html
@@ -12,7 +12,7 @@
         {% set format = settings.ffmpeg.extension %}
         {{ video.copy() }}
         <img class="z-depth-2 lazy responsive-img" data-original="{{ video.generate_thumbnail("600") }}" src="" alt="">
-        <video class="lazy responsive-video" id="video" poster="{{ video.generate_thumbnail("600") }}" alt="" autoplay="autoplay" loop="loop" preload="auto" muted>
+        <video class="lazy responsive-video" id="{{ video }}" onclick="goFullscreen('{{ video }}');" poster="{{ video.generate_thumbnail("600") }}" alt="" autoplay="autoplay" loop="loop" preload="auto" muted>
           <source src="{{ video }}.{{ format }}" type="video/{{ format }}">
         </video>
         {% if caption %}

From b3d9eaf1a099546a24fca4a87fd15789178dd33a Mon Sep 17 00:00:00 2001
From: Adrien Beudin <beudbeud@beudibox.fr>
Date: Sun, 4 Jun 2017 21:59:03 +0200
Subject: [PATCH 05/12] update changelog

---
 docs/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 40bcc11..fd303f6 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -10,6 +10,7 @@ Changelog
  * Add deploy and preview option https://prosopopee.readthedocs.io/en/latest/build.html#preview by beudbeud
  * Load only css and jss if the section is used by beudbeud
  * Possibility to add floating image in paragraph by beudbeud https://prosopopee.readthedocs.org/en/latest/sections.html#paragraph
+ * fix some bugs
 
 0.4 (2016-12-11)
 

From 7b70d764b2aa3c83a39d7e71e27bc981d90b9436 Mon Sep 17 00:00:00 2001
From: Adrien Beudin <beudbeud@beudibox.fr>
Date: Sun, 4 Jun 2017 22:00:14 +0200
Subject: [PATCH 06/12] update changelog

---
 docs/changelog.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index fd303f6..5dd5bbe 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,7 +1,7 @@
 Changelog
 =========
 
-0.5 (2017-06-02)
+0.5 (2017-06-04)
 
  * Add audio HTML5 player https://prosopopee.readthedocs.org/en/latest/sections.html#audio by beudbeud
  * Update Material theme by beudbeud

From 4b50ee2277a51a47f2eb4e48b33870060f7e183c Mon Sep 17 00:00:00 2001
From: Adrien Beudin <beudbeud@beudibox.fr>
Date: Sun, 4 Jun 2017 22:12:09 +0200
Subject: [PATCH 07/12] update version

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index c0b46e6..276e03d 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@ except ImportError:
 
 
 setup(name='prosopopee',
-      version='0.4',
+      version='0.5',
       description='exposure.co clone in a static web generating tool',
       author='Laurent Peuch',
       long_description=read_md('README.md') + "\n\n\n" + open('docs/changelog.rst').read(),

From 08a93ece26f92614af808da2ece5e9918eb94f02 Mon Sep 17 00:00:00 2001
From: Adrien Beudin <beudbeud@beudibox.fr>
Date: Mon, 3 Jul 2017 13:37:38 +0200
Subject: [PATCH 08/12] init python3 version

---
 prosopopee/cache.py                           |   4 +-
 prosopopee/prosopopee.py                      | 106 +++++++++---------
 .../themes/exposure/templates/footer.html     |   3 +
 .../exposure/templates/gallery-index.html     |   3 +
 .../themes/exposure/templates/index.html      |   3 +
 requirements.txt                              |   3 +-
 6 files changed, 69 insertions(+), 53 deletions(-)

diff --git a/prosopopee/cache.py b/prosopopee/cache.py
index cc1050f..6f4528c 100644
--- a/prosopopee/cache.py
+++ b/prosopopee/cache.py
@@ -33,7 +33,7 @@ class Cache(object):
             self.cache = {"version": CACHE_VERSION}
 
         if "version" not in self.cache or self.cache["version"] != CACHE_VERSION:
-            print "info: cache format as changed, prune cache"
+            print("info: cache format as changed, prune cache")
             self.cache = {"version": CACHE_VERSION}
 
     def needs_to_be_generated(self, source, target, options):
@@ -54,7 +54,7 @@ class Cache(object):
         self.cache[target] = {"size": os.path.getsize(source), "options": remove_superficial_options(options)}
 
     def __del__(self):
-        self.json.dump(self.cache, open(self.cache_file_path, "w"))
+        self.json.dump(self.cache, open(self.cache_file_path, "wb"))
 
 
 CACHE = Cache(json=json)
diff --git a/prosopopee/prosopopee.py b/prosopopee/prosopopee.py
index 18286fe..b482751 100644
--- a/prosopopee/prosopopee.py
+++ b/prosopopee/prosopopee.py
@@ -13,15 +13,14 @@ Options:
 """
 
 import os
-import yaml
 import shutil
+import socketserver
+import http.server
+
+import ruamel.yaml as yaml
+#import yaml
 from docopt import docopt
 
-import SocketServer
-import SimpleHTTPServer
-
-import subprocess
-
 from path import Path
 
 from jinja2 import Environment, FileSystemLoader
@@ -94,18 +93,18 @@ class Video(object):
             return
 
         ffmpeg_switches = {
-           "source": source,
-           "target": target,
-           "loglevel": "-loglevel %s" % options["loglevel"],
-           "resolution": "-s %s" % options["resolution"],
-           "resize": "-vf scale=-1:%s" % options.get("resize"),
-           "vbitrate": "-b:v %s" % options["vbitrate"],
-           "abitrate": "-b:v %s" % options["abitrate"],
-           "format": "-f %s" % options["format"],
-           "binary": "%s" % options["binary"],
-           "video": "-c:v %s" % options["video"],
-           "audio": "-c:a %s" % options["audio"],
-           "other": "%s" % options["other"]
+            "source": source,
+            "target": target,
+            "loglevel": "-loglevel %s" % options["loglevel"],
+            "resolution": "-s %s" % options["resolution"],
+            "resize": "-vf scale=-1:%s" % options.get("resize"),
+            "vbitrate": "-b:v %s" % options["vbitrate"],
+            "abitrate": "-b:v %s" % options["abitrate"],
+            "format": "-f %s" % options["format"],
+            "binary": "%s" % options["binary"],
+            "video": "-c:v %s" % options["video"],
+            "audio": "-c:a %s" % options["audio"],
+            "other": "%s" % options["other"]
         }
 
         warning("Generation", source)
@@ -168,11 +167,11 @@ class Audio(object):
             return
 
         ffmpeg_switches = {
-           "source": source,
-           "target": target,
-           "binary": "%s" % options["binary"],
-           "loglevel": "-loglevel %s" % options["loglevel"],
-           "audio": "-c:a %s" % options["audio"]
+            "source": source,
+            "target": target,
+            "binary": "%s" % options["binary"],
+            "loglevel": "-loglevel %s" % options["loglevel"],
+            "audio": "-c:a %s" % options["audio"]
         }
 
         warning("Generation", source)
@@ -215,13 +214,13 @@ class Image(object):
             return
 
         gm_switches = {
-           "source": source,
-           "target": target,
-           "auto-orient": "-auto-orient" if options["auto-orient"] else "",
-           "strip": "-strip" if options["strip"] else "",
-           "quality": "-quality %s" % options["quality"] if "quality" in options else "-define jpeg:preserve-settings",
-           "resize": "-resize %s" % options["resize"] if options.get("resize", None) is not None else "",
-           "progressive": "-interlace Line" if options.get("progressive", None) is True else ""
+            "source": source,
+            "target": target,
+            "auto-orient": "-auto-orient" if options["auto-orient"] else "",
+            "strip": "-strip" if options["strip"] else "",
+            "quality": "-quality %s" % options["quality"] if "quality" in options else "-define jpeg:preserve-settings",
+            "resize": "-resize %s" % options["resize"] if options.get("resize", None) is not None else "",
+            "progressive": "-interlace Line" if options.get("progressive", None) is True else ""
         }
 
         command = "gm convert '{source}' {auto-orient} {strip} {progressive} {quality} {resize} '{target}'".format(**gm_switches)
@@ -244,7 +243,7 @@ class Image(object):
 
         if not options["auto-orient"] and not options["strip"]:
             shutil.copyfile(source, target)
-            print("%s%s%s" % (source, "->", target))
+            print(("%s%s%s" % (source, "->", target)))
         else:
             # Do not consider quality settings here, since we aim to copy the input image
             # better to preserve input encoding setting
@@ -275,20 +274,20 @@ def get_settings():
 
     try:
         settings = yaml.safe_load(open("settings.yaml", "r"))
-    except yaml.YAMLError, exc:
+    except yaml.YAMLError as exc:
         if hasattr(exc, 'problem_mark'):
             mark = exc.problem_mark
-            error(False, "There are something wrong in settings.yaml line %s" % (mark.line+1))
+            error(False, "There are something wrong in settings.yaml line %s" % (mark.line))
         else:
-            erro(False, "There are omething wrong in settings.yaml")
+            error(False, "There are omething wrong in settings.yaml")
 
     error(isinstance(settings, dict), "Your settings.yaml should be a dict")
 
-    for key, value in DEFAULTS.items():
+    for key, value in list(DEFAULTS.items()):
         if key not in settings:
             settings[key] = value
 
-    for key, value in SETTINGS.items():
+    for key, value in list(SETTINGS.items()):
         if key not in settings:
             settings[key] = value
 
@@ -366,12 +365,12 @@ def process_directory(gallery_name, settings, parent_templates, parent_gallery_p
 
     try:
         gallery_settings = yaml.safe_load(open(Path(".").joinpath(gallery_path, "settings.yaml").abspath(), "r"))
-    except yaml.YAMLError, exc:
+    except yaml.YAMLError as exc:
         if hasattr(exc, 'problem_mark'):
             mark = exc.problem_mark
-            error(False, "There are something wrong in %s/settings.yaml line %s" % (gallery_path, mark.line+1))
+            error(False, "There are something wrong in %s/settings.yaml line %s" % (gallery_path, mark.line))
         else:
-            erro(False, "There are omething wrong in %s/settings.yaml" % (gallery_path))
+            error(False, "There are something wrong in %s/settings.yaml" % (gallery_path))
 
     error(isinstance(gallery_settings, dict), "Your %s should be a dict" % gallery_name.joinpath("settings.yaml"))
     error(gallery_settings.get("title"), "You should specify a title in %s" % gallery_name.joinpath("settings.yaml"))
@@ -472,7 +471,7 @@ def build_gallery(settings, gallery_settings, gallery_path, template):
         name=gallery_path.split('/', 1)[-1]
     ).encode("Utf-8")
 
-    open(Path("build").joinpath(gallery_path, "index.html"), "w").write(html)
+    open(Path("build").joinpath(gallery_path, "index.html"), "wb").write(html)
 
     # XXX shouldn't this be a call to build_gallery?
     # Build light mode gallery
@@ -507,13 +506,13 @@ def build_gallery(settings, gallery_settings, gallery_path, template):
             name=gallery_path.split('/', 1)[-1]
         ).encode("Utf-8")
 
-        open(Path("build").joinpath(gallery_light_path, "index.html"), "w").write(html)
+        open(Path("build").joinpath(gallery_light_path, "index.html"), "wb").write(html)
 
 
 def build_index(settings, galleries_cover, templates, gallery_path='', sub_index=False):
     index_template = templates.get_template("index.html")
 
-    galleries_cover = reversed(sorted(filter(lambda x: x != {}, galleries_cover), key=lambda x: x["date"]))
+    galleries_cover = reversed(sorted([x for x in galleries_cover if x != {}], key=lambda x: x["date"]))
 
     # this should probably be a factory
     Image.base_dir = Path(".").joinpath(gallery_path)
@@ -530,7 +529,7 @@ def build_index(settings, galleries_cover, templates, gallery_path='', sub_index
         Video=Video
     ).encode("Utf-8")
 
-    open(Path("build").joinpath(gallery_path, "index.html"), "w").write(html)
+    open(Path("build").joinpath(gallery_path, "index.html"), "wb").write(html)
 
 
 def main():
@@ -549,11 +548,10 @@ def main():
         error(Path("build").exists(), "Please build the website before launch preview")
 
         os.chdir('build')
+        handler = http.server.SimpleHTTPRequestHandler
+        httpd = socketserver.TCPServer(("", 9000), handler)
 
-        Handler = SimpleHTTPServer.SimpleHTTPRequestHandler
-        httpd = SocketServer.TCPServer(("", 9000), Handler)
-
-        print "Start server on http://localhost:9000"
+        print('Start server on http://localhost:9000')
         # gracefully handle interrupt here
         httpd.serve_forever()
 
@@ -561,7 +559,7 @@ def main():
         error(os.system("which rsync > /dev/null") == 0, "I can't locate the rsync, "
           "please install the 'rsync' package.\n")
         error(Path("build").exists(), "Please build the website before launch deployment")
-        
+
         r_dest = settings["settings"]["deploy"]["dest"]
         if settings["settings"]["deploy"]["others"]:
             r_others = settings["settings"]["deploy"]["others"]
@@ -581,6 +579,14 @@ def main():
     templates = get_gallery_templates(theme)
     templates.add_extension('jinja2.ext.with_')
 
+    if Path("custom.js").exists():
+        shutil.copy(Path("custom.js"), Path(".").joinpath("build", "", "static", "js"))
+        settings["custom_js"] = True
+
+    if Path("custom.css").exists():
+        shutil.copy(Path("custom.css"), Path(".").joinpath("build", "", "static", "css"))
+        settings["custom_css"] = True
+
     for gallery in galleries_dirs:
         front_page_galleries_cover.append(process_directory(gallery, settings, templates))
 
@@ -589,10 +595,10 @@ def main():
 
         xml = feed_template.render(
             settings=settings,
-            galleries=reversed(sorted(filter(lambda x: x != {}, front_page_galleries_cover), key=lambda x: x["date"]))
+            galleries=reversed(sorted([x for x in front_page_galleries_cover if x != {}], key=lambda x: x["date"]))
         ).encode("Utf-8")
 
-        open(Path("build").joinpath("feed.xml"), "w").write(xml)
+        open(Path("build").joinpath("feed.xml"), "wb").write(xml)
 
     build_index(settings, front_page_galleries_cover, templates)
 
diff --git a/prosopopee/themes/exposure/templates/footer.html b/prosopopee/themes/exposure/templates/footer.html
index 295d26a..3503718 100644
--- a/prosopopee/themes/exposure/templates/footer.html
+++ b/prosopopee/themes/exposure/templates/footer.html
@@ -5,6 +5,9 @@
 {% set licence_url = settings.licence.url %}
 {% set licence_name = settings.licence.name %}
 {% endif %}
+{% if settings.custom_js %}
+<script type="text/javascript" src="../static/js/custom.js" charset="utf-8"></script>
+{% endif %}
 <footer>
   <p>Generated using <a href="https://github.com/psycojoker/prosopopee">Prosopopée</a> · content under <a href="{{ licence_url }}">{{ licence_name }}</a> · atom logo by <a href="https://thenounproject.com/jjjon/">Jonathan Li</a> under <a href="https://creativecommons.org/licenses/by/3.0/">CC-BY</a></p>
 </footer>
diff --git a/prosopopee/themes/exposure/templates/gallery-index.html b/prosopopee/themes/exposure/templates/gallery-index.html
index 1f5086c..0c57f0b 100644
--- a/prosopopee/themes/exposure/templates/gallery-index.html
+++ b/prosopopee/themes/exposure/templates/gallery-index.html
@@ -12,6 +12,9 @@
     {% if gallery.audio_enabled %}
     <link type="text/css" rel="stylesheet" href="../static/css/mediaelementplayer.css"  media="screen,projection"/>
     {% endif %}
+    {% if settings.custom_css %}
+    <link type="text/css" rel="stylesheet" href="../static/css/custom.css"  media="screen,projection"/>
+    {% endif %}
     <!--Let browser know website is optimized for mobile-->
     <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
     {% if gallery.description %}
diff --git a/prosopopee/themes/exposure/templates/index.html b/prosopopee/themes/exposure/templates/index.html
index 74409a4..7037eb5 100644
--- a/prosopopee/themes/exposure/templates/index.html
+++ b/prosopopee/themes/exposure/templates/index.html
@@ -3,6 +3,9 @@
 {% block css %}
 <link type="text/css" rel="stylesheet" href="static/css/fonts.css"  media="screen,projection"/>
 <link type="text/css" rel="stylesheet" href="static/css/style.css"  media="screen,projection"/>
+{% if settings.custom_css %}
+<link type="text/css" rel="stylesheet" href="static/css/custom.css"  media="screen,projection"/>
+{% endif %}
 {% endblock %}
 
 {% block logo %}
diff --git a/requirements.txt b/requirements.txt
index 1f92f2e..b067f11 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,5 @@
 jinja2
-pyyaml
 path.py
 docopt
+ruamel.yaml
+future

From 47cb16d931f2c0fa7420364ecca7cc68b2e531de Mon Sep 17 00:00:00 2001
From: Adrien Beudin <beudbeud@beudibox.fr>
Date: Wed, 12 Jul 2017 13:39:45 +0200
Subject: [PATCH 09/12] fix cache in python3

---
 prosopopee/cache.py      | 5 ++---
 prosopopee/prosopopee.py | 1 +
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/prosopopee/cache.py b/prosopopee/cache.py
index 6f4528c..48c94a6 100644
--- a/prosopopee/cache.py
+++ b/prosopopee/cache.py
@@ -53,8 +53,7 @@ class Cache(object):
     def cache_picture(self, source, target, options):
         self.cache[target] = {"size": os.path.getsize(source), "options": remove_superficial_options(options)}
 
-    def __del__(self):
-        self.json.dump(self.cache, open(self.cache_file_path, "wb"))
-
+    def cache_dump(self):
+        self.json.dump(self.cache, open(self.cache_file_path, "w"))
 
 CACHE = Cache(json=json)
diff --git a/prosopopee/prosopopee.py b/prosopopee/prosopopee.py
index b482751..9b00ee1 100644
--- a/prosopopee/prosopopee.py
+++ b/prosopopee/prosopopee.py
@@ -601,6 +601,7 @@ def main():
         open(Path("build").joinpath("feed.xml"), "wb").write(xml)
 
     build_index(settings, front_page_galleries_cover, templates)
+    CACHE.cache_dump()
 
 
 if __name__ == '__main__':

From 01a8a51365ddd1c1645f7026534f985c4f1bbc20 Mon Sep 17 00:00:00 2001
From: Adrien Beudin <beudbeud@beudibox.fr>
Date: Thu, 13 Jul 2017 17:43:00 +0200
Subject: [PATCH 10/12] update docs

---
 docs/changelog.rst |  5 +++++
 docs/theme.rst     | 24 ++++++++++++++++++++++++
 2 files changed, 29 insertions(+)
 create mode 100644 docs/theme.rst

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 5dd5bbe..5548478 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,6 +1,11 @@
 Changelog
 =========
 
+0.6
+ 
+ * Compatibility python 2 and 3
+ * Possibility to add custom css and js 
+
 0.5 (2017-06-04)
 
  * Add audio HTML5 player https://prosopopee.readthedocs.org/en/latest/sections.html#audio by beudbeud
diff --git a/docs/theme.rst b/docs/theme.rst
new file mode 100644
index 0000000..88dd339
--- /dev/null
+++ b/docs/theme.rst
@@ -0,0 +1,24 @@
+Theming
+=======
+
+Custom css and js
+-----------------
+
+You can add easily css code and js code. You need create custom.css or custom.js
+in root directory.
+
+Override template
+-----------------
+
+If you wanna override template, you need create a "templates" directory and create your own template.
+
+* home page : index.html
+* gallery page: gallery-index.html
+
+And for override sections you need create file in "templates/sections".
+
+
+Create theme
+------------
+
+TODO

From b1175d3115c676d2c9b901d5770d117eb96808d1 Mon Sep 17 00:00:00 2001
From: Adrien Beudin <beudbeud@beudibox.fr>
Date: Fri, 14 Jul 2017 14:28:44 +0200
Subject: [PATCH 11/12] update version

---
 docs/changelog.rst              | 4 ++--
 docs/index.rst                  | 1 +
 docs/{theme.rst => theming.rst} | 0
 setup.py                        | 4 ++--
 4 files changed, 5 insertions(+), 4 deletions(-)
 rename docs/{theme.rst => theming.rst} (100%)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 5548478..5cea446 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,10 +1,10 @@
 Changelog
 =========
 
-0.6
+0.6 (2017-07-14)
  
  * Compatibility python 2 and 3
- * Possibility to add custom css and js 
+ * Possibility to add custom css and js https://prosopopee.readthedocs.org/en/latest/
 
 0.5 (2017-06-04)
 
diff --git a/docs/index.rst b/docs/index.rst
index 0f6152c..6b5842d 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -46,5 +46,6 @@ Documentation
    sections
    example
    build
+   theming
    authors
    changelog
diff --git a/docs/theme.rst b/docs/theming.rst
similarity index 100%
rename from docs/theme.rst
rename to docs/theming.rst
diff --git a/setup.py b/setup.py
index 276e03d..001aefd 100644
--- a/setup.py
+++ b/setup.py
@@ -12,8 +12,8 @@ except ImportError:
 
 
 setup(name='prosopopee',
-      version='0.5',
-      description='exposure.co clone in a static web generating tool',
+      version='0.6',
+      description='A static website generator that allows you to tell a story with your pictures',
       author='Laurent Peuch',
       long_description=read_md('README.md') + "\n\n\n" + open('docs/changelog.rst').read(),
       author_email='cortex@worlddomination.be',

From fa21e82fe178723a42b370f1bb5c890586d5fd1d Mon Sep 17 00:00:00 2001
From: Adrien Beudin <beudbeud@beudibox.fr>
Date: Fri, 14 Jul 2017 14:32:22 +0200
Subject: [PATCH 12/12] update changelog

---
 docs/changelog.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 5cea446..aaf3f75 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -4,7 +4,7 @@ Changelog
 0.6 (2017-07-14)
  
  * Compatibility python 2 and 3
- * Possibility to add custom css and js https://prosopopee.readthedocs.org/en/latest/
+ * Possibility to add custom css and js http://prosopopee.readthedocs.io/en/latest/theming.html
 
 0.5 (2017-06-04)