davemds pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=541f04aa797fefc471f938075e7706959bf21235
commit 541f04aa797fefc471f938075e7706959bf21235
Author: Dave Andreoli <d...@gurumeditation.it>
Date: Tue Feb 27 17:48:31 2018 +0100
Pyolian: new APIs for directory scanning
eolian_directory_scan => eolian_state_directory_add
eolian_system_directory_scan => eolian_state_system_directory_add
---
src/scripts/gendoc/gendoc.py | 2 +-
src/scripts/pyolian/eolian.py | 8 ++++----
src/scripts/pyolian/eolian_lib.py | 12 ++++++------
src/scripts/pyolian/generator.py | 2 +-
src/scripts/pyolian/test_eolian.py | 4 ++--
5 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/scripts/gendoc/gendoc.py b/src/scripts/gendoc/gendoc.py
index d0fc5ebf28..359ae154eb 100755
--- a/src/scripts/gendoc/gendoc.py
+++ b/src/scripts/gendoc/gendoc.py
@@ -50,7 +50,7 @@ eolian_db = eolian.Eolian()
if not isinstance(eolian_db, eolian.Eolian):
raise(RuntimeError('Eolian, failed to create Eolian state'))
-if not eolian_db.directory_scan(SCAN_FOLDER):
+if not eolian_db.directory_add(SCAN_FOLDER):
raise(RuntimeError('Eolian, failed to scan source directory'))
if not eolian_db.all_eot_files_parse():
diff --git a/src/scripts/pyolian/eolian.py b/src/scripts/pyolian/eolian.py
index 37a0568600..23f4f8ac2d 100644
--- a/src/scripts/pyolian/eolian.py
+++ b/src/scripts/pyolian/eolian.py
@@ -462,11 +462,11 @@ class Eolian(Eolian_Unit):
def all_eot_files(self):
return Iterator(_str_to_py, lib.eolian_all_eot_files_get(self._obj))
- def directory_scan(self, dir_path):
- return bool(lib.eolian_directory_scan(self._obj,
_str_to_bytes(dir_path)))
+ def directory_add(self, dir_path):
+ return bool(lib.eolian_state_directory_add(self._obj,
_str_to_bytes(dir_path)))
- def system_directory_scan(self):
- return bool(lib.eolian_system_directory_scan(self._obj))
+ def system_directory_add(self):
+ return bool(lib.eolian_state_system_directory_add(self._obj))
def all_eo_files_parse(self):
return bool(lib.eolian_all_eo_files_parse(self._obj))
diff --git a/src/scripts/pyolian/eolian_lib.py
b/src/scripts/pyolian/eolian_lib.py
index 2170d29c43..f7e7c963df 100644
--- a/src/scripts/pyolian/eolian_lib.py
+++ b/src/scripts/pyolian/eolian_lib.py
@@ -67,13 +67,13 @@ lib.eolian_all_eo_files_get.restype = c_void_p
lib.eolian_all_eot_files_get.argtypes = [c_void_p,]
lib.eolian_all_eot_files_get.restype = c_void_p
-# EAPI Eina_Bool eolian_directory_scan(Eolian_State *state, const char *dir);
-lib.eolian_directory_scan.argtypes = [c_void_p, c_char_p]
-lib.eolian_directory_scan.restype = c_bool
+# EAPI Eina_Bool eolian_state_directory_add(Eolian_State *state, const char
*dir);
+lib.eolian_state_directory_add.argtypes = [c_void_p, c_char_p]
+lib.eolian_state_directory_add.restype = c_bool
-# EAPI Eina_Bool eolian_system_directory_scan(Eolian_State *state);
-lib.eolian_system_directory_scan.argtypes = [c_void_p,]
-lib.eolian_system_directory_scan.restype = c_bool
+# EAPI Eina_Bool eolian_state_system_directory_add(Eolian_State *state);
+lib.eolian_state_system_directory_add.argtypes = [c_void_p,]
+lib.eolian_state_system_directory_add.restype = c_bool
# EAPI Eina_Bool eolian_all_eo_files_parse(Eolian_State *state);
lib.eolian_all_eo_files_parse.argtypes = [c_void_p,]
diff --git a/src/scripts/pyolian/generator.py b/src/scripts/pyolian/generator.py
index c50eead66a..6a78da86d9 100755
--- a/src/scripts/pyolian/generator.py
+++ b/src/scripts/pyolian/generator.py
@@ -61,7 +61,7 @@ eolian_db = eolian.Eolian()
if not isinstance(eolian_db, eolian.Eolian):
raise(RuntimeError('Eolian, failed to create Eolian state'))
-if not eolian_db.directory_scan(SCAN_FOLDER):
+if not eolian_db.directory_add(SCAN_FOLDER):
raise(RuntimeError('Eolian, failed to scan source directory'))
if not eolian_db.all_eot_files_parse():
diff --git a/src/scripts/pyolian/test_eolian.py
b/src/scripts/pyolian/test_eolian.py
index bdff35dc9e..59f949ca55 100755
--- a/src/scripts/pyolian/test_eolian.py
+++ b/src/scripts/pyolian/test_eolian.py
@@ -576,11 +576,11 @@ if __name__ == '__main__':
raise(RuntimeError('Eolian, failed to create Eolian state'))
# eolian system scan (BROKEN)
- # if not eolian_db.system_directory_scan():
+ # if not eolian_db.system_directory_add():
# raise(RuntimeError('Eolian, failed to scan system directories'))
# eolian source tree scan
- if not eolian_db.directory_scan(SCAN_FOLDER):
+ if not eolian_db.directory_add(SCAN_FOLDER):
raise(RuntimeError('Eolian, failed to scan source directory'))
# Parse all known eo files
--
