Merge pull request #12 from FOSSEE/data_convertor

Data convertor

.gitignore

@@ -6,6 +6,9 @@ pyvnt.egg-info
 manual_tests/
 manual_debug/
 
+linux64GccDPInt32Opt/
+bin/
+
 **/__pycache__/*
 .vscode
 pyrightconfig.json
@@ -20,6 +23,8 @@ __pycache__/
 
 # C extensions
 *.so
+*.dep
+*.o
 
 # Distribution / packaging
 .Python

MANIFEST.in

@@ -0,0 +1,4 @@
+include pyvnt/Converter/Reader/cpp_src/dictionaryFile/lib/dictionaryFile.so
+include pyvnt/Converter/Reader/cpp_src/dictionaryFileChecker/bin/dictionaryFileChecker.so
+include pyvnt/Converter/Reader/cpp_src/dictionaryFileIterator/lib/dictionaryFileIterator.so
+include pyvnt/Converter/Reader/cpp_src/libOpenFOAM.so

pyvnt/Converter/Reader/__init__.py

@@ -0,0 +1,68 @@
+
+import os
+from pyvnt.Container.node import Node_C
+from .dictionaryFileIterator import DictionaryFileIterator
+from .dictionaryFile import DictionaryFile
+
+
+def read(filepath : str, verifyFile: bool = True) -> Node_C:
+  '''
+  Reads dictionary file from the given filepath and returns a node tree 
+  representation of it.
+  '''  
+  file = DictionaryFile(filepath, verifyFile)
+  itr = DictionaryFileIterator(file)
+
+  path = file.filepath
+
+  root_name = path.split('/')[-1]
+  # print(root_name)
+
+  root = _createTree(root_name, itr)
+  itr.close()
+  file.close()
+
+  return root
+
+
+def _createTree(parentName: str, itr: DictionaryFileIterator) -> Node_C:
+  '''
+  Recursively traverse the openfoam's dictionary data structure and create the
+  node-tree structure.
+  '''
+  data = {}
+  while itr.hasEntry():
+    key = itr.getCurrentEntryKeyword()
+    value = None
+
+    # print(f"{key}, {itr.isCurrentEntryList()}")
+
+    if itr.isCurrentEntryDict():
+      # print(key)
+      itr.stepIn()
+      value = _createTree(key, itr)
+      itr.stepOut()
+    else:
+      value = itr.getKeyData()
+      # print(value)
+
+    print(key)
+    # print(f"{key}, {type(value)}")
+    data[key] = value
+    itr.step()
+
+  # create node
+  children = [] 
+  itms = []
+
+  for key, val in data.items():
+    if isinstance(val,Node_C):
+      children.append(val)
+    else:
+      itms.append(val)
+
+  node = Node_C(parentName, None, children, *itms)
+
+  return node
+
+

pyvnt/Converter/Reader/cpp_src/dictionaryFile/Make/files

@@ -0,0 +1,4 @@
+
+dictionaryFile.C
+
+LIB = ./lib/dictionaryFile

pyvnt/Converter/Reader/cpp_src/dictionaryFile/Make/options

@@ -0,0 +1,4 @@
+
+LIB_LIBS = \
+  -L$FOAM_LIBBIN \
+  -lOpenFOAM

pyvnt/Converter/Reader/cpp_src/dictionaryFile/dictionaryFile.C

@@ -0,0 +1,48 @@
+
+#include "fileName.H"
+#include "IFstream.H"
+#include "dictionary.H"
+
+#include "dictionaryFile.H"
+#include "dictionaryFile_PythonInterface.H"
+
+
+DictionaryFile::DictionaryFile(const char* filepath)
+{
+  Foam::fileName dictPath(filepath);
+  Foam::IFstream dictFileStream(dictPath);
+  mDictPtr = new Foam::dictionary(dictFileStream);
+}
+
+DictionaryFile::~DictionaryFile()
+{
+  delete mDictPtr;
+}
+
+// void DictionaryFile::printEntry(const char* key)
+// {
+//   Foam::word keyname(key);
+//   std::cout 
+//     << "dictionaryName : " << mDictPtr->name().toAbsolute() << " "
+//     << mDictPtr->lookupEntry(keyname, false, false).keyword() 
+//     << std::endl;
+// }
+
+// API FUNCTIONS===============================================================
+void* openDictionaryFile(const char* filepath)
+{
+  DictionaryFile* dictFile = new DictionaryFile(filepath);  
+  return dictFile;
+}
+
+void closeDictionaryFile(void* dictionaryFile)
+{
+  DictionaryFile* dictFile = static_cast<DictionaryFile*>(dictionaryFile);
+  delete dictFile;
+}
+
+// void printDictionary(void* dictionaryFile)
+// {
+//   DictionaryFile* dictFile = static_cast<DictionaryFile*>(dictionaryFile);
+//   dictFile->printEntry("key1");
+// }

pyvnt/Converter/Reader/cpp_src/dictionaryFile/dictionaryFile.H

@@ -0,0 +1,15 @@
+
+#pragma once
+
+
+class DictionaryFile
+{
+public:
+  Foam::dictionary* mDictPtr;
+
+  DictionaryFile(const char* filepath);
+  ~DictionaryFile();
+  // void* getIterator();
+  // void printEntry(const char* key);
+};
+

pyvnt/Converter/Reader/cpp_src/dictionaryFile/dictionaryFile_PythonInterface.H

@@ -0,0 +1,14 @@
+
+#pragma once
+
+
+extern "C"
+{
+
+void* openDictionaryFile(const char* filepath);
+void closeDictionaryFile(void* dictionaryFile);  
+// void* getIterator(void* dictionaryFile);
+// void printDictionary(void* dictionaryFile);
+}
+
+

pyvnt/Converter/Reader/cpp_src/dictionaryFile/lnInclude/dictionaryFile.C

@@ -0,0 +1 @@
+../dictionaryFile.C

pyvnt/Converter/Reader/cpp_src/dictionaryFile/lnInclude/dictionaryFile.H

@@ -0,0 +1 @@
+../dictionaryFile.H

pyvnt/Converter/Reader/cpp_src/dictionaryFile/lnInclude/dictionaryFile_PythonInterface.H

@@ -0,0 +1 @@
+../dictionaryFile_PythonInterface.H

pyvnt/Converter/Reader/cpp_src/dictionaryFileChecker/Make/files

@@ -0,0 +1,4 @@
+
+dictionaryFileChecker.C
+
+EXE = ./bin/dictionaryFileChecker