Javanaut/ffx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nightl

Browse Source
This commit is contained in:
Maveno
2024-10-08 22:42:32 +02:00
parent a280248f6a
commit 12689fe61d
3 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bin/ffx/file_properties.py
View File

@@ -217,4 +217,6 @@ class FileProperties():
def getShowId(self) -> int:
return self.__pattern.getShowId() if self.__pattern is not None else -1
def getPattern(self) -> Pattern:
return self.__pattern

12
bin/ffx/model/pattern.py
View File

@@ -20,7 +20,7 @@ class Pattern(Base):
# v1.x
show_id = Column(Integer, ForeignKey('shows.id', ondelete="CASCADE"))
show = relationship('Show', back_populates='patterns')
show = relationship('Show', back_populates='patterns', lazy='joined')
# v2.0
# show_id: Mapped[int] = mapped_column(ForeignKey("shows.id", ondelete="CASCADE"))
@@ -29,7 +29,7 @@ class Pattern(Base):
tracks = relationship('Track', back_populates='pattern', cascade="all, delete")
media_tags = relationship('MediaTag', back_populates='pattern', cascade="all, delete")
media_tags = relationship('MediaTag', back_populates='pattern', cascade="all, delete", lazy='joined')
def getId(self):
@@ -50,9 +50,11 @@ class Pattern(Base):
def getMediaDescriptor(self):
md = MediaDescriptor(tags = self.getDescriptor()['tags'])
kwargs = {}
kwargs[MediaDescriptor.TAGS_KEY] = self.getTags()
md = MediaDescriptor(**kwargs)
for t in self.tracks:
md.appendTrack(t.getDescriptor())
# for t in self.tracks:
# md.appendTrack(t.getDescriptor())
return md