remove PathDetails*, and use marshmallow schemas with methods to get icon_url, and "path" renamed to "root_dir", updated move* code to use new data structure
This commit is contained in:
50
path.py
50
path.py
@@ -42,53 +42,3 @@ class Path(db.Model):
|
||||
|
||||
def __repr__(self):
|
||||
return f"<id: {self.id}, path_prefix: {self.path_prefix}, num_files={self.num_files}, type={self.type}>"
|
||||
|
||||
|
||||
################################################################################
|
||||
# Class describing PathDetail (quick connvenence class for MovePathDetails())
|
||||
################################################################################
|
||||
class PathDetail(PA):
|
||||
"""Class describing details of a Path [internal class used in MovePathDetais()]"""
|
||||
|
||||
def __init__(self,ptype,path):
|
||||
"""Initialisation function for PathDetail class
|
||||
|
||||
Args:
|
||||
id (int): database id of row in PathDetail table / primary key
|
||||
ptype (int): database id of row in PathType table / foreign key
|
||||
"""
|
||||
|
||||
self.type:int=ptype
|
||||
self.path:str=path
|
||||
# construct icon_url based on type of storage path (icons.svg contains icons for each)
|
||||
self.icon_url:str=url_for("internal", filename="icons.svg") + "#" + ICON[self.type]
|
||||
|
||||
def to_dict(self):
|
||||
return {key: value for key, value in vars(self).items()}
|
||||
|
||||
################################################################################
|
||||
# helper function to find path details for move destinations - used in html
|
||||
# for move DBox to show potential storage paths to move files into
|
||||
################################################################################
|
||||
def MovePathDetails():
|
||||
"""helper function to find path details for move destinations
|
||||
|
||||
used in html/javascript for move Dialog Box to show potential storage paths to move files into
|
||||
|
||||
Args:
|
||||
None
|
||||
|
||||
Returns:
|
||||
ret (List[PathDetail]): a list of Path Details for where files can be moved
|
||||
|
||||
"""
|
||||
ret=[]
|
||||
sps=Path.query.join(PathType).filter(PathType.name=="Storage").all()
|
||||
for p in sps:
|
||||
obj = PathDetail( ptype="Storage", path=p.path_prefix.replace("static/Storage/","") )
|
||||
ret.append( obj.to_dict() )
|
||||
ips=Path.query.join(PathType).filter(PathType.name=="Import").all()
|
||||
for p in ips:
|
||||
obj = PathDetail( ptype="Import", path=p.path_prefix.replace("static/Import/","") )
|
||||
ret.append( obj.to_dict() )
|
||||
return ret
|
||||
|
||||
Reference in New Issue
Block a user