ddp/photoassistant
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use explicit set of dir_obj for path, as ORM cant easily work out which dir is the right one for a path

Browse Source
This commit is contained in:
Damien De Paoli
2021-06-07 17:46:45 +10:00
parent 43f60cba93
commit 66268ad6bb
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pa_job_manager.py
View File

@@ -108,10 +108,9 @@ class Path(Base):
type = relationship("PathType") type = relationship("PathType")
path_prefix = Column(String, unique=True, nullable=False ) path_prefix = Column(String, unique=True, nullable=False )
num_files = Column(Integer) num_files = Column(Integer)
dir_obj = relationship("Dir", secondary="path_dir_link", uselist=False)
def __repr__(self): def __repr__(self):
return f"<id: {self.id}, type={self.type}, path_prefix={self.path_prefix}, dir_obj={self.dir_obj}>" return f"<id: {self.id}, type={self.type}, path_prefix={self.path_prefix}>"
class Dir(Base): class Dir(Base):
__tablename__ = "dir" __tablename__ = "dir"
@@ -718,7 +717,7 @@ def JobImportDir(job):
path_obj.num_files=overall_file_cnt path_obj.num_files=overall_file_cnt
# this is needed so that later on, when we AddDir for any dirs we find via os.walk, they have a parent dir object that is the dir for the path we are in # this is needed so that later on, when we AddDir for any dirs we find via os.walk, they have a parent dir object that is the dir for the path we are in
parent_dir=path_obj.dir_obj parent_dir=session.query(Dir).join(PathDirLink).join(Path).filter(Path.id==path_obj.id,Dir.rel_path=='').first()
# first time through we need dir to be the top level, we have a special if below to no recreate the top dir that AddPath created already # first time through we need dir to be the top level, we have a special if below to no recreate the top dir that AddPath created already
dir=parent_dir dir=parent_dir