Fix line endings

sigal/plugins/encrypt/static/decrypt.js

@@ -598,4 +598,4 @@ Promise.timeout = function(cb_or_pm, timeout) {
             }, timeout);
         })
     ]);
-}
+}

sigal/plugins/encrypt/static/keycheck.txt

@@ -1 +1 @@
-This file will be decrypted to test if the password supplied by the user is correct.
+This file will be decrypted to test if the password supplied by the user is correct.

sigal/plugins/encrypt/static/sw.js

@@ -1,7 +1,7 @@
-"use strict"
-importScripts("static/decrypt.js");
-oninstall = Decryptor.onServiceWorkerInstall;
-onactivate = Decryptor.onServiceWorkerActivate;
-onfetch = Decryptor.onServiceWorkerFetch; 
-onmessage = Decryptor.onServiceWorkerMesssage;
-Decryptor.init({});
+"use strict"
+importScripts("static/decrypt.js");
+oninstall = Decryptor.onServiceWorkerInstall;
+onactivate = Decryptor.onServiceWorkerActivate;
+onfetch = Decryptor.onServiceWorkerFetch;
+onmessage = Decryptor.onServiceWorkerMesssage;
+Decryptor.init({});

tests/test_encrypt.py

@@ -1,84 +1,84 @@
-import os
-import pickle
-from io import BytesIO
-
-from sigal import init_plugins
-from sigal.gallery import Gallery
-from sigal.plugins.encrypt import endec
-from sigal.plugins.encrypt.encrypt import cache_key
-
-CURRENT_DIR = os.path.dirname(__file__)
-
-
-def get_key_tag(settings):
-    options = settings["encrypt_options"]
-    key = endec.kdf_gen_key(
-        options["password"].encode("utf-8"),
-        options["kdf_salt"].encode("utf-8"),
-        options["kdf_iters"]
-    )
-    tag = options["gcm_tag"].encode("utf-8")
-    return (key, tag)
-
-def test_encrypt(settings, tmpdir, disconnect_signals):
-    settings['destination'] = str(tmpdir)
-    if "sigal.plugins.encrypt" not in settings["plugins"]:
-        settings['plugins'] += ["sigal.plugins.encrypt"]
-
-    settings['encrypt_options'] = {
-        'password': 'password',
-        'ask_password': True,
-        'gcm_tag': 'AuTheNTiCatIoNtAG',
-        'kdf_salt': 'saltysaltsweetysweet',
-        'kdf_iters': 10000,
-        'encrypt_symlinked_originals': False
-    }
-
-    init_plugins(settings)
-    gal = Gallery(settings)
-    gal.build()
-
-    # check the encrypt cache exists
-    cachePath = os.path.join(settings["destination"], ".encryptCache")
-    assert os.path.isfile(cachePath)
-
-    encryptCache = None
-    with open(cachePath, "rb") as cacheFile:
-        encryptCache = pickle.load(cacheFile)
-    assert isinstance(encryptCache, dict)
-
-    testAlbum = gal.albums["encryptTest"]
-    key, tag = get_key_tag(settings)
-    
-    for media in testAlbum:
-        # check if sizes are stored in cache
-        assert cache_key(media) in encryptCache
-        assert "size" in encryptCache[cache_key(media)]
-        assert "thumb_size" in encryptCache[cache_key(media)]
-        assert "encrypted" in encryptCache[cache_key(media)]
-
-        encryptedImages = [
-            media.dst_path, 
-            media.thumb_path
-        ]
-        if settings["keep_orig"]:
-            encryptedImages.append(os.path.join(settings["destination"],
-                                    media.path, media.big))
-
-        # check if images are encrypted by trying to decrypt
-        for image in encryptedImages:
-            with open(image, "rb") as infile:
-                with BytesIO() as outfile:
-                    endec.decrypt(key, infile, outfile, tag)
-
-    # check static files have been copied
-    static = os.path.join(settings["destination"], 'static')
-    assert os.path.isfile(os.path.join(static, "decrypt.js"))
-    assert os.path.isfile(os.path.join(static, "keycheck.txt"))
-    assert os.path.isfile(os.path.join(settings["destination"], "sw.js"))
-
-    # check keycheck file
-    with open(os.path.join(settings["destination"], 
-                            'static', "keycheck.txt"), "rb") as infile:
-        with BytesIO() as outfile:
-            endec.decrypt(key, infile, outfile, tag)
+import os
+import pickle
+from io import BytesIO
+
+from sigal import init_plugins
+from sigal.gallery import Gallery
+from sigal.plugins.encrypt import endec
+from sigal.plugins.encrypt.encrypt import cache_key
+
+CURRENT_DIR = os.path.dirname(__file__)
+
+
+def get_key_tag(settings):
+    options = settings["encrypt_options"]
+    key = endec.kdf_gen_key(
+        options["password"].encode("utf-8"),
+        options["kdf_salt"].encode("utf-8"),
+        options["kdf_iters"]
+    )
+    tag = options["gcm_tag"].encode("utf-8")
+    return (key, tag)
+
+def test_encrypt(settings, tmpdir, disconnect_signals):
+    settings['destination'] = str(tmpdir)
+    if "sigal.plugins.encrypt" not in settings["plugins"]:
+        settings['plugins'] += ["sigal.plugins.encrypt"]
+
+    settings['encrypt_options'] = {
+        'password': 'password',
+        'ask_password': True,
+        'gcm_tag': 'AuTheNTiCatIoNtAG',
+        'kdf_salt': 'saltysaltsweetysweet',
+        'kdf_iters': 10000,
+        'encrypt_symlinked_originals': False
+    }
+
+    init_plugins(settings)
+    gal = Gallery(settings)
+    gal.build()
+
+    # check the encrypt cache exists
+    cachePath = os.path.join(settings["destination"], ".encryptCache")
+    assert os.path.isfile(cachePath)
+
+    encryptCache = None
+    with open(cachePath, "rb") as cacheFile:
+        encryptCache = pickle.load(cacheFile)
+    assert isinstance(encryptCache, dict)
+
+    testAlbum = gal.albums["encryptTest"]
+    key, tag = get_key_tag(settings)
+
+    for media in testAlbum:
+        # check if sizes are stored in cache
+        assert cache_key(media) in encryptCache
+        assert "size" in encryptCache[cache_key(media)]
+        assert "thumb_size" in encryptCache[cache_key(media)]
+        assert "encrypted" in encryptCache[cache_key(media)]
+
+        encryptedImages = [
+            media.dst_path,
+            media.thumb_path
+        ]
+        if settings["keep_orig"]:
+            encryptedImages.append(os.path.join(settings["destination"],
+                                    media.path, media.big))
+
+        # check if images are encrypted by trying to decrypt
+        for image in encryptedImages:
+            with open(image, "rb") as infile:
+                with BytesIO() as outfile:
+                    endec.decrypt(key, infile, outfile, tag)
+
+    # check static files have been copied
+    static = os.path.join(settings["destination"], 'static')
+    assert os.path.isfile(os.path.join(static, "decrypt.js"))
+    assert os.path.isfile(os.path.join(static, "keycheck.txt"))
+    assert os.path.isfile(os.path.join(settings["destination"], "sw.js"))
+
+    # check keycheck file
+    with open(os.path.join(settings["destination"],
+                            'static', "keycheck.txt"), "rb") as infile:
+        with BytesIO() as outfile:
+            endec.decrypt(key, infile, outfile, tag)