milka64/doc_infra
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Activity Actions

fix json version
All checks were successful
/ test (push) Successful in 23s
Details

Browse source
This commit is contained in:
Michaël Ricart 2025-02-27 11:40:56 +01:00
parent 933f7d8d00
commit 42a3284a05
2 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
parsers/base.py
View file

@ -2,6 +2,7 @@
import sys import sys
from os import listdir from os import listdir
from os.path import isfile, join from os.path import isfile, join
from json import loads
from debian import parse_debian from debian import parse_debian
from freebsd import parse_freebsd from freebsd import parse_freebsd
from freebox import parse_freebox from freebox import parse_freebox
@ -9,10 +10,16 @@ from jinja2 import Environment, FileSystemLoader
def find_os(content): def find_os(content):
version = content.split("###### VERSION ######")[-1] version = content.split("###### VERSION ######")[-1]
jcontent = {}
try:
jcontent = loads(version)
except:
osystem = [line.split("=")[-1] for line in version.splitlines() if line.startswith("ID=")] osystem = [line.split("=")[-1] for line in version.splitlines() if line.startswith("ID=")]
if osystem: if osystem:
return osystem[0] return osystem[0]
else: print(content)
if "ID" in jcontent:
return jcontent["ID"]
return "freebox" return "freebox"

3
parsers/freebsd.py
View file

@ -1,4 +1,5 @@
#!/bin/env python3 #!/bin/env python3
from json import loads
def parse_ip(block): def parse_ip(block):
result = {} result = {}
@ -31,7 +32,7 @@ def parse_freebsd(content):
from pprint import pprint from pprint import pprint
#pprint(result) #pprint(result)
result["ip"] = parse_ip(result["interfaces"]) result["ip"] = parse_ip(result["interfaces"])
result["os"] = parse_os(result["version"]) result["os"] = loads(result["version"])
return result return result
if __name__ == "__main__": if __name__ == "__main__":