From d78aa0c07685cb03c4c9113efd3806013f093997 Mon Sep 17 00:00:00 2001 From: Damien De Paoli Date: Fri, 18 Jun 2021 01:04:41 +1000 Subject: [PATCH] file_sp now honours offset and how_many, and if you go into a new dir (up or down), offset is put back to 0 - this seems functional now, need to functionalise/replicate into files_ip and files_rbp --- files.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/files.py b/files.py index 7cb6bd3..4f4fc26 100644 --- a/files.py +++ b/files.py @@ -229,8 +229,10 @@ def files_sp(): if len(rp) and rp[0] == '/': rp=rp[1:] dir=Entry.query.join(Dir).join(PathDirLink).join(Path).filter(Dir.rel_path==rp).filter(Path.path_prefix==prefix).order_by(Entry.name).first() - entries+= Entry.query.join(EntryDirLink).filter(EntryDirLink.dir_eid==dir.id).order_by(Entry.name).all() + entries+= Entry.query.join(EntryDirLink).join(FileType).filter(EntryDirLink.dir_eid==dir.id).filter(FileType.name=='Directory').all() + if noo == "Oldest": + print( Entry.query.join(File).join(EntryDirLink).filter(EntryDirLink.dir_eid==dir.id).order_by(File.year,File.month,File.day,Entry.name).offset(offset).limit(how_many)) entries+=Entry.query.join(File).join(EntryDirLink).filter(EntryDirLink.dir_eid==dir.id).order_by(File.year,File.month,File.day,Entry.name).offset(offset).limit(how_many).all() else: entries+=Entry.query.join(File).join(EntryDirLink).filter(EntryDirLink.dir_eid==dir.id).order_by(File.year.desc(),File.month.desc(),File.day.desc(),Entry.name).offset(offset).limit(how_many).all()