opengnsys
/
oggit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't fail on empty lines in metadata, just skip them

ticket-769
Vadim vtroshchinskiy 2024-10-09 09:28:04 +02:00
parent e0ff8404b5
commit 845ed16fad
1 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
gitlib/gitlib.py
View File

@ -1122,6 +1122,10 @@ class OpengnsysGitLibrary:
self.logger.info("Processing renamed.jsonl") self.logger.info("Processing renamed.jsonl")
with open(os.path.join(meta_dir, "renamed.jsonl"), "r", encoding='utf-8') as gitignores_file: with open(os.path.join(meta_dir, "renamed.jsonl"), "r", encoding='utf-8') as gitignores_file:
for line in gitignores_file: for line in gitignores_file:
if line.isspace():
self.logger.debug("Empty line, skipping")
continue
#self.logger.debug(f"Line: {line}") #self.logger.debug(f"Line: {line}")
renamed_data = json.loads(line) renamed_data = json.loads(line)
orig_file = renamed_data['path'] orig_file = renamed_data['path']
@ -1147,6 +1151,10 @@ class OpengnsysGitLibrary:
self.logger.info("Processing empty_directories.jsonl") self.logger.info("Processing empty_directories.jsonl")
with open(os.path.join(meta_dir, "empty_directories.jsonl"), "r", encoding='utf-8') as empties_file: with open(os.path.join(meta_dir, "empty_directories.jsonl"), "r", encoding='utf-8') as empties_file:
for line in empties_file: for line in empties_file:
if line.isspace():
self.logger.debug("Empty line, skipping")
continue
empties_data = json.loads(line) empties_data = json.loads(line)
empty_dir = empties_data['dir'] empty_dir = empties_data['dir']
@ -1168,6 +1176,10 @@ class OpengnsysGitLibrary:
self.logger.info("Processing unix_permissions.jsonl") self.logger.info("Processing unix_permissions.jsonl")
with open(os.path.join(meta_dir, "unix_permissions.jsonl"), "r", encoding='utf-8') as acls_file: with open(os.path.join(meta_dir, "unix_permissions.jsonl"), "r", encoding='utf-8') as acls_file:
for line in acls_file: for line in acls_file:
if line.isspace():
self.logger.debug("Empty line, skipping")
continue
perms_data = json.loads(line) perms_data = json.loads(line)
#self.logger.debug(f"Data: {acls_data}") #self.logger.debug(f"Data: {acls_data}")
@ -1194,6 +1206,9 @@ class OpengnsysGitLibrary:
self.logger.info("Processing acls.jsonl") self.logger.info("Processing acls.jsonl")
with open(os.path.join(meta_dir, "acls.jsonl"), "r", encoding='utf-8') as acls_file: with open(os.path.join(meta_dir, "acls.jsonl"), "r", encoding='utf-8') as acls_file:
for line in acls_file: for line in acls_file:
if line.isspace():
self.logger.debug("Empty line, skipping")
continue
# docs: https://pylibacl.k1024.org/module.html#posix1e.ACL.to_any_text # docs: https://pylibacl.k1024.org/module.html#posix1e.ACL.to_any_text
@ -1219,6 +1234,10 @@ class OpengnsysGitLibrary:
self.logger.info("Processing xattrs.jsonl") self.logger.info("Processing xattrs.jsonl")
with open(os.path.join(meta_dir, "xattrs.jsonl"), "r", encoding='utf-8') as xattrs_file: with open(os.path.join(meta_dir, "xattrs.jsonl"), "r", encoding='utf-8') as xattrs_file:
for line in xattrs_file: for line in xattrs_file:
if line.isspace():
self.logger.debug("Empty line, skipping")
continue
xattrs_data = json.loads(line) xattrs_data = json.loads(line)
xattrs_file = xattrs_data['file'] xattrs_file = xattrs_data['file']
@ -1232,6 +1251,10 @@ class OpengnsysGitLibrary:
self.logger.info("Processing special_files.jsonl") self.logger.info("Processing special_files.jsonl")
with open(os.path.join(meta_dir, "special_files.jsonl"), "r", encoding='utf-8') as specials_file: with open(os.path.join(meta_dir, "special_files.jsonl"), "r", encoding='utf-8') as specials_file:
for line in specials_file: for line in specials_file:
if line.isspace():
self.logger.debug("Empty line, skipping")
continue
#self.logger.debug(f"Line: {line}") #self.logger.debug(f"Line: {line}")
data = json.loads(line) data = json.loads(line)
filename = data['file'] filename = data['file']