cleo/ScoDoc-PE
1
0
Fork 0
Code Issues 4 Pull Requests Packages Projects Releases Wiki Activity

Archiver: dept variable

Browse Source
This commit is contained in:
Emmanuel Viennet 2023-02-02 07:09:45 -03:00
parent 43849007fb
commit 338c24a9c1
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/scodoc/sco_archives.py
View File

@ -68,7 +68,7 @@ from app import log
from app.but import jury_but_pv from app.but import jury_but_pv
from app.comp import res_sem from app.comp import res_sem
from app.comp.res_compat import NotesTableCompat from app.comp.res_compat import NotesTableCompat
from app.models import Departement, FormSemestre from app.models import FormSemestre
from app.scodoc.TrivialFormulator import TrivialFormulator from app.scodoc.TrivialFormulator import TrivialFormulator
from app.scodoc.sco_exceptions import ( from app.scodoc.sco_exceptions import (
AccessDenied, AccessDenied,
@ -89,6 +89,11 @@ class BaseArchiver(object):
self.archive_type = archive_type self.archive_type = archive_type
self.initialized = False self.initialized = False
self.root = None self.root = None
self.dept_id = getattr(g, "scodoc_dept_id")
def set_dept_id(self, dept_id: int):
"set dept"
self.dept_id = dept_id
def initialize(self): def initialize(self):
if self.initialized: if self.initialized:
@ -117,8 +122,7 @@ class BaseArchiver(object):
If directory does not yet exist, create it. If directory does not yet exist, create it.
""" """
self.initialize() self.initialize()
dept = Departement.query.filter_by(acronym=g.scodoc_dept).first() dept_dir = os.path.join(self.root, str(self.dept_id))
dept_dir = os.path.join(self.root, str(dept.id))
try: try:
scu.GSL.acquire() scu.GSL.acquire()
if not os.path.isdir(dept_dir): if not os.path.isdir(dept_dir):
@ -137,8 +141,7 @@ class BaseArchiver(object):
:return: list of archive oids :return: list of archive oids
""" """
self.initialize() self.initialize()
dept = Departement.query.filter_by(acronym=g.scodoc_dept).first() base = os.path.join(self.root, str(self.dept_id)) + os.path.sep
base = os.path.join(self.root, str(dept.id)) + os.path.sep
dirs = glob.glob(base + "*") dirs = glob.glob(base + "*")
return [os.path.split(x)[1] for x in dirs] return [os.path.split(x)[1] for x in dirs]