From 6b10be5557ff230150e5370f9fbde554d37acbcc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexis=20M=C3=A9taireau?= <alexis@notmyidea.org>
Date: Tue, 21 Jun 2016 15:47:15 +0200
Subject: [PATCH] Add a few options to HTTrack

---
 app/index.html   |  8 ++------
 zimit/creator.py | 19 ++++++++++++++-----
 zimit/mailer.py  | 13 ++++++++++++-
 zimit/utils.py   | 12 ++++++++++++
 4 files changed, 40 insertions(+), 12 deletions(-)

diff --git a/app/index.html b/app/index.html
index d3ca141..40d91b9 100644
--- a/app/index.html
+++ b/app/index.html
@@ -46,13 +46,9 @@
   </p>
 </form>
 <p>
-  This is a <a href="http://www.openzim.org/wiki/OpenZIM">Zim</a> creator. Enter the <em>url</em> of the website you want ton turn in a zim file, a <em>title</em> and the <em>language</em> and click on <em>Create zim File</em>
-</p>
-<p>
-  If needed, you can also add a description, the name of the origanl author
-  of the content and your email if you want to be notified when the zim is
-  ready. Enjoy !
+  This is a <a href="http://www.openzim.org/wiki/OpenZIM">Zim</a> creator. Enter the <em>url</em> of the website you want ton turn in a zim file, a <em>title</em> and click on <em>Create zim File</em>
 </p>
+<p>Enjoy !</p>
 </div>
   <script src="./assets/alertify.js"></script>
   <script type="text/javascript">
diff --git a/zimit/creator.py b/zimit/creator.py
index ccd807d..9646892 100644
--- a/zimit/creator.py
+++ b/zimit/creator.py
@@ -23,12 +23,13 @@ class ZimCreator(object):
 
     def __init__(self, zimwriterfs_bin, output_location,
                  author=DEFAULT_AUTHOR, httrack_bin=HTTRACK_BIN,
-                 log_file=None):
+                 log_file=None, max_download_speed=25000):
         self.output_location = output_location
         self.author = author
         self.zimwriterfs_bin = zimwriterfs_bin
         self.httrack_bin = httrack_bin
         self.log_file = log_file
+        self.max_download_speed = max_download_speed
 
         utils.ensure_paths_exists(
             self.zimwriterfs_bin,
@@ -48,8 +49,15 @@ class ZimCreator(object):
         :param destination_path:
             The absolute location of a folder where the files will be written.
         """
-        options = (self.httrack_bin, destination_path, url)
-        self._spawn("%s --path %s %s" % options)
+        options = {
+            "path": destination_path,
+            "max-rate": self.max_download_speed,
+            "keep-alive": None,
+            "robots": 0,
+            "near": None,
+        }
+
+        self._spawn(utils.get_command(self.httrack_bin, url, **options))
 
     def prepare_website_folder(self, url, input_location):
         """Prepare the website files to make them ready to be embedded in a zim
@@ -58,10 +66,11 @@ class ZimCreator(object):
         :returns:
             the absolute location of the website folder, ready to be embedded.
         """
-        netloc = urlparse.urlparse(url).netloc
+        netloc = urlparse.urlparse(url).netloc.replace(":", "_")
         website_folder = os.path.join(input_location, netloc)
         if not os.path.isdir(website_folder):
-            raise Exception("Unable to find the website folder!")
+            message = "Unable to find the website folder! %s" % website_folder
+            raise Exception(message)
         shutil.copy('./favicon.ico', website_folder)
         return website_folder
 
diff --git a/zimit/mailer.py b/zimit/mailer.py
index a81c1d3..4723304 100644
--- a/zimit/mailer.py
+++ b/zimit/mailer.py
@@ -21,7 +21,18 @@ class ZimReadyMessage(Message):
     def __init__(self, email, zim_link):
         subject = "[ZimIt!] Your zimfile is ready!"
 
-        bdata = "{zim_link}".format(zim_link=zim_link)
+        bdata = """
+Hi,
+
+You have asked for the creation of a zim file, and it is now ready !
+
+You can access it at the following URL:
+
+    {zim_link}
+
+Cheers,
+ZimIt.
+""".format(zim_link=zim_link)
         hdata = bdata
 
         body = Attachment(data=bdata, transfer_encoding="quoted-printable")
diff --git a/zimit/utils.py b/zimit/utils.py
index 8ecd3e3..b782824 100644
--- a/zimit/utils.py
+++ b/zimit/utils.py
@@ -21,3 +21,15 @@ def ensure_paths_exists(*paths):
         if not os.path.exists(path):
             msg = '%s does not exist.' % path
             raise OSError(msg)
+
+
+def get_command(cmd, *params, **options):
+    prepared_options = []
+    for key, value in options.items():
+        if value is None:
+            opt = "--%s" % key
+        else:
+            opt = "--%s=%s" % (key, value)
+        prepared_options.append(opt)
+
+    return " ".join((cmd, " ".join(params), " ".join(prepared_options)))