removed all remnants of FILE_REFIMG_LINK
This commit is contained in:
@@ -150,16 +150,6 @@ class Entry(Base):
|
||||
def __repr__(self):
|
||||
return f"<id: {self.id}, name: {self.name}, type={self.type}, exists_on_fs={self.exists_on_fs}, dir_details={self.dir_details}, file_details={self.file_details}, in_dir={self.in_dir}>"
|
||||
|
||||
class FileRefimgLink(Base):
|
||||
__tablename__ = "file_refimg_link"
|
||||
file_id = Column(Integer, ForeignKey('file.eid'), unique=True, nullable=False, primary_key=True)
|
||||
refimg_id = Column(Integer, ForeignKey('refimg.id'), unique=True, nullable=False, primary_key=True)
|
||||
when_processed = Column(Float)
|
||||
matched = Column(Boolean)
|
||||
|
||||
def __repr__(self):
|
||||
return f"<file_id: {self.file_id}, refimg_id: {self.refimg_id} when_processed={self.when_processed}, matched={self.matched}"
|
||||
|
||||
class File(Base):
|
||||
__tablename__ = "file"
|
||||
eid = Column(Integer, ForeignKey("entry.id"), primary_key=True )
|
||||
@@ -533,7 +523,6 @@ def JobForceScan(job):
|
||||
session.query(FaceFileLink).delete()
|
||||
session.query(FaceRefimgLink).delete()
|
||||
session.query(DelFile).delete()
|
||||
session.query(FileRefimgLink).delete()
|
||||
session.query(EntryDirLink).delete()
|
||||
session.query(PathDirLink).delete()
|
||||
session.query(Path).delete()
|
||||
@@ -1062,27 +1051,9 @@ def ProcessAI(job, e):
|
||||
return
|
||||
|
||||
def lookForPersonInImage(job, person, unknown_encoding, e):
|
||||
for refimg in person.refimg:
|
||||
# lets see if we have tried this check before
|
||||
frl=session.query(FileRefimgLink).filter(FileRefimgLink.file_id==e.id, FileRefimgLink.refimg_id==refimg.id).first()
|
||||
if not frl:
|
||||
frl = FileRefimgLink(refimg_id=refimg.id, file_id=e.file_details.eid)
|
||||
else:
|
||||
stat=os.stat( e.FullPathOnFS() )
|
||||
# file & refimg are not newer then we dont need to check
|
||||
if frl.matched and stat.st_ctime < frl.when_processed and refimg.created_on < frl.when_processed:
|
||||
print(f"OPTIM: lookForPersonInImage: file {e.name} has a previous match for: {refimg.fname}, and the file & refimg haven't changed")
|
||||
return
|
||||
FinishJob( job, "THIS CODE HAS BEEN REMOVED, need to use new Face* tables, and rethink", "Failed" )
|
||||
return
|
||||
|
||||
session.add(frl)
|
||||
frl.matched=False
|
||||
frl.when_processed=time.time()
|
||||
deserialized_bytes = numpy.frombuffer(refimg.encodings, dtype=numpy.float64)
|
||||
results = compareAI(deserialized_bytes, unknown_encoding)
|
||||
if results[0]:
|
||||
AddLogForJob(job, f'Found a match between: {person.tag} and {e.name}')
|
||||
frl.matched=True
|
||||
return
|
||||
|
||||
def generateUnknownEncodings(im):
|
||||
unknown_image = numpy.array(im)
|
||||
|
||||
Reference in New Issue
Block a user