[fix] change

Author: Its-Just-Nans

log.md

@@ -0,0 +1,3 @@
+# Logs
+
+- 08/12 - Add option to pass a ̀`list` as `schema`

main.py

@@ -56,7 +56,7 @@ def createFieldsBinding(schemaObject, startPath=""):
                 else:
                     path = '{}{}{}'.format(
                         startPath, options["privateSeparator"], oneElement)
-                if isinstance(schemaObject, dict) and (isinstance(schemaObject[oneElement], dict) or isinstance(schemaObject[oneElement], list)):
+                if isinstance(schemaObject[oneElement], dict) or isinstance(schemaObject[oneElement], list):
                     if isinstance(schemaObject[oneElement], list):
                         bindings.append({
                             "name": oneElement,
@@ -131,28 +131,41 @@ def parseLine(line):
                     long = len(allPath)
                     for count in range(0, long):
                         nextPath = allPath[count]
+                        if isinstance(goodPlace, list):
+                            nextPathInt = int(nextPath)
                         if count == (long - 1):
                             if not isinstance(goodPlace, list):
                                 goodPlace[nextPath] = ""
                         else:
                             if nextPath not in goodPlace:
-                                goodPlace[nextPath] = {}
-                            goodPlace = goodPlace[nextPath]
+                                if isinstance(goodPlace, list):
+                                    goodPlace.insert(nextPathInt, {})
+                                else:
+                                    goodPlace[nextPath] = {}
+                            if isinstance(goodPlace, list):
+                                goodPlace = goodPlace[nextPathInt]
+                            else:
+                                goodPlace = goodPlace[nextPath]
                     if isinstance(goodPlace, list):
                         goodPlace.append(currentValue)
                     elif isinstance(goodPlace, dict):
                         goodPlace[onePathName] = currentValue
                     else:
                         goodPlace = currentValue
                 else:
-                    obj[onePathRow] = currentValue
+                    if isinstance(obj, list):
+                        place = int(onePathRow)
+                        obj.insert(place, currentValue)
+                    elif isinstance(obj, dict):
+                        obj[onePathRow] = currentValue
             return obj
 
         def parsefirstLine():
             global firstLine
             if isinstance(options["overrideFirstLine"], list):
                 firstLine = options["overrideFirstLine"]
-            if isinstance(schema, dict):
+            if schema != None:
+                # None is default value for schema
                 cols = createFieldsBinding(schema)
                 if options["debug"]:
                     print("BINDINGS:", JSONstringify(cols))

test.py

@@ -1,4 +1,5 @@
 from main import parseFile
+from json import dumps as JSONstringify
 
 schema = {
     "test1": [
@@ -14,6 +15,14 @@
     "test2": "string"
 }
 
+schema3 = [
+    "test1",
+    {
+        "test4": "string",
+    },
+    "test2"
+]
+
 
 def test(parsedLine=[], a=[]):
     return None
@@ -23,6 +32,6 @@ def test(parsedLine=[], a=[]):
     "lineCallBack": test
 }
 
-res = parseFile("csv.txt", schema, options)
+res = parseFile("csv.txt", {}, options)
 
-print(res)
+print(JSONstringify(res, indent=4))