opengnsys
/
ogclone-engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refs #1099 do not import *

pull/1/head
Natalia Serrano 2024-11-05 12:54:06 +01:00
parent 637bdb9295
commit 9362ea1f0a
3 changed files with 19 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
client/lib/engine/bin/CacheLib.py
View File

@ -5,9 +5,7 @@ import shutil
import sys
import platform
from FileSystemLib import *
from SystemLib import *
from DiskLib import *
import DiskLib
print (">>>>>>>>>>>>>>>>>>>> Load ", __name__, " <<<<<<<<<<<<<<<<<<<<<<")
@ -86,7 +84,7 @@ def ogFindCache():
# Por último revisar todos los discos GPT y obtener las particiones etiquetadas como caché.
if not PART:
PART = ''
for d in ogDiskToDev():
for d in DiskLib.ogDiskToDev():
out = subprocess.run (['sgdisk', '-p', d], capture_output=True, text=True).stdout.splitlines()
for l in out:
elems = l.split (maxsplit=6)
@ -96,7 +94,7 @@ def ogFindCache():
PART += f' {d}{p}{elems[0]}'
if not PART: return
return ogDevToDisk (PART.split()[0]) # usar la 1ª partición encontrada.
return DiskLib.ogDevToDisk (PART.split()[0]) # usar la 1ª partición encontrada.
def ogFormatCache():
"""

25
client/lib/engine/bin/DiskLib.py
View File

@ -5,9 +5,8 @@ import os
import stat
from pathlib import Path
from CacheLib import *
from FileSystemLib import *
from SystemLib import *
import ogGlobals
import SystemLib
print (">>>>>>>>>>>>>>>>>>>> Load ", __name__, " <<<<<<<<<<<<<<<<<<<<<<")
@ -332,7 +331,7 @@ def ogDevToDisk(arg_dev):
elif arg_dev.startswith("PARTUUID="): cmd = ['realpath', '/dev/disk/by-partuuid/'+arg_dev[10:]]
elif arg_dev.startswith("UUID="): cmd = ['blkid', '-U', arg_dev[5:]]
if not cmd:
ogRaiseError([], ogGlobals.OG_ERR_FORMAT, arg_dev)
SystemLib.ogRaiseError([], ogGlobals.OG_ERR_FORMAT, arg_dev)
return
DEV = subprocess.run (cmd, capture_output=True, text=True).stdout.strip()
else:
@ -340,13 +339,13 @@ def ogDevToDisk(arg_dev):
DEV = arg_dev
if not os.path.exists(DEV):
ogRaiseError([], ogGlobals.OG_ERR_NOTFOUND, arg_dev)
SystemLib.ogRaiseError([], ogGlobals.OG_ERR_NOTFOUND, arg_dev)
return
# Error si no es fichero de bloques o directorio (para LVM).
m = os.stat (DEV, follow_symlinks=True).st_mode
if not stat.S_ISBLK (m) and not stat.S_ISDIR (m):
ogRaiseError([], ogGlobals.OG_ERR_NOTFOUND, arg_dev)
SystemLib.ogRaiseError([], ogGlobals.OG_ERR_NOTFOUND, arg_dev)
return
# Buscar en fichero de caché de discos.
@ -370,7 +369,7 @@ def ogDevToDisk(arg_dev):
return f"{n} {DEV[len(d) + len(NVME_PREFIX):]}"
n += 1
ogRaiseError([], ogGlobals.OG_ERR_NOTFOUND, arg_dev)
SystemLib.ogRaiseError([], ogGlobals.OG_ERR_NOTFOUND, arg_dev)
return
def _getAllDisks():
@ -424,14 +423,14 @@ def ogDiskToDev (arg_disk=None, arg_part=None):
if arg_part != None:
arg_part = int (arg_part)
except:
ogRaiseError([], ogGlobals.OG_ERR_FORMAT, f"{arg_disk} {arg_part}")
SystemLib.ogRaiseError([], ogGlobals.OG_ERR_FORMAT, f"{arg_disk} {arg_part}")
return
try:
if arg_disk != None:
arg_disk = int (arg_disk)
except:
ogRaiseError([], ogGlobals.OG_ERR_FORMAT, arg_disk)
SystemLib.ogRaiseError([], ogGlobals.OG_ERR_FORMAT, arg_disk)
return
# Borrar fichero de caché de configuración si hay cambios en las particiones.
@ -475,11 +474,11 @@ def ogDiskToDev (arg_disk=None, arg_part=None):
# arg_disk is set: return it
if arg_part is None:
if arg_disk > len (ALLDISKS):
ogRaiseError([], ogGlobals.OG_ERR_NOTFOUND, arg_disk)
SystemLib.ogRaiseError([], ogGlobals.OG_ERR_NOTFOUND, arg_disk)
return
disk = ALLDISKS[arg_disk-1]
if not os.path.exists(disk):
ogRaiseError([], ogGlobals.OG_ERR_NOTFOUND, arg_disk)
SystemLib.ogRaiseError([], ogGlobals.OG_ERR_NOTFOUND, arg_disk)
return
# Actualizar caché de configuración y mostrar dispositivo.
with open(CACHEFILE, 'a') as f:
@ -489,7 +488,7 @@ def ogDiskToDev (arg_disk=None, arg_part=None):
# arg_disk and arg_part are set: there are several possibilities
disk = ALLDISKS[arg_disk-1]
if not os.path.exists(disk):
ogRaiseError([], ogGlobals.OG_ERR_NOTFOUND, arg_disk)
SystemLib.ogRaiseError([], ogGlobals.OG_ERR_NOTFOUND, arg_disk)
return
# Plain partition
@ -535,7 +534,7 @@ def ogDiskToDev (arg_disk=None, arg_part=None):
i += 1
if not part:
ogRaiseError([], ogGlobals.OG_ERR_NOTFOUND, f"{arg_disk} {arg_part}")
SystemLib.ogRaiseError([], ogGlobals.OG_ERR_NOTFOUND, f"{arg_disk} {arg_part}")
return
# Actualizar caché de configuración y mostrar dispositivo.

11
client/lib/engine/bin/SystemLib.py
View File

@ -4,12 +4,10 @@ from zoneinfo import ZoneInfo
import sys
import os
import shutil
import inspect
import ogGlobals
#from engine.DiskLib import *
#from engine.CacheLib import *
#from engine.StringLib import *
from StringLib import *
import StringLib
#NODEBUGFUNCTIONS, OGIMG, OG_ERR_CACHESIZE, OG_ERR_NOTCACHE, OG_ERR_NOTWRITE, OG_ERR_FILESYS
#OG_ERR_REPO, OG_ERR_NOTOS, OG_ERR_NOGPT, OG_ERR_OUTOFLIMIT, OG_ERR_IMAGE, OG_ERR_CACHE
@ -135,7 +133,6 @@ def ogGetCaller():
return os.path.basename(caller)
import inspect
#/**
# ogHelp ["str_function" ["str_format" ["str_example" ... ]]]
#@brief Muestra mensaje de ayuda para una función determinda.
@ -220,8 +217,8 @@ def ogRaiseError (logtypes, code, msg):
str_call_stack = ' '.join (call_stack)
if code == ogGlobals.OG_ERR_FORMAT or \
ogCheckStringInGroup (str_call_stack, ogGlobals.NODEBUGFUNCTIONS) or \
not ogCheckStringInGroup (call_stack[0], ogGlobals.NODEBUGFUNCTIONS):
StringLib.ogCheckStringInGroup (str_call_stack, ogGlobals.NODEBUGFUNCTIONS) or \
not StringLib.ogCheckStringInGroup (call_stack[0], ogGlobals.NODEBUGFUNCTIONS):
ogEcho (logtypes, "error", f"{str_call_stack.replace(' ', '<-')}: {MSG}")
return code