From dd87ad899921be435846088a8146926801e02a17 Mon Sep 17 00:00:00 2001
From: Kevin Froman <beardog@firemail.cc>
Date: Tue, 27 Aug 2019 03:47:22 -0500
Subject: [PATCH] encryptType no longer set when encryption not used

---
 onionr/onionrblocks/insert.py                | 5 +++--
 onionr/onionrutils/blockmetadata/fromdata.py | 5 -----
 onionr/utils/createdirs.py                   | 1 +
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/onionr/onionrblocks/insert.py b/onionr/onionrblocks/insert.py
index 79d212d2..5ea31e88 100644
--- a/onionr/onionrblocks/insert.py
+++ b/onionr/onionrblocks/insert.py
@@ -53,10 +53,11 @@ def insert_block(data, header='txt', sign=False, encryptType='', symKey='', asym
 
     meta['type'] = str(header)
 
-    if encryptType in ('asym', 'sym', ''):
+    if encryptType in ('asym', 'sym'):
         metadata['encryptType'] = encryptType
     else:
-        raise onionrexceptions.InvalidMetadata('encryptType must be asym or sym, or blank')
+        if not encryptType in ('', None):
+            raise onionrexceptions.InvalidMetadata('encryptType must be asym or sym, or blank')
 
     try:
         data = data.encode()
diff --git a/onionr/onionrutils/blockmetadata/fromdata.py b/onionr/onionrutils/blockmetadata/fromdata.py
index 5ffcf26a..3ab5b6ab 100644
--- a/onionr/onionrutils/blockmetadata/fromdata.py
+++ b/onionr/onionrutils/blockmetadata/fromdata.py
@@ -40,10 +40,5 @@ def get_block_metadata_from_data(block_data):
     else:
         data = block_data[block_data.find(b'\n'):].decode()
 
-        if not metadata['encryptType'] in ('asym', 'sym'):
-            try:
-                meta = json.loads(metadata['meta'])
-            except KeyError:
-                pass
         meta = metadata['meta']
     return (metadata, meta, data)
diff --git a/onionr/utils/createdirs.py b/onionr/utils/createdirs.py
index f32f0993..b0b00d63 100644
--- a/onionr/utils/createdirs.py
+++ b/onionr/utils/createdirs.py
@@ -23,6 +23,7 @@ import dbcreator, filepaths
 home = identifyhome.identify_home()
 
 def create_dirs():
+    """Creates onionr data-related directories in order of the hardcoded list below"""
     gen_dirs = [home, filepaths.block_data_location, filepaths.contacts_location, filepaths.export_location]
     for path in gen_dirs:
         if not os.path.exists(path):