encryptType no longer set when encryption not used

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()

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)

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):