From 639ac237e378a2cf7e96e2db5c7b0361e59864a5 Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Fri, 28 Aug 2020 13:49:43 +0200
Subject: [PATCH] Replace Python globbing library.

This was motivated by the need to recurse down paths.
---
 bin/import_final_p111.py | 6 +++---
 bin/import_final_p190.py | 6 +++---
 bin/import_raw_p111.py   | 6 +++---
 bin/import_raw_p190.py   | 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/bin/import_final_p111.py b/bin/import_final_p111.py
index 7df8254..30142a4 100755
--- a/bin/import_final_p111.py
+++ b/bin/import_final_p111.py
@@ -9,7 +9,7 @@ database.
 """
 
 import os
-from glob import glob
+import pathlib
 import re
 import configuration
 import p111
@@ -43,8 +43,8 @@ if __name__ == '__main__':
 			print(f"Path prefix: {fileprefix}")
 
 			for globspec in final_p111["globs"]:
-				fullglob = os.path.join(fileprefix, globspec)
-				for filepath in glob(fullglob):
+				for filepath in pathlib.Path(fileprefix).glob(globspec):
+					filepath = str(filepath)
 					print(f"Found {filepath}")
 
 					if not db.file_in_db(filepath):
diff --git a/bin/import_final_p190.py b/bin/import_final_p190.py
index a75fb5a..8a7475a 100755
--- a/bin/import_final_p190.py
+++ b/bin/import_final_p190.py
@@ -9,7 +9,7 @@ database.
 """
 
 import os
-from glob import glob
+import pathlib
 import re
 import configuration
 import p190
@@ -43,8 +43,8 @@ if __name__ == '__main__':
 			print(f"Path prefix: {fileprefix}")
 
 			for globspec in final_p190["globs"]:
-				fullglob = os.path.join(fileprefix, globspec)
-				for filepath in glob(fullglob):
+				for filepath in pathlib.Path(fileprefix).glob(globspec):
+					filepath = str(filepath)
 					print(f"Found {filepath}")
 
 					if not db.file_in_db(filepath):
diff --git a/bin/import_raw_p111.py b/bin/import_raw_p111.py
index 0e8358f..9abc494 100755
--- a/bin/import_raw_p111.py
+++ b/bin/import_raw_p111.py
@@ -9,7 +9,7 @@ database.
 """
 
 import os
-from glob import glob
+import pathlib
 import re
 import configuration
 import p111
@@ -43,8 +43,8 @@ if __name__ == '__main__':
 			print(f"Path prefix: {fileprefix}")
 
 			for globspec in raw_p111["globs"]:
-				fullglob = os.path.join(fileprefix, globspec)
-				for filepath in glob(fullglob):
+				for filepath in pathlib.Path(fileprefix).glob(globspec):
+					filepath = str(filepath)
 					print(f"Found {filepath}")
 
 					if not db.file_in_db(filepath):
diff --git a/bin/import_raw_p190.py b/bin/import_raw_p190.py
index 1c4d737..7665fef 100755
--- a/bin/import_raw_p190.py
+++ b/bin/import_raw_p190.py
@@ -9,7 +9,7 @@ database.
 """
 
 import os
-from glob import glob
+import pathlib
 import re
 import configuration
 import p190
@@ -43,8 +43,8 @@ if __name__ == '__main__':
 			print(f"Path prefix: {fileprefix}")
 
 			for globspec in raw_p190["globs"]:
-				fullglob = os.path.join(fileprefix, globspec)
-				for filepath in glob(fullglob):
+				for filepath in pathlib.Path(fileprefix).glob(globspec):
+					filepath = str(filepath)
 					print(f"Found {filepath}")
 
 					if not db.file_in_db(filepath):