fix up linking between face to refimg when we add that face to a person from right-click

update adding refimg to new or existing person via right-click on a face to use new data structures
remove dead code
2025-10-07 23:52:06 +11:00 · 2025-10-07 23:43:07 +11:00 · 2025-10-07 23:42:17 +11:00 · 2025-10-07 23:42:02 +11:00 · 2025-10-07 23:41:38 +11:00 · 2025-10-07 23:31:37 +11:00
24 changed files with 1655 additions and 1876 deletions
--- a/3
+++ b/3
@@ -1,4 +1,5 @@
-### Next: 140
+### Next: 141
+BUG-140: When db is restarted underneath PA, it crashes job mgr... It should just accept timeouts, and keep trying to reconnect every 2? mins
 BUG-139: using any large entry list and going next a few times, ends say 4 pages of 50 into 4000 matches (entries from DB < 50)... 
    - confirmed this is when person has 2 or more refimgs:
      - on page "2", we get 49 pulled back in the ORM instead of the 50 expected -- b/c I use that to indicate we must be at the end of the list if not 50 found
--- a/6
+++ b/6
@@ -95,13 +95,13 @@ To get back a 'working' but scanned set of data:
        # pg_dump --user=pa -a -t person -t refimg -t person_refimg_link  > /docker-entrypoint-initdb.d/users.sql

    # export all content so we can upgrade versions of postgres
-    sudo docker exec -it padb bash
+    docker exec -it padb bash
        # pg_dump --user=pa pa > /docker-entrypoint-initdb.d/bkup.sql
    ### check sql looks good
    sudo mv /srv/docker/container/padb/docker-entrypoint-initdb.d/bkup.sql /srv/docker/container/padb/docker-entrypoint-initdb.d/tables.sql
    sudo rm /srv/docker/container/padb/docker-entrypoint-initdb.d/users.sql
-    sudo docker-compose -f /srv/docker/config/docker-compose.yaml build padb
-    ( cd /srv/docker/config/ ; sudo docker-compose  stop padb ;  yes | sudo docker-compose rm padb ; sudo rm -rf /srv/docker/container/padb/data/ ; sudo docker-compose up -d padb ; sudo docker-compose restart paweb )
+    docker-compose -f /srv/docker/config/docker-compose.yaml build padb
+    ( cd /srv/docker/config/ ; docker-compose  stop padb ;  yes | docker-compose rm padb ; sudo rm -rf /srv/docker/container/padb/data/ ; docker-compose up -d padb ; docker-compose restart paweb )


 HANDY SQLs/commands:
--- a/33
+++ b/33
@@ -1,19 +1,22 @@
+###
+#
+# fix all face, right-click options:
+#   [DONE] add to new, add to existing
+#   [TODO] 4 x override*
+#
+#1 get override data into view
+# also all the add ref img/add override, etc are non-functional - FIX the override* stuff first to get table/naming consistency as that is half the problem
+#    NMO data -> there is an NMO object (just NMO names/types - |json), then there is per face level data - this should be a reference from Face and Schema/marshmallow
+#
+#4 TEST everything (don't forget keybindings,e.g. delete)
+#   -- go into viewer code from a files_rbp - had red bin, bot green on viewer.
+#
+#5 think I killed pa_job_manager without passing an eid to a transform job, shouldn't crash
+#    SHOULD JUST get AI to help clean-up and write defensive code here...
+#
+###
+
 ### major fix - go to everywhere I call GetEntries(), and redo the logic totally...
-    * firstly, run the query as per normal, but get just the matched eids into an entry_lst
-    * make a unique query_id for this entry_lst, and store entry_ids into "query" table, with a unique query_id
-    * take most of pa_user_state that relates to query state and move it to the "query" table per query_id
-    * pa_user_state then becomes defaults for next query (so how_many, noo, etc)
-
-    * we can age out queries form the query_table after a few months?
-        * client side always has query_id.  IF DB does not have query_id, then its really old? - just say so...
-
-    * client side takes query_id, entry_lst, current_eid, offset, first/last_eid, etc. as part of its first route / html creation.
-        * it then decides based on all this to GetEntryDetails( subset of entry_lst ) <- needs new route
-        * IN THEORY some of the subset of entry_lst don't exist -- BUT, we can handle that on response, e.g. say my query used to have 1,2,3, and since then another user/action deleted 2:
-            - I ask for details on 1,2,3 and get back details on 1,3 only.
-            - On client-side, I can say, since you ran this query, data in PA has changed - image#2 is no longer in PA.   
-              Please run a new query (or bonus points, maybe have enough of the original query to note this and ask, do you want to ignore changes, or re-run query and get latest data?)
-    * client can go fwd or back in the entry_lst same as now (disabling buttons as needed), BUT as entry_lst is NOT recreated per page move, then no chance to get confused about first/last
    * client side: 
        * for real chance to stop confusion, instead of removing deleted images from DOM, we should gray them out and put a big Del (red circle with line?) though it as overlay.
        * Create another table is entry_ammendments - note the deletions, rotations, flips of specific eids - then reproduce that on the client side visually as needed 
--- a/face.py
+++ b/face.py
@@ -28,8 +28,8 @@ class Face(PA,db.Model):
    face_left = db.Column( db.Integer )
    w = db.Column( db.Integer )
    h = db.Column( db.Integer )
-    refimg_lnk = db.relationship("FaceRefimgLink", uselist=False, viewonly=True)
-    facefile_lnk = db.relationship("FaceFileLink", uselist=False, viewonly=True)
+    refimg_lnk = db.relationship("FaceRefimgLink", uselist=False, viewonly=True )
+    facefile_lnk = db.relationship("FaceFileLink", uselist=False, viewonly=True )
    refimg =db.relationship("Refimg", secondary="face_refimg_link", uselist=False)


@@ -62,13 +62,13 @@ class FaceRefimgLink(PA, db.Model):
    Attributes:
        face_id (int): face id of row in Face table / foreign key - part primary key
        refimg_id (int): face id of row in Face table / foreign key - part primary key
-        face_distance (int): distance value (how similar matched Face was)
+        face_distance (float): distance value (how similar matched Face was)
    """

    __tablename__ = "face_refimg_link"
    face_id = db.Column(db.Integer, db.ForeignKey("face.id"), primary_key=True )
    refimg_id = db.Column(db.Integer, db.ForeignKey("refimg.id"), primary_key=True )
-    face_distance = db.Column(db.Integer)
+    face_distance = db.Column(db.Float)


 ################################################################################
--- a/files.py
+++ b/files.py
@@ -1,11 +1,13 @@
-from wtforms import SubmitField, StringField, HiddenField, validators, Form
 from flask_wtf import FlaskForm
 from flask import request, render_template, redirect, send_from_directory, url_for, jsonify, make_response
+from marshmallow import Schema, fields
 from main import db, app, ma 
-from sqlalchemy import Sequence, text
+from sqlalchemy import Sequence, text, select, union, or_
 from sqlalchemy.exc import SQLAlchemyError
+from sqlalchemy.orm import joinedload
 import os
 import glob
+import json
 from PIL import Image
 from pymediainfo import MediaInfo
 import hashlib
@@ -19,16 +21,17 @@ from datetime import datetime, timedelta
 import pytz
 import html
 from flask_login import login_required, current_user
-from states import States, PA_UserState
+from types import SimpleNamespace

-################################################################################
 # Local Class imports
 ################################################################################
+from states import States, PA_UserState
+from query import Query
 from job import Job, JobExtra, Joblog, NewJob, SetFELog
-from path import PathType, Path, MovePathDetails
+from path import PathType, Path
 from person import Refimg, Person, PersonRefimgLink
 from settings import Settings, SettingsIPath, SettingsSPath, SettingsRBPath
-from shared import SymlinkName
+from shared import SymlinkName, ICON
 from dups import Duplicates
 from face import Face, FaceFileLink, FaceRefimgLink, FaceOverrideType, FaceNoMatchOverride, FaceForceMatchOverride

@@ -119,7 +122,7 @@ class File(db.Model):
    eid = db.Column(db.Integer, db.ForeignKey("entry.id"), primary_key=True )
    size_mb = db.Column(db.Integer, unique=False, nullable=False)
    thumbnail = db.Column(db.String, unique=False, nullable=True)
-    hash = db.Column(db.Integer)
+    hash = db.Column(db.String)
    year = db.Column(db.Integer)
    month = db.Column(db.Integer)
    day = db.Column(db.Integer)
@@ -141,306 +144,344 @@ class FileType(db.Model):
    def __repr__(self):
        return f"<id: {self.id}, name={self.name}>"

-################################################################################
-# util function to just update the current/first/last positions needed for
-# viewing / using pa_user_state DB table
-################################################################################
-def UpdatePref( pref, OPT ):
-    last_used=datetime.now(pytz.utc)
-    if OPT.current>0:
-        pref.current=OPT.current
-    if OPT.first_eid>0:
-        pref.first_eid=OPT.first_eid
-    if OPT.last_eid>0:
-        pref.last_eid=OPT.last_eid
-    if OPT.num_entries>0:
-        pref.num_entries=OPT.num_entries
-    pref.last_used=last_used
-    db.session.add(pref)
-    db.session.commit()

 ################################################################################
-# GetEntriesInFlatView:  func. to retrieve DB entries appropriate for flat view
+# this is how we order all queries based on value of 'noo' - used with
+# access *order_map.get(OPT.noo)
 ################################################################################
-def GetEntriesInFlatView( OPT, prefix ):
-    entries=[]
-    num_entries=0
-
-    join = "Entry.query.join(File).join(EntryDirLink).join(Dir).join(PathDirLink).join(Path).filter(Path.path_prefix==prefix)"
-    entries = eval( f"{join}.{OPT.order}.offset({OPT.offset}).limit({OPT.how_many}).all()" )
-
-    if OPT.first_eid == 0 and OPT.offset == 0 and len(entries):
-        OPT.first_eid = entries[0].id
-
-    if OPT.last_eid==0:
-        num_entries = eval( f"{join}.count()" )
-        last_entry = eval( f"{join}.{OPT.last_order}.limit(1).first()" )
-        if last_entry:
-            OPT.last_eid = last_entry.id
-
-    return entries, num_entries
+order_map = {
+    "Newest": (File.year.desc(),File.month.desc(),File.day.desc(),Entry.name.desc()),
+    "Oldest": (File.year,File.month,File.day,Entry.name),
+    # careful, these need to be tuples, so with a , at the end
+    "Z to A": (Entry.name.desc(),),
+    "A to Z": (Entry.name.asc(),),
+}

 ################################################################################
-# GetEntriesInFolderView: func. to retrieve DB entries appropriate for folder view
-# read inline comments to deal with variations / ordering...
+
 ################################################################################
-def GetEntriesInFolderView( OPT, prefix ):
-    entries=[]
-    num_entries=0
-    # okay the root cwd is fake, so treat it specially - its Dir can be found by path with dir.rel_path=''
-    if os.path.dirname(OPT.cwd) == 'static':
-        dir=Entry.query.join(Dir).join(PathDirLink).join(Path).filter(Dir.rel_path=='').filter(Path.path_prefix==prefix).order_by(Entry.name).first()
-        # this can occur if the path in settings does not exist as it wont be in # the DB
-        if not dir:
-            return entries, num_entries
-        # although this is 1 entry, needs to come back via all() to be iterable
-        entries+= Entry.query.filter(Entry.id==dir.id).all()
-    else:
-        rp = OPT.cwd.replace( prefix, '' )
-        # when in subdirs, replacing prefix will leave the first char as /, get rid of it
-        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()
-        # this can occur if the path in settings does not exist as it wont be in # the DB
-        if not dir:
-            return entries, 0
-        # dirs cant be sorted by date really, so do best I can for now
-        if OPT.noo == "Z to A" or OPT.noo == "Newest":
-            entries+= Entry.query.join(EntryDirLink).join(FileType).filter(EntryDirLink.dir_eid==dir.id).filter(FileType.name=='Directory').order_by(Entry.name.desc()).all()
-        # just do A to Z / Oldest by default or if no valid option
-        else:
-            entries+= Entry.query.join(EntryDirLink).join(FileType).filter(EntryDirLink.dir_eid==dir.id).filter(FileType.name=='Directory').order_by(Entry.name).all()
+# Schemas for Path, FileType, File, Dir - used in EntrySchema
+################################################################################
+class PathType(ma.SQLAlchemyAutoSchema):
+    class Meta: model = PathType
+    load_instance = True

-    # add any files at the current CWD (based on dir_eid in DB)
-    join="Entry.query.join(File).join(EntryDirLink).filter(EntryDirLink.dir_eid==dir.id)"
-    file_entries= eval( f"{join}.{OPT.order}.offset(OPT.offset).limit(OPT.how_many).all()")
+class PathSchema(ma.SQLAlchemyAutoSchema):
+    class Meta: model = Path
+    load_instance = True
+    type = ma.Nested(PathType) 
+    root_dir = fields.Method("get_root_dir")
+    icon_url = fields.Method("get_icon_url")
+    def get_icon_url(self, obj):
+        return url_for("internal", filename="icons.svg") + "#" + ICON[obj.type.name]
+    def get_root_dir(self, obj):
+        parts = obj.path_prefix.split('/')
+        return ''.join(parts[2:])

-    if OPT.offset == 0 and len(file_entries):
-        OPT.first_eid = file_entries[0].id
-    num_entries = eval( f"{join}.count()" )
-    last_entry = eval( f"{join}.{OPT.last_order}.limit(1).first()" )
-    if last_entry:
-        OPT.last_eid = last_entry.id

-    entries += file_entries;
-    return entries, num_entries
+class FileTypeSchema(ma.SQLAlchemyAutoSchema):
+    class Meta: model = FileType
+    load_instance = True
+
+class DirSchema(ma.SQLAlchemyAutoSchema):
+    class Meta: model = Dir
+    load_instance = True
+    eid = ma.auto_field()  # Explicitly include eid
+    in_path = ma.Nested(PathSchema)
+
+class FaceFileLinkSchema(ma.SQLAlchemyAutoSchema):
+    class Meta: model = FaceFileLink
+    model_used = ma.auto_field()
+    load_instance = True
+
+class PersonSchema(ma.SQLAlchemyAutoSchema):
+    class Meta: model=Person
+    load_instance = True
+
+class RefimgSchema(ma.SQLAlchemyAutoSchema):
+    class Meta:
+        model = Refimg
+        exclude = ('face',)
+    load_instance = True
+    person = ma.Nested(PersonSchema)
+
+class FaceRefimgLinkSchema(ma.SQLAlchemyAutoSchema):
+    class Meta: model = FaceRefimgLink
+    load_instance = True
+
+class FaceNoMatchOverrideSchema(ma.SQLAlchemyAutoSchema):
+    class Meta: model = FaceOverrideType
+    load_instance = True
+    type = ma.Nested(FaceOverrideType)
+
+class FaceForceMatchOverrideSchema(ma.SQLAlchemyAutoSchema):
+    class Meta: model = FaceOverrideType
+    load_instance = True
+    person = ma.Nested(Person) 
+
+class FaceSchema(ma.SQLAlchemyAutoSchema):
+    class Meta:
+        model=Face
+        exclude = ('face',)
+    load_instance = True
+    refimg = ma.Nested(RefimgSchema,allow_none=True)
+    # faces have to come with a file connection
+    facefile_lnk = ma.Nested(FaceFileLinkSchema)
+    refimg_lnk = ma.Nested(FaceRefimgLinkSchema,allow_none=True)
+    fnmo = ma.Nested( FaceNoMatchOverride, allow_none=True )
+    ffmo = ma.Nested( FaceForceMatchOverride, allow_none=True )
+
+class FileSchema(ma.SQLAlchemyAutoSchema):
+    class Meta: model = File
+    load_instance = True
+    faces = ma.Nested(FaceSchema,many=True,allow_none=True)
+
+# used just in NMO var
+class FaceOverrideTypeSchema(ma.SQLAlchemyAutoSchema):
+    class Meta: model = FaceOverrideType
+    load_instance = True
+
+################################################################################
+# Schema for Entry so we can json for data to the client
+################################################################################
+class EntrySchema(ma.SQLAlchemyAutoSchema):
+    # gives id, name, type_id
+    class Meta: model = Entry
+    load_instance = True
+
+    type = ma.Nested(FileTypeSchema)
+    file_details = ma.Nested(FileSchema,allow_none=True)
+    # noting dir_details needs in_path to work 
+    dir_details = ma.Nested(DirSchema)
+    # noting in_dir needs in_path and in_path.type to work 
+    in_dir = ma.Nested(DirSchema)
+    # allow us to use FullPathOnFS()
+    FullPathOnFS = fields.Method("get_full_path")
+
+    def get_full_path(self, obj):
+        return obj.FullPathOnFS()
+
+# global - this will be use more than once below, so do it once for efficiency
+entries_schema = EntrySchema(many=True)
+FOT_Schema = FaceOverrideTypeSchema(many=True)
+path_Schema = PathSchema(many=True)
+person_Schema = PersonSchema(many=True)
+
+################################################################################
+# /get_entries_by_ids -> route where we supply list of entry ids (for next/prev
+# page of data we want to show).  Returns json of all matching entries
+################################################################################
+@app.route('/get_entries_by_ids', methods=['POST'])
+@login_required
+def process_ids():
+    data = request.get_json()  # Parse JSON body
+    ids = data.get('ids', [])  # Extract list of ids
+
+    # Query DB for matching entries
+    stmt = (
+        select(Entry)
+        .options(
+            joinedload(Entry.file_details).joinedload(File.faces).joinedload(Face.refimg).joinedload(Refimg.person),
+            joinedload(Entry.file_details).joinedload(File.faces).joinedload(Face.refimg_lnk),
+            joinedload(Entry.file_details).joinedload(File.faces).joinedload(Face.facefile_lnk),
+        )
+        .where(Entry.id.in_(ids))
+    )
+
+
+    # unique as the ORM query returns a Cartesian product for the joins. E.g if file has 3 faces, the result has 3 rows of the same entry and file data, but different face data
+    data=db.session.execute(stmt).unique().scalars().all()
+
+    # data is now in whatever order the DB returns- faster in python than DB supposedly. So, create a mapping from id to entry for quick lookup
+    entry_map = {entry.id: entry for entry in data}
+
+    # Sort the entries according to the order of ids
+    sorted_data = [entry_map[id_] for id_ in ids if id_ in entry_map]
+
+    return jsonify(entries_schema.dump(sorted_data))


 ################################################################################
-# GetEntriesInSearchView: func. to retrieve DB entries appropriate for Search view
-# Defaults search is for any matching filename, contents of any matching dirname
-# and any match with AI / face for that term.   Explicit, only AI match via
-# AI:<tag> syntax
+# /get_dir_entries -> show thumbnail view of files from import_path(s)
 ################################################################################
-def GetEntriesInSearchView( OPT ):
-    search_term=OPT.orig_search_term
+@app.route("/get_dir_entries", methods=["POST"])
+@login_required
+def get_dir_entries():
+    data = request.get_json()  # Parse JSON body
+    dir_id = data.get('dir_id', [])  # Extract list of ids
+    back = data.get('back', False)  # Extract back boolean
+
+    # if we are going back, find the parent id and use that instead
+    if back:
+        stmt=( select(EntryDirLink.dir_eid).filter(EntryDirLink.entry_id==dir_id) )
+        dir_id = db.session.execute(stmt).scalars().all() [0]
+
+    # get content of dir_id
+    stmt=( select(Entry.id).join(EntryDirLink).filter(EntryDirLink.dir_eid==dir_id) )
+    ids=db.session.execute(stmt).scalars().all()
+    entries_schema = EntrySchema(many=True)
+    entries = Entry.query.filter(Entry.id.in_(ids)).all()
+    return jsonify(entries_schema.dump(entries))
+
+# get Face overrid details
+def getFOT():
+    stmt = select(FaceOverrideType)
+    fot=db.session.execute(stmt).scalars().all()
+    return FOT_Schema.dump(fot)
+
+
+# get import/storage path details for move dbox
+def getMoveDetails():
+    stmt = select(Path).where( or_( Path.type.has(name="Import"), Path.type.has(name="Storage")))
+    mp=db.session.execute(stmt).scalars().all()
+    return path_Schema.dump(mp)
+
+# get people data for the menu for AI matching (of person.tag)
+def getPeople():
+    stmt = select(Person)
+    people=db.session.execute(stmt).scalars().all()
+    return person_Schema.dump(people)
+
+
+################################################################################
+# Get all relevant Entry.ids based on search_term passed in and OPT visuals
+################################################################################
+def GetSearchQueryData(OPT):
+    query_data={}
+    query_data['entry_list']=None 
+    query_data['root_eid']=0
+    query_data['NMO'] = getFOT()
+    query_data['move_paths'] = getMoveDetails()
+    query_data['people'] = getPeople()
+
+    search_term = OPT.search_term
    # turn * wildcard into sql wildcard of %
-    search_term=search_term.replace('*', '%' )
-    if 'AI:' in OPT.orig_search_term:
-        search_term = search_term.replace('AI:','')
-        join=f"Entry.query.join(File).join(FaceFileLink).join(Face).join(FaceRefimgLink).join(Refimg).join(PersonRefimgLink).join(Person).filter(Person.tag == search_term)"
+    search_term = search_term.replace('*', '%')
+    if 'AI:' in search_term:
+        search_term = search_term.replace('AI:', '')
+
+    # AI searches are for specific ppl/joins in the DB AND we do them for ALL types of searches, define this once
+    ai_query = (
+        select(Entry.id)
+        .join(File).join(FaceFileLink).join(Face).join(FaceRefimgLink).join(Refimg).join(PersonRefimgLink).join(Person)
+        .where(Person.tag == search_term)
+        .order_by(*order_map.get(OPT.noo) )
+    )
+
+    if 'AI:' in search_term:
+        all_entries = db.session.execute(ai_query).scalars().all()
    else:
-        join=f"Entry.query.join(File).join(FaceFileLink).join(Face).join(FaceRefimgLink).join(Refimg).join(PersonRefimgLink).join(Person).filter(Person.tag.ilike('%{search_term}%'))"
-    if 'AI:' in OPT.orig_search_term:
-        all_entries = eval( f"{join}.{OPT.order}.offset(OPT.offset).limit(OPT.how_many).all()")
+        # match name of File
+        file_query = select(Entry.id).join(File).where(Entry.name.ilike(f'%{search_term}%')).order_by(*order_map.get(OPT.noo))
+        # match name of Dir
+        dir_query = select(Entry.id).join(File).join(EntryDirLink).join(Dir).where(Dir.rel_path.ilike(f'%{search_term}%')).order_by(*order_map.get(OPT.noo))
+
+        # Combine ai, file & dir matches with union() to dedup and then order them 
+        combined_query = union( file_query, dir_query, ai_query )
+        all_entries = db.session.execute(combined_query).scalars().all()
+
+    query_data['entry_list']=all_entries
+    return query_data
+
+#################################################################################
+# Get all relevant Entry.ids based on files_ip/files_sp/files_rbp and OPT visuals
+#################################################################################
+def GetQueryData( OPT ):
+    query_data={}
+    query_data['entry_list']=None 
+    query_data['NMO'] = getFOT()
+    query_data['move_paths'] = getMoveDetails()
+    query_data['people'] = getPeople()
+
+    # always get the top of the (OPT.prefix) Path's eid and keep it for OPT.folders toggling/use
+    dir_stmt=( 
+        select(Entry.id)
+        .join(Dir).join(PathDirLink).join(Path)
+        .where(Dir.rel_path == '').where(Path.path_prefix==OPT.prefix) 
+    )
+    # this should return the 1 Dir (that we want to see the content of) - and with only 1, no need to worry about order
+    dir_arr=db.session.execute(dir_stmt).scalars().all()
+    if dir_arr:
+        dir_id=dir_arr[0]
    else:
-        file_data=eval( f"Entry.query.join(File).filter(Entry.name.ilike('%{search_term}%')).{OPT.order}.offset({OPT.offset}).limit({OPT.how_many}).all()" )
-        dir_data =eval( f"Entry.query.join(File).join(EntryDirLink).join(Dir).filter(Dir.rel_path.ilike('%{search_term}%')).{OPT.order}.offset({OPT.offset}).limit({OPT.how_many}).all()" )
-        ai_data  =eval( f"{join}.{OPT.order}.offset({OPT.offset}).limit({OPT.how_many}).all()")
+        dir_id=0
+    # used to know the parent/root (in folder view), in flat view - just ignore/safe though
+    query_data['root_eid']=dir_id

-        # remove any duplicates from combined data
-        all_entries = []
-        for f in file_data:
-            all_entries.append(f)
-        for d in dir_data:
-            add_it=1
-            for f in file_data:
-                if d.name == f.name:
-                    add_it=0
-                    break
-            if add_it:
-                all_entries.append(d)
-        for a in ai_data:
-            add_it=1
-            for f in file_data:
-                if a.name == f.name:
-                    add_it=0
-                    break
-            if add_it:
-                all_entries.append(a)
-
-    # nothing found, just return now
-    if len(all_entries) == 0:
-        OPT.num_entries = 0
-        return []
-
-    # for all searches first_entry is worked out when first_eid not set yet & offset is 0 and we have some entries
-    if OPT.first_eid == 0 and OPT.offset == 0 and len(all_entries):
-        OPT.first_eid = all_entries[0].id
-    if OPT.last_eid == 0:
-        by_fname=  f"select e.id from entry e where e.name ilike '%%{search_term}%%'"
-        by_dirname=f"select e.id from entry e, entry_dir_link edl where edl.entry_id = e.id and edl.dir_eid in ( select d.eid from dir d where d.rel_path ilike '%%{search_term}%%' )"
-        by_ai     =f"select e.id from entry e, face_file_link ffl, face_refimg_link frl, person_refimg_link prl, person p where e.id =  ffl.file_eid and frl.face_id = ffl.face_id and frl.refimg_id = prl.refimg_id and prl.person_id = p.id and p.tag = '{search_term}'"
-
-        if 'AI:' in OPT.orig_search_term:
-            sel_no_order=f"select e.*, f.* from entry e, file f where e.id=f.eid and e.id in ( {by_ai} ) "
-        else:
-            sel_no_order=f"select e.*, f.* from entry e, file f where e.id=f.eid and e.id in ( {by_fname} union {by_dirname} union {by_ai} ) "
-
-        #num_entries 
-        num_e_sql = f"select count(1) from ( {by_fname} union {by_dirname} union {by_ai} ) as foo"
-        with db.engine.connect() as conn:
-            OPT.num_entries = conn.execute( text( num_e_sql ) ).first().count
-
-        if OPT.num_entries == 0:
-            return []
-
-        last_entry_sql= f"{sel_no_order} order by {OPT.last_order_raw} limit 1"
-        with db.engine.connect() as conn:
-            OPT.last_eid = conn.execute( text( last_entry_sql ) ).first().id
-        # store first/last eid into prefs
-        pref=PA_UserState.query.filter(PA_UserState.pa_user_dn==current_user.dn,PA_UserState.path_type==OPT.path_type,PA_UserState.orig_ptype==OPT.orig_ptype,PA_UserState.orig_search_term==OPT.orig_search_term).first()
-        UpdatePref( pref, OPT )
-    return all_entries
-
-################################################################################
-# set up "order strings" to use in ORM and raw queries as needed for
-# GetEntries*Search*, GetEntries*Flat*, GetEntries*Fold*
-################################################################################
-def SetOrderStrings( OPT ):
-    if OPT.noo == "Newest":
-        OPT.order="order_by(File.year.desc(),File.month.desc(),File.day.desc(),Entry.name.desc())"
-        OPT.last_order="order_by(File.year,File.month,File.day,Entry.name)"
-        OPT.last_order_raw=f"f.year, f.month, f.day, e.name"
-    elif OPT.noo == "Oldest":
-        OPT.order="order_by(File.year,File.month,File.day,Entry.name)"
-        OPT.last_order="order_by(File.year.desc(),File.month.desc(),File.day.desc(),Entry.name.desc())"
-        OPT.last_order_raw=f"f.year desc, f.month desc, f.day desc, e.name desc"
-    elif OPT.noo == "Z to A":
-        OPT.order="order_by(Entry.name.desc())"
-        OPT.last_order="order_by(Entry.name)"
-        OPT.last_order_raw=f"e.name"
-    else:
-        # A to Z
-        OPT.order="order_by(Entry.name)"
-        OPT.last_order="order_by(Entry.name.desc())"
-        OPT.last_order_raw=f"e.name desc"
-    return
-
-################################################################################
-# /GetEntries -> helper function that Gets Entries for required files to show
-# for several routes (files_ip, files_sp, files_rbp, search, view_list)
-################################################################################
-def GetEntries( OPT ):
-    entries=[]
-
-    SetOrderStrings( OPT )
-    if OPT.path_type == 'Search' or (OPT.path_type == 'View' and OPT.orig_ptype=='Search'):
-        return GetEntriesInSearchView( OPT )
-
-    # if we are a view, then it will be of something else, e.g. a list of
-    # import, storage, or bin images, reset OPT.path_type so that the paths array below works
-    if 'View' in OPT.path_type:
-        eid = OPT.url[6:]
-        OPT.path_type= OPT.orig_ptype
-        
-    paths = []
-    if OPT.path_type == 'Storage':
-        path = SettingsSPath()
-    elif OPT.path_type == 'Import':
-        path = SettingsIPath()
-    elif OPT.path_type == 'Bin':
-        path = SettingsRBPath()
-
-    num_entries=0
-    path_cnt=1
-     
-    # if we have not set last_eid yet, then we need to 'reset' it during the
-    # path loop below (if we have more than one dir in (say) Import path)
-    if OPT.last_eid == 0 or OPT.folders:
-        update_last_eid = True
-    else:
-        update_last_eid = False
-    prefix = SymlinkName(OPT.path_type,path,path+'/')
    if OPT.folders:
-        tmp_ents, tmp_num_ents = GetEntriesInFolderView( OPT, prefix )
+        # start folder view with only the root folder
+        stmt=( select(Entry.id).join(EntryDirLink).filter(EntryDirLink.dir_eid==dir_id) )
    else:
-        tmp_ents, tmp_num_ents = GetEntriesInFlatView( OPT, prefix )
-    entries += tmp_ents
-    num_entries += tmp_num_ents
+        # get every File that is in the OPT.prefix Path
+        stmt=( 
+            select(Entry.id)
+            .join(File).join(EntryDirLink).join(Dir).join(PathDirLink).join(Path)
+            .where(Path.path_prefix == OPT.prefix) 
+        )

-    if update_last_eid:
-        # find pref... via path_type if we are here
-        OPT.num_entries=num_entries
-        pref=PA_UserState.query.filter(PA_UserState.pa_user_dn==current_user.dn,PA_UserState.path_type==OPT.path_type).first()
-        UpdatePref( pref, OPT )
-    return entries
+    stmt=stmt.order_by(*order_map.get(OPT.noo) )
+    query_data['entry_list']=db.session.execute(stmt).scalars().all()
+    return query_data

+################################################################################
+# /change_file_opts -> allow sort order, how_many per page, etc. to change, and 
+#     then send back the new query_data to update entryList 
+################################################################################
@app.route("/change_file_opts", methods=["POST"])
@login_required
 def change_file_opts():
-    # reset options based on form post, then redirect back to orig page (with a GET to allow back button to work)
-    OPT=States( request )
-    return redirect( request.referrer )
+    data = request.get_json()  # Parse JSON body
+    # allow dot-notation for OPT
+    OPT = SimpleNamespace(**data)
+    if hasattr(OPT, 'folders') and OPT.folders == 'True':
+        OPT.folders=True
+    else:
+        OPT.folders=False
+    # so create a new entryList, and handle that on the client
+    query_data = GetQueryData( OPT )
+    return make_response( jsonify( query_data=query_data ) )
+    

 ################################################################################
 # /file_list -> show detailed file list of files from import_path(s)
 ################################################################################
-@app.route("/file_list_ip", methods=["GET", "POST"])
+@app.route("/file_list_ip", methods=["GET"])
@login_required
 def file_list_ip():
    OPT=States( request )
-    # now we have reset the offset, etc. into the prefs, we can use a GET and this will be back/forward browser button safe
-    if request.method=='POST':
-        redirect("/file_list_ip")
-    entries=GetEntries( OPT )
-    return render_template("file_list.html", page_title='View File Details (Import Path)', entry_data=entries, OPT=OPT )
+    query_data = GetQueryData( OPT )
+    return render_template("file_list.html", page_title='View File Details (Import Path)', query_data=query_data, OPT=OPT )

 ################################################################################
 # /files -> show thumbnail view of files from import_path(s)
 ################################################################################
-@app.route("/files_ip", methods=["GET", "POST"])
+@app.route("/files_ip", methods=["GET"])
@login_required
 def files_ip():
    OPT=States( request )
-    # now we have reset the offset, etc. into the prefs, we can use a GET and this will be back/forward browser button safe
-    if request.method=='POST':
-        redirect("/files_ip")
-    entries=GetEntries( OPT )
-    people = Person.query.all()
-    move_paths = MovePathDetails()
-    return render_template("files.html", page_title=f"View Files ({OPT.path_type} Path)", entry_data=entries, OPT=OPT, people=people, move_paths=move_paths )
+    query_data = GetQueryData( OPT )
+    return render_template("files.html", page_title=f"View Files ({OPT.path_type} Path)", OPT=OPT, query_data=query_data )

 ################################################################################
 # /files -> show thumbnail view of files from storage_path
 ################################################################################
-@app.route("/files_sp", methods=["GET", "POST"])
+@app.route("/files_sp", methods=["GET"])
@login_required
 def files_sp():
    OPT=States( request )
-    # now we have reset the offset, etc. into the prefs, we can use a GET and this will be back/forward browser button safe
-    if request.method=='POST':
-        redirect("/files_sp")
-    entries=GetEntries( OPT )
-    people = Person.query.all()
-    move_paths = MovePathDetails()
-    return render_template("files.html", page_title=f"View Files ({OPT.path_type} Path)", entry_data=entries, OPT=OPT, people=people, move_paths=move_paths )
+    query_data = GetQueryData( OPT )
+    return render_template("files.html", page_title=f"View Files ({OPT.path_type} Path)", OPT=OPT, query_data=query_data )


 ################################################################################
 # /files -> show thumbnail view of files from recycle_bin_path
 ################################################################################
-@app.route("/files_rbp", methods=["GET", "POST"])
+@app.route("/files_rbp", methods=["GET"])
@login_required
 def files_rbp():
    OPT=States( request )
-    # now we have reset the offset, etc. into the prefs, we can use a GET and this will be back/forward browser button safe
-    if request.method=='POST':
-        redirect("/files_rbp")
-    entries=GetEntries( OPT )
-    people = Person.query.all()
-    move_paths = MovePathDetails()
-    return render_template("files.html", page_title=f"View Files ({OPT.path_type} Path)", entry_data=entries, OPT=OPT, move_paths=move_paths )
+    query_data = GetQueryData( OPT )
+    return render_template("files.html", page_title=f"View Files ({OPT.path_type} Path)", OPT=OPT, query_data=query_data )

 ################################################################################
 # search -> GET version -> has search_term in the URL and is therefore able to
@@ -450,19 +491,10 @@ def files_rbp():
@app.route("/search/<search_term>", methods=["GET", "POST"])
@login_required
 def search(search_term):
-#    print( f"req={request}" )
    OPT=States( request )
-#    print( f"OPT={OPT}" )
-
-    # if we posted to get here, its a change in State, so save it to pa_user_state, and go back to the GET version or URL
-    if request.method=="POST":
-        redirect("/search/"+search_term)
    OPT.search_term = search_term
-    # always show flat results for search to start with
-    OPT.folders=False
-    entries=GetEntries( OPT )
-    move_paths = MovePathDetails()
-    return render_template("files.html", page_title='View Files', search_term=search_term, entry_data=entries, OPT=OPT, move_paths=move_paths )
+    query_data=GetSearchQueryData( OPT )
+    return render_template("files.html", page_title='View Files', search_term=search_term, query_data=query_data, OPT=OPT )

 ################################################################################
 # /files/scan_ip -> allows us to force a check for new files
@@ -591,134 +623,29 @@ def move_files():
    return make_response( jsonify( job_id=job.id ) )

@login_required
-@app.route("/view_list", methods=["POST"])
-def view_list():
-    OPT=States( request )
-    # Get next/prev set of data - e.g. if next set, then it will use orig_url
-    # to go forward how_many from offset and then use viewer.html to show that
-    # first obj of the new list of entries
-    entries=GetEntries( OPT )
-    # this occurs when we went from the last image on a page (with how_many on
-    # it) and it just happened to also be the last in the DB...
-    if not entries:
-        SetFELog( message="DDP: DONT think this can happen anymore", level="danger", job=None, persistent=True, cant_close=True )
+@app.route("/view/", methods=["POST"])
+def view():
+    data = request.get_json()  # Parse JSON body
+    eid = data.get('eid', 0)  # Extract list of ids
       
-        # undo the skip by how_many and getentries again
-        OPT.offset -= int(OPT.how_many)
-        entries=GetEntries( OPT )
-        # now flag we are at the last in db, to reset current below
-    objs = {}
-    eids=""
-    resp={}
-    resp['objs']={}
-    for e in entries:
-        if not e.file_details:
-            continue
-        eids=eids+f"{e.id},"
-        resp['objs'][e.id]={}
-        resp['objs'][e.id]['url'] = e.FullPathOnFS()
-        resp['objs'][e.id]['name'] = e.name
-        resp['objs'][e.id]['type'] = e.type.name
-        if e.file_details.faces:
-            # model is used for whole file, so set it at that level (based on first face)
-            resp['objs'][e.id]['face_model'] = e.file_details.faces[0].facefile_lnk.model_used
-            resp['objs'][e.id]['faces'] = []
+    stmt = (
+        select(Entry)
+        .options(
+            joinedload(Entry.file_details).joinedload(File.faces),
+            joinedload(Entry.file_details).joinedload(File.faces).joinedload(Face.refimg).joinedload(Refimg.person)
+        )
+        .where(Entry.id == eid)
+    )

-            # put face data back into array format (for js processing)
-            for face in e.file_details.faces:
-                fd= {}
-                fd['x'] = face.face_left
-                fd['y'] = face.face_top
-                fd['w'] = face.w
-                fd['h'] = face.h
-                if face.refimg:
-                    fd['pid'] = face.refimg.person.id
-                    fd['who'] = face.refimg.person.tag
-                    fd['distance'] = round(face.refimg_lnk.face_distance,2)
-                resp['objs'][e.id]['faces'].append(fd)
-
-    eids=eids.rstrip(",")
-    lst = eids.split(',')
-    if 'next' in request.form:
-        OPT.current = int(lst[0])
-    if 'prev' in request.form:
-        OPT.current = int(lst[-1])
-    
-    resp['current']=OPT.current
-    # OPT.first_eid can still be 0 IF we have gone past the first page, I could
-    # better set this in states rather than kludge this if... think about it
-    if OPT.first_eid>0:
-        resp['first_eid']=OPT.first_eid
-    resp['last_eid']=OPT.last_eid
-    resp['eids']=eids
-    resp['offset']=OPT.offset
-#    print( f"BUG-DEBUG: /view_list route #1 - OPT={OPT}, eids={eids} ")
-    # save pref to keep the new current value, first/last
-    pref=PA_UserState.query.filter(PA_UserState.pa_user_dn==current_user.dn,PA_UserState.orig_ptype==OPT.orig_ptype,PA_UserState.view_eid==OPT.view_eid).first()
-#    print( f"BUG-DEBUG: /view_list route #2 - OPT={OPT}, eids={eids} ")
-    UpdatePref( pref, OPT )
-#    print( f"BUG-DEBUG: /view_list route #3 - OPT={OPT}, eids={eids} ")
-
-    return make_response( resp )
-
-################################################################################
-# /view/id -> grabs data from DB and views it (GET)
-################################################################################
-@login_required
-@app.route("/view/<id>", methods=["GET"])
-def view(id):
-    OPT=States( request )
-    objs = {}
-    entries=GetEntries( OPT )
-    eids=""
-    for e in entries:
-        objs[e.id]=e
-        eids += f"{e.id},"
-        # if this is a dir, we wont view it with a click anyway, so move on...
-        if not e.file_details:
-            continue
-        # process any overrides
-        for face in e.file_details.faces:
-            # now get any relevant override and store it in objs...
-            fnmo = FaceNoMatchOverride.query.filter(FaceNoMatchOverride.face_id==face.id).first()
-            if fnmo:
-                face.no_match_override=fnmo
-            mo = FaceForceMatchOverride.query.filter(FaceForceMatchOverride.face_id==face.id).first()
-            if mo:
-                mo.type = FaceOverrideType.query.filter( FaceOverrideType.name== 'Manual match to existing person' ).first()
-                face.manual_override=mo
-
-    eids=eids.rstrip(",")
-    # jic, sometimes we trip this, and rather than show broken pages / destroy
-    if id not in eids:
-        SetFELog( message=f"ERROR: viewing an id, but its not in eids OPT={OPT}, id={id}, eids={eids}", level="danger", persistent=True, cant_close=False)
-        msg="Sorry, viewing data is confused, cannot view this image now"
-        if os.environ['ENV'] == "production":
-            msg += "Clearing out all states.  This means browser back buttons will not work, please start a new tab and try again"
-            PA_UserState.query.delete()
-            db.session.commit()
-        SetFELog( msg, "warning", persistent=True, cant_close=False )
-        return redirect("/")
-    else:
-        NMO_data = FaceOverrideType.query.all()
-        setting = Settings.query.first()
-        imp_path = setting.import_path
-        st_path  = setting.storage_path
-        bin_path = setting.recycle_bin_path
-#        print( f"BUG-DEBUG: /view/id GET route - OPT={OPT}, eids={eids}, current={int(id)} ")
-        return render_template("viewer.html", current=int(id), eids=eids, objs=objs, OPT=OPT, NMO_data=NMO_data, imp_path=imp_path, st_path=st_path, bin_path=bin_path )
-
-##################################################################################
-# /view/id -> grabs data from DB and views it (POST -> set state, redirect to GET)
-##################################################################################
-@app.route("/view/<id>", methods=["POST"])
-@login_required
-def view_img_post(id):
-    # set pa_user_states...
-    OPT=States( request )
-#    print( f"BUG-DEBUG: /view/id POST route - OPT={OPT}, id={id} ")
-    # then use back-button friendly URL (and use pa_user_states to view the right image in the right list
-    return redirect( "/view/" + id );
+    # this needs unique() because:
+    #   entry (one row for id=660)
+    #   file (one row, since file_details is a one-to-one relationship)
+    #   face (many rows, since a file can have many faces)
+    #   refimg and person (one row per face, via the link tables)
+    #   The SQL query returns a Cartesian product for the joins involving collections (like faces). For example, if your file has 3 faces, 
+    #   the result set will have 3 rows, each with the same entry and file data, but different face, refimg, and person data.
+    data=db.session.execute(stmt).unique().scalars().all()
+    return jsonify(entries_schema.dump(data))

 # route called from front/end - if multiple images are being transformed, each transorm == a separate call
 # to this route (and therefore a separate transorm job.  Each reponse allows the f/e to check the
@@ -783,14 +710,6 @@ def _jinja2_filter_toplevelfolderof(path, cwd):
    else:
        return False

-###############################################################################
-# This func creates a new filter in jinja2 to test to hand back the parent path
-# from a given path
-################################################################################
-@app.template_filter('ParentPath')
-def _jinja2_filter_parentpath(path):
-    return os.path.dirname(path)
-
 ###############################################################################
 # route to allow the Move Dialog Box to pass a date (YYYYMMDD) and returns a 
 # json list of existing dir names that could be near it in time.   Starting
--- a/internal/js/files_support.js
+++ b/internal/js/files_support.js
@@ -1,3 +1,24 @@
+// GLOBAL ICON array
+ICON={}
+ICON["Import"]="import"
+ICON["Storage"]="db"
+ICON["Bin"]="trash"
+
+// function called when we get another page from inside the files view
+function getPageFigures(res, viewingIdx)
+{
+    // add all the figures to files_div
+    drawPageOfFigures()
+}
+
+// function called when we get another page from inside the viewer
+function getPageViewer(res, viewingIdx)
+{
+    document.viewing=document.entries[viewingIdx]
+    // update viewing, arrows and image/video too
+    ViewImageOrVideo()
+}
+
 // grab all selected thumbnails and return a <div> containing the thumbnails
 // with extra yr and date attached as attributes so we can set the default
 // dir name for a move directory - not used in del, but no harm to include them
@@ -88,7 +109,7 @@ function MoveOrDelCleanUpUI()

 // show the DBox for a move file, includes all thumbnails of selected files to move
 // and a pre-populated folder to move them into, with text field to add a suffix
-function MoveDBox(path_details, db_url)
+function MoveDBox(path_details)
 {
    $('#dbox-title').html('Move Selected File(s) to new directory in Storage Path')  
    div =`
@@ -98,12 +119,12 @@ function MoveDBox(path_details, db_url)
        <form id="mv_fm" class="form form-control-inline col-12">
        <input id="move_path_type" name="move_path_type" type="hidden"
        `
-    div += ' value="' + path_details[0].type + '"></input>'
+    div += ' value="' + path_details[0].type.name + '"></input>'
    div+=GetSelnAsDiv()
    yr=$('.highlight').first().attr('yr')
    dt=$('.highlight').first().attr('date')
    div+='<div class="row">Use Existing Directory (in the chosen path):</div><div id="existing"></div>'
-    GetExistingDirsAsDiv( dt, "existing", path_details[0].type )
+    GetExistingDirsAsDiv( dt, "existing", path_details[0].type.name )
    div+=`
        <div class="input-group my-3">
        <alert class="alert alert-primary my-auto py-1">
@@ -112,7 +133,7 @@ function MoveDBox(path_details, db_url)
    div+= '<svg id="move_path_icon" width="20" height="20" fill="currentColor"><use xlink:href="' + path_details[0].icon_url + '"></svg>'
    div+= '<select id="rp_sel" name="rel_path" class="text-primary alert-primary py-1 border border-primary rounded" onChange="change_rp_sel()">'
    for(p of path_details) {
-        div+= '<option path_type="'+p.type+'" icon_url="'+p.icon_url+'">'+p.path+'</option>'
+        div+= '<option path_type="'+p.type.name+'" icon_url="'+p.icon_url+'">'+p.root_dir+'</option>'
    }
    div+= '</select>'
    div+=`
@@ -200,20 +221,6 @@ function DetailsDBox()
 }


-// function to change the size of thumbnails (and resets button bar to newly
-// selected size)
-function ChangeSize(clicked_button,sz)
-{
-	$('.sz-but.btn-info').removeClass('btn-info text-white').addClass('btn-outline-info')
-	$(clicked_button).addClass('btn-info text-white').removeClass('btn-outline-info')
-	$('.thumb').attr( {height: sz, style: 'font-size:'+sz+'px' } )
-	$('#size').val(sz)
-    sz=sz-22
-    $('.svg').height(sz);
-    $('.svg').width(sz);
-    $('.svg_cap').width(sz);
-}
-
 // DoSel is called when a click event occurs, and sets the selection via adding
 // 'highlight' to the class of the appropriate thumbnails
 // e == event (can see if shift/ctrl held down while left-clicking
@@ -316,3 +323,605 @@ function NoSel() {
    else
        return true
 }
+
+/**
+ * Renders a group header or entry based on the object and options.
+ * @param {Object} obj - The object containing file/directory details.
+ * @param {Object} last - Tracks the last printed group (e.g., { printed: null }).
+ * @param {Object} ecnt - Entry counter (e.g., { val: 0 }).
+ * @returns {string} - Generated HTML string.
+ */
+function addFigure( obj, last, ecnt) 
+{
+  let html = "";
+
+  // Grouping logic
+  if (OPT.grouping === "Day") {
+    if (last.printed !== obj.file_details.day) {
+      html += `<div class="row ps-3"><h6>Day: ${obj.file_details.day} of ${obj.file_details.month}/${obj.file_details.year}</h6></div>`;
+      last.printed = obj.file_details.day;
+    }
+  } else if (OPT.grouping === "Week") {
+    if (last.printed !== obj.file_details.woy) {
+      html += `<div class="row ps-3"><h6>Week #: ${obj.file_details.woy} of ${obj.file_details.year}</h6></div>`;
+      last.printed = obj.file_details.woy;
+    }
+  } else if (OPT.grouping === "Month") {
+    if (last.printed !== obj.file_details.month) {
+      html += `<div class="row ps-3"><h6>Month: ${obj.file_details.month} of ${obj.file_details.year}</h6></div>`;
+      last.printed = obj.file_details.month;
+    }
+  }
+
+  // Image/Video/Unknown entry
+  if (obj.type.name === "Image" || obj.type.name === "Video" || obj.type.name === "Unknown") {
+    if (!OPT.folders || isTopLevelFolder(obj.in_dir.in_path.path_prefix + '/' + obj.in_dir.rel_path + '/' + obj.name, OPT.cwd)) {
+      const pathType = obj.in_dir.in_path.type.name;
+      const size = obj.file_details.size_mb;
+      const hash = obj.file_details.hash;
+      const inDir = `${obj.in_dir.in_path.path_prefix}/${obj.in_dir.rel_path}`;
+      const fname = obj.name;
+      const yr = obj.file_details.year;
+      const date = `${yr}${String(obj.file_details.month).padStart(2, '0')}${String(obj.file_details.day).padStart(2, '0')}`;
+      const prettyDate = `${obj.file_details.day}/${obj.file_details.month}/${obj.file_details.year}`;
+      const type = obj.type.name;
+
+      html += `
+        <figure id="${obj.id}" ecnt="${ecnt}" class="col col-auto g-0 figure entry m-1"
+                path_type="${pathType}" size="${size}" hash="${hash}" in_dir="${inDir}"
+                fname="${fname}" yr="${yr}" date="${date}" pretty_date="${prettyDate}" type="${type}">
+          ${renderMedia(obj)}
+        </figure>
+      `;
+    }
+  }
+  // Directory entry
+  else if (obj.type.name === "Directory" && OPT.folders) {
+    const dirname = obj.dir_details.rel_path.length
+      ? `${obj.dir_details.in_path.path_prefix}/${obj.dir_details.rel_path}`
+      : obj.dir_details.in_path.path_prefix;
+
+    if (isTopLevelFolder(dirname, OPT.cwd)) {
+      html += `
+        <figure class="col col-auto g-0 dir entry m-1" id="${obj.id}" ecnt="${ecnt}" dir="${dirname}" type="Directory">
+          <svg class="svg" width="${OPT.size - 22}" height="${OPT.size - 22}" fill="currentColor">
+            <use xlink:href="/internal/icons.svg#Directory"></use>
+          </svg>
+          <figcaption class="svg_cap figure-caption text-center text-wrap text-break">${obj.name}</figcaption>
+        </figure>
+      `;
+      html += `<script>f=$('#${obj.id}'); w=f.find('svg').width(); f.find('figcaption').width(w);</script>`;
+    }
+  }
+
+  $('#figures').append( html )
+  return
+}
+
+// Helper function to render media (image/video/unknown)
+function renderMedia(obj) {
+  const isImageOrUnknown = obj.type.name === "Image" || obj.type.name === "Unknown";
+  const isVideo = obj.type.name === "Video";
+  const path = `${obj.in_dir.in_path.path_prefix}/${obj.in_dir.rel_path}/${obj.name}`;
+  const thumb = obj.file_details.thumbnail
+    ? `<a href="${path}"><img alt="${obj.name}" class="thumb" height="${OPT.size}" src="data:image/jpeg;base64,${obj.file_details.thumbnail}"></a>`
+    : `<a href="${path}"><svg width="${OPT.size}" height="${OPT.size}" fill="white"><use xlink:href="/internal/icons.svg#unknown_ftype"/></svg></a>`;
+
+  let mediaHtml = `<div style="position:relative; width:100%">${thumb}`;
+
+  if (isImageOrUnknown) {
+    if (OPT.search_term) {
+      mediaHtml += `
+        <div style="position:absolute; bottom: 0px; left: 2px;">
+          <svg width="16" height="16" fill="white"><use xlink:href="/internal/icons.svg#${getLocationIcon(obj)}"/></svg>
+        </div>
+      `;
+    }
+    mediaHtml += `
+      <div id="s${obj.id}" style="display:none; position:absolute; top: 50%; left:50%; transform:translate(-50%, -50%);">
+        <img height="64px" src="/internal/throbber.gif">
+      </div>
+    `;
+  } else if (isVideo) {
+    mediaHtml += `
+      <div style="position:absolute; top: 0px; left: 2px;">
+        <svg width="16" height="16" fill="white"><use xlink:href="/internal/icons.svg#film"/></svg>
+      </div>
+    `;
+    if (OPT.search_term) {
+      mediaHtml += `
+        <div style="position:absolute; bottom: 0px; left: 2px;">
+          <svg width="16" height="16" fill="white"><use xlink:href="/internal/icons.svg#${getLocationIcon(obj)}"/></svg>
+        </div>
+      `;
+    }
+  }
+
+  mediaHtml += `</div>`;
+  return mediaHtml;
+}
+
+// Helper: Check if path is a top-level folder of cwd
+function isTopLevelFolder(path, cwd) {
+  // Implement your logic here
+  return true; // Placeholder
+}
+
+// Helper: Get location icon (placeholder)
+function getLocationIcon(obj) {
+    return ICON[obj.in_dir.in_path.type.name]
+}
+
+// POST to get entry ids, and then getPage for a specified directory
+function getDirEntries(dir_id, back)
+{
+    data={}
+    data.dir_id=dir_id
+    data.back=back
+
+    $.ajax({
+        type: 'POST',
+        url: '/get_dir_entries',
+        data: JSON.stringify(data),
+        contentType: 'application/json',
+        dataType: 'json',
+        success: function(res) {
+            document.entries=res
+            // rebuild entryList/pageList as each dir comes with new entries
+            entryList=res.map(obj => obj.id);
+            pageList=entryList.slice(0, OPT.how_many)
+            if( back )
+                document.back_id = res[0].in_dir.eid
+            drawPageOfFigures()
+        },
+        error: function(xhr, status, error) {
+            console.error("Error:", error);
+        }
+    });
+}
+
+// this function draws all the figures from document.entries - called when we
+// change pages, but also when we change say grouping/other OPTs
+function drawPageOfFigures()
+{
+    $('#figures').empty()
+    var last = { printed: null }
+    var ecnt=0
+
+    if( OPT.folders )
+    {
+        if( (document.entries.length && document.entries[0].in_dir.rel_path == '' ) || OPT.root_eid == 0 )
+        {
+            gray="_gray"
+            back=""
+            cl=""
+        }
+        else
+        {
+            gray=""
+            back="Back"
+            cl="back"
+        }
+        // back button, if gray/back decide if we see grayed out folder and/or the name of the folder we go back to
+        html=`<div class="col col-auto g-0 m-1">
+                <figure id="${document.back_id}" ecnt="0" class="${cl} entry m-1" type="Directory">
+                    <svg class="svg" width="${OPT.size-22}" height="${OPT.size-22}">
+                        <use xlink:href="internal/icons.svg#folder_back${gray}"/>
+                    </svg>
+                    <figcaption class="figure-caption text-center">${back}</figcaption>
+                </figure>
+             </div>`
+        ecnt++
+        $('#figures').append(html)
+    }
+    for (const obj of document.entries) {
+        addFigure( obj, last, ecnt )
+        ecnt++
+    }
+    if( document.entries.length == 0 )
+        if( OPT.search_term )
+            $('#figures').append( `<span class="alert alert-danger p-2 col-auto"> No matches for: '${OPT.search_term}'</span>` )
+        else if( OPT.root_eid == 0 )
+            $('#figures').append( `<span class="alert alert-danger p-2 col-auto d-flex align-items-center">No files in Path!</span>` )
+    $('.figure').click( function(e) { DoSel(e, this ); SetButtonState(); return false; });
+    $('.figure').dblclick( function(e) { dblClickToViewEntry( $(this).attr('id') ); setDisabledForViewingNextPrevBttons(); addViewerKeyHandler() } )
+    // for dir, getDirEntries 2nd param is back (or "up" a dir)
+    $(".dir").click( function(e) { document.back_id=this.id; getDirEntries(this.id,false) } )
+    $(".back").click( function(e) { getDirEntries(this.id,true) } )
+}
+
+function getPageFileList(res, viewingIdx)
+{
+    $('#file_list_div').empty()
+    if( OPT.root_eid == 0 )
+    {
+        $('#file_list_div').append( `<span class="alert alert-danger p-2">No files in Path!</span>` )
+        return
+    }
+    html='<table class="table table-striped table-sm col-12">'
+    html+='<thead><tr class="table-primary"><th>Name</th><th>Size (MB)</th><th>Path Prefix</th><th>Hash</th></tr></thead><tbody>'
+    for (const obj of res) {
+        html+=`<tr>
+                <td>
+                <div class="d-flex align-items-center">
+                  <a href="${obj.in_dir.in_path.path_prefix}/${obj.in_dir.rel_path}/${obj.name}">
+                    <img class="img-fluid me-2" style="max-width: 100px;"
+                      src="data:image/jpeg;base64,${obj.file_details.thumbnail}"></img>
+                  </a>
+                  <span>${obj.name}</span>
+                </div>
+                <td>${obj.file_details.size_mb}</td>
+                <td>${obj.in_dir.in_path.path_prefix.replace("static/","")}/${obj.in_dir.rel_path}</td>
+                <td>${obj.file_details.hash}</td>
+             </tr>`
+    }
+    html+='</tbody></table>'
+    $('#file_list_div').append(html)
+}
+
+// Function to get the 'page' of entry ids out of entryList
+function getPage(pageNumber, successCallback, viewingIdx=0)
+{
+    // before we do anything, disabled left/right arrows on viewer to stop
+    // getting another event before we have the data for the page back
+    $('#la').prop('disabled', true)
+    $('#ra').prop('disabled', true)
+    const startIndex = (pageNumber - 1) * OPT.how_many;
+    const endIndex = startIndex + OPT.how_many;
+    pageList = entryList.slice(startIndex, endIndex);
+
+    // set up data to send to server to get the entry data for entries in pageList
+    data={}
+    data.ids = pageList
+
+    $.ajax({
+        type: 'POST', url: '/get_entries_by_ids',
+        data: JSON.stringify(data), contentType: 'application/json',
+        dataType: 'json',
+        success: function(res) { 
+            document.entries=res;
+            successCallback(res,viewingIdx); 
+            resetNextPrevButtons()
+            // if search, disable folders
+            if( OPT.search_term )
+                 $('#folders').prop('disabled', 'disabled').removeClass('border-info').addClass('border-secondary').removeClass('text-info').addClass('text-secondary');
+            else if( res == [] )
+            {
+                html=`<span class="alert alert-danger p-2 col-auto">No files in Path!'</span>`
+                console.log(html)
+                $('#file_list_div').append(html)
+                $('#files_div').append(html)
+            }
+        },
+        error: function(xhr, status, error) { console.error("Error:", error); } });
+    return
+}
+
+// Quick Function to check if we are on the first page
+function isFirstPage(pageNumber) 
+{
+    return pageNumber <= 1;
+}
+
+// Function to check if we are on the last page
+function isLastPage(pageNumber) 
+{
+    const totalPages = Math.ceil(entryList.length / OPT.how_many);
+    return pageNumber >= totalPages;
+}
+
+// given an id in the list, return which page we are on (page 1 is first page)
+function getPageNumberForId(id) {
+    const idx = entryList.indexOf(id);
+    // should be impossible but jic
+    if (idx === -1) { return -1 }
+    return Math.floor(idx / OPT.how_many) + 1;
+}
+
+// if we are on first page, disable prev, it not ensure next is enabled
+// if we are on last page, disable next, it not ensure prev is enabled
+function resetNextPrevButtons()
+{
+    // no data, so disabled both
+    if( getPageNumberForId(pageList[0]) == -1 )
+    {
+        $('.prev').prop('disabled', true).addClass('disabled');
+        $('.next').prop('disabled', true).addClass('disabled');
+        return
+    }
+    if ( isFirstPage( getPageNumberForId(pageList[0]) ) )
+        $('.prev').prop('disabled', true).addClass('disabled');
+    else
+        $('.prev').prop('disabled', false).removeClass('disabled');
+
+    if ( isLastPage( getPageNumberForId(pageList[0]) ) )
+        $('.next').prop('disabled', true).addClass('disabled');
+    else
+        $('.next').prop('disabled', false).removeClass('disabled');
+}
+
+// get list of eids for the next page, also make sure next/prev buttons make sense for page we are on
+function nextPage(successCallback)
+{
+    // pageList[0] is the first entry on this page
+    const currentPage=getPageNumberForId( pageList[0] )
+    // should never happen / just return pageList unchanged
+    if ( currentPage === -1 || isLastPage( currentPage ) )
+    {
+        console.error( "WARNING: seems first on pg=" + firstEntryOnPage + " of how many=" + OPT.how_many + " gives currentPage=" + currentPage + " and we cant go next page?" )
+        return
+    }
+    getPage( currentPage+1, successCallback )
+    return
+}
+
+// get list of eids for the prev page, also make sure next/prev buttons make sense for page we are on
+function prevPage(successCallback)
+{
+    // pageList[0] is the first entry on this page
+    const currentPage=getPageNumberForId( pageList[0] )
+    // should never happen / just return pageList unchanged
+    if (currentPage === 1 || currentPage === -1 )
+    {
+        console.error( "WARNING: seems first on pg=" + firstEntryOnPage + " of how many=" + OPT.how_many + " gives currentPage=" + currentPage + " and we cant go prev page?" )
+        return
+    }
+    getPage( currentPage-1, successCallback )
+    return
+}
+
+// function to see if we are on a phone or tablet (where we dont have ctrl or shift keys - helps to display fake buttons to allow multiselect on mobiles)
+function isMobile() {
+    try{ document.createEvent("TouchEvent"); return true; }
+    catch(e){ return false; }
+}
+
+// when we change one of the options (noo, how_many, folders) - then update '{how_many} files' str,
+// tweak noo menu for folders/flat view then reset the page contents based on current OPT values
+function changeOPT(successCallback) {
+    OPT.how_many=$('#how_many').val()
+    new_f=$('#folders').val()
+    new_f=( new_f == 'True' )
+    // if change to/from folders, also fix the noo menu
+    if( new_f != OPT.folders )
+    {
+        if( new_f )
+        {
+            $('#noo option:lt(2)').prop('disabled', true);
+            $('#noo').val(OPT.default_folder_noo)
+        }
+        else
+        {
+            $('#noo option:lt(2)').prop('disabled', false);
+            $('#noo').val(OPT.default_flat_noo)
+        }
+    }
+    OPT.noo=$('#noo').val()
+    OPT.folders=new_f
+    OPT.folders=$('#folders').val()
+    OPT.grouping=$('#grouping').val()
+    OPT.size=$('input[name="size"]:checked').val();
+    $.ajax({
+        type: 'POST',
+        url: '/change_file_opts',
+        data: JSON.stringify(OPT),
+        contentType: 'application/json',
+        success: function(resp) {
+            entryList=resp.query_data.entry_list
+            // put data back into booleans, ints, etc
+            OPT.folders=( OPT.folders == 'True' )
+            OPT.how_many=parseInt(OPT.how_many)
+            console.log('OPT.size='+OPT.size)
+            $('.how_many_text').html( `&nbsp;${OPT.how_many} files&nbsp;` )
+            OPT.root_eid=parseInt(OPT.root_eid)
+            OPT.size=parseInt(OPT.size)
+            getPage(1,successCallback)
+        }
+    })
+}
+
+// function to change the size of thumbnails when user clicks xs/s/m/l/xl buttons
+function changeSize()
+{
+    sz=$('input[name="size"]:checked').val();
+    OPT.size=sz
+	$('.thumb').attr( {height: sz, style: 'font-size:'+sz+'px' } )
+	$('#size').val(sz)
+    sz=sz-22
+    $('.svg').height(sz);
+    $('.svg').width(sz);
+    $('.svg_cap').width(sz);
+}
+
+
+function getPreviousEntry() {
+    var currentIndex = entryList.indexOf(document.viewing.id);
+
+    oldPageOffset=Math.floor(currentIndex / OPT.how_many) 
+    if (currentIndex > 0) {
+        currentIndex--;
+        pageOffset=Math.floor(currentIndex / OPT.how_many)
+        currentIndex=currentIndex-(pageOffset*OPT.how_many)
+        // pref page, load it
+        if( oldPageOffset != pageOffset )
+            // pref page is pageOffset+1 now
+            getPage(pageOffset+1,getPageViewer,currentIndex)
+        else
+            document.viewing=document.entries[currentIndex]
+    }
+}
+
+function getNextEntry() {
+    var currentIndex = entryList.indexOf(document.viewing.id);
+
+    oldPageOffset=Math.floor(currentIndex / OPT.how_many) 
+    if (currentIndex < entryList.length - 1) {
+        currentIndex++
+        pageOffset=Math.floor(currentIndex / OPT.how_many) 
+        currentIndex=currentIndex-(pageOffset*OPT.how_many)
+        // next page, load it
+        if( oldPageOffset != pageOffset )
+            // next page is pageOffset+1 now
+            getPage(pageOffset+1,getPageViewer,currentIndex)
+        else
+            document.viewing=document.entries[currentIndex]
+    }
+}
+
+function entryIsAtStart() {
+    return document.viewing.id === entryList[0];
+}
+
+function entryIsAtEnd() {
+    return document.viewing.id === entryList[entryList.length - 1];
+}
+
+function setEntryById(id) {
+    var currentIndex = entryList.indexOf(parseInt(id));
+    // if we are on a different page, adjust as document.entries only has <= how_many
+    pageOffset=Math.floor(currentIndex / OPT.how_many) 
+    currentIndex = currentIndex-(pageOffset*OPT.how_many)
+    document.viewing=document.entries[currentIndex]
+}
+
+function setDisabledForViewingNextPrevBttons()
+{
+    $('#la').attr('disabled', entryIsAtStart());
+    $('#ra').attr('disabled', entryIsAtEnd());
+}
+
+function addViewerKeyHandler() {
+    // allow a keypress on the viewer_div
+    $(document).keydown(function(event) {
+        // if dbox is visible, dont process this hot-key, we are inputting text
+        // into inputs instead
+        if( $("#dbox").is(':visible') )
+            return
+        switch (event.key) 
+        {
+            case "Left": // IE/Edge specific value
+            case "ArrowLeft":
+                if( $('#la').prop('disabled') == false )
+                    $('#la').click()
+                break;
+            case "Right": // IE/Edge specific value
+            case "ArrowRight":
+                if( $('#ra').prop('disabled') == false )
+                    $('#ra').click()
+                break;
+            case "d":
+                $('#distance').click()
+                break;
+            case "f":
+                $('#faces').click()
+                break;
+            case "n":
+                $('#fname_toggle').click()
+                break;
+            case "F":
+                fullscreen=!document.fullscreen
+                ViewImageOrVideo()
+                break;
+            case "l":
+                JoblogSearch()
+                break;
+            case "Delete":
+                $('#del').click()
+            default:
+                return; // Quit when this doesn't handle the key event.
+        }
+    });
+}
+
+$(document).on('click', function(e) { $('.highlight').removeClass('highlight') ; SetButtonState() });
+
+function dblClickToViewEntry(id) {
+    $('#files_div').addClass('d-none')
+    $('#viewer_div').removeClass('d-none')
+    setEntryById( id )
+    ViewImageOrVideo()
+}
+
+
+// different context menu on files
+$.contextMenu({
+    selector: '.entry',
+    itemClickEvent: "click",
+    build: function($triggerElement, e) {
+        // when right-clicking & no selection add one OR deal with ctrl/shift right-lick as it always changes seln
+        if( NoSel() || e.ctrlKey || e.shiftKey )
+        {
+            DoSel(e, e.currentTarget )
+            SetButtonState();
+        }
+
+        if( FiguresOrDirsOrBoth() == "figure" )
+        {
+            item_list = {
+                details: { name: "Details..." },
+                view: { name: "View File" },
+                sep: "---",
+            }
+            if( e.currentTarget.getAttribute('type') == 'Image' )
+            {
+                item_list['transform'] = {
+                    name: "Transform",
+                    items: {
+                        "r90": { "name" : "Rotate 90 degrees" },
+                        "r180": { "name" : "Rotate 180 degrees" },
+                        "r270": { "name" : "Rotate 270 degrees" },
+                        "fliph": { "name" : "Flip horizontally" },
+                        "flipv": { "name" : "Flip vertically" }
+                    }
+                }
+
+            }
+            item_list['move'] = { name: "Move selected file(s) to new folder" }
+            item_list['sep2'] = { sep: "---" }
+        }
+        else
+            item_list = {
+                move: { name: "Move selection(s) to new folder" }
+            }
+
+        item_list['ai'] = {
+            name: "Scan file for faces",
+            items: {
+                "ai-all": { name: "all" }
+            }
+        };
+
+        // Dynamically add entries for each person in the `people` array
+        people.forEach(person => {
+            item_list['ai'].items[`ai-${person.tag}`] = { name: person.tag };
+        });
+
+        if( SelContainsBinAndNotBin() ) {
+            item_list['both']= { name: 'Cannot delete and restore at same time', disabled: true }
+        } else {
+            if (e.currentTarget.getAttribute('path_type') == 'Bin' )
+                item_list['undel']= { name: "Restore selected file(s)" }
+            else if( e.currentTarget.getAttribute('type') != 'Directory' )
+                item_list['del']= { name: "Delete Selected file(s)" }
+        }
+
+        return {
+            callback: function( key, options) {
+                if( key == "details" ) { DetailsDBox() }
+                if( key == "view" ) { dblClickToViewEntry( $(this).attr('id') ) }
+                if( key == "move" ) { MoveDBox(move_paths) }
+                if( key == "del"  ) { DelDBox('Delete') }
+                if( key == "undel") { DelDBox('Restore') }
+                if( key == "r90"  ) { Transform(90) }
+                if( key == "r180" ) { Transform(180) }
+                if( key == "r270" ) { Transform(270) }
+                if( key == "fliph" ) { Transform("fliph") }
+                if( key == "flipv" ) { Transform("flipv") }
+                if( key.startsWith("ai")) { RunAIOnSeln(key) }
+                // dont flow this event through the dom
+                e.stopPropagation()
+            },
+            items: item_list
+        };
+    }
+});
--- a/internal/js/files_transform.js
+++ b/internal/js/files_transform.js
@@ -1,13 +1,5 @@
-// POST to a check URL, that will tell us if the transformation has completed,
-// if not, try again in 1 second... If it has finished then reset the thumbnail
-// to full colour, put it back to being an entry and reset the thumbnail to the
-// newly created one that was sent back in the response to the POST
-function CheckTransformJob(id,job_id)
+function handleTransformFiles(data,id,job_id)
 {
-    CheckForJobs()
-    $.ajax(
-        {
-            type: 'POST', data: '&job_id='+job_id, url: '/check_transform_job', success: function(data) { 
    if( data.finished )
    {
        $('#s'+id).hide()
@@ -18,10 +10,38 @@ function CheckTransformJob(id,job_id)
    }
    else
    {
-                    setTimeout( function() { CheckTransformJob(id,job_id) }, 1000,id, job_id ); 
+        setTimeout( function() { CheckTransformJob(id,job_id,handleTransformFiles) }, 1000,id, job_id );
    }
-            }, 
-        } )
+}
+
+// POST to a check URL, that will tell us if the transformation has completed,
+// if not, try again in 1 second... If it has finished then reset the thumbnail
+// to full colour, put it back to being an entry and reset the thumbnail to the
+// newly created one that was sent back in the response to the POST
+function handleTransformViewing(data,id,job_id)
+{
+    if( data.finished )
+    {
+        // stop throbber, remove grayscale & then force reload with timestamped version of im.src
+        grayscale=0
+        throbber=0
+        im.src=im.src + '?t=' + new Date().getTime();
+        return false;
+    }
+    else
+    {
+        setTimeout( function() { CheckTransformJob(id,job_id,handleTransformViewing) }, 1000,id, job_id );
+    }
+}
+
+// POST to a check URL, that will tell us if the transformation has completed,
+// if not, try again in 1 second... If it has finished then reset the thumbnail
+// to full colour, put it back to being an entry and reset the thumbnail to the
+// newly created one that was sent back in the response to the POST
+function CheckTransformJob(id,job_id,successCallback)
+{
+    CheckForJobs()
+    $.ajax( { type: 'POST', data: '&job_id='+job_id, url: '/check_transform_job', success: function(res) { successCallback(res,id,job_id); } } )
 }

 // for each highlighted image, POST the transform with amt (90, 180, 270,
@@ -31,9 +51,20 @@ function CheckTransformJob(id,job_id)
 // to finish
 function Transform(amt)
 {
+    // we are in the viewer with 1 image only...
+    if( document.viewing )
+    {
+        post_data = '&amt='+amt+'&id='+document.viewing.id
+        // send /transform for this image, grayscale the thumbmail, add color spinning wheel overlay, and start checking for job end
+        $.ajax({ type: 'POST', data: post_data, url: '/transform', success: function(data) { grayscale=1; throbber=1; DrawImg(); CheckTransformJob(document.viewing.id,data.job_id,handleTransformViewing); return false; } })
+    }
+    else
+    {
        $('.highlight').each(function( id, e ) {
            post_data = '&amt='+amt+'&id='+e.id
            // send /transform for this image, grayscale the thumbmail, add color spinning wheel overlay, and start checking for job end
-        $.ajax({ type: 'POST', data: post_data, url: '/transform', success: function(data){ $('#'+e.id).find('img.thumb').attr('style', 'filter: grayscale(100%);' ); $('#'+e.id).removeClass('entry'); $('#s'+e.id).show(); CheckTransformJob(e.id,data.job_id); return false; } })
+            $.ajax({ type: 'POST', data: post_data, url: '/transform', success: function(data){ $('#'+e.id).find('img.thumb').attr('style', 'filter: grayscale(100%);' ); $('#'+e.id).removeClass('entry'); $('#s'+e.id).show(); CheckTransformJob(e.id,data.job_id,handleTransformFiles); return false; } })
        } )
+    }
 }
+
--- a/internal/js/view_support.js
+++ b/internal/js/view_support.js
@@ -85,13 +85,13 @@ function DrawImg()
    else
        $('.figcaption').hide()

-    // if we have faces, the enable the toggles, otherwise disable them
-    // and reset model select too
-    if( objs[current].faces )
+    // if we have faces, the enable the toggles, otherwise disable them and reset model select too
+    if( document.viewing.file_details.faces.length )
    {
        $('#faces').attr('disabled', false)
        $('#distance').attr('disabled', false)
-        $('#model').val( Number(objs[current].face_model) )
+        // first face is good enough as whole file has to have used same model
+         $('#model').val( document.viewing.file_details.faces[0].facefile_lnk.model_used )
    }
    else
    {
@@ -102,33 +102,34 @@ function DrawImg()
    }

    // okay, we want faces drawn so lets do it
-    if( $('#faces').prop('checked') && objs[current].faces )
+    if( $('#faces').prop('checked') && document.viewing.file_details.faces )
    {
+        faces=document.viewing.file_details.faces
        // draw rect on each face
-        for( i=0; i<objs[current].faces.length; i++ )
+        for( i=0; i<faces.length; i++ )
        {
-            x = objs[current].faces[i].x / ( im.width/canvas.width )
-            y = objs[current].faces[i].y / ( im.height/canvas.height )
-            w = objs[current].faces[i].w / ( im.width/canvas.width )
-            h = objs[current].faces[i].h / ( im.height/canvas.height )
+            x = faces[i].face_left / ( im.width/canvas.width )
+            y = faces[i].face_top / ( im.height/canvas.height )
+            w = faces[i].w / ( im.width/canvas.width )
+            h = faces[i].h / ( im.height/canvas.height )
            context.beginPath()
            context.rect( x, y, w, h )
            context.lineWidth = 2

 			// this face has an override so diff colour
-			if( objs[current].faces[i].override )
+			if( faces[i].override )
 			{
 				context.strokeStyle = 'blue'
-				DrawLabelOnFace( objs[current].faces[i].override.who )
+				DrawLabelOnFace( faces[i].override.who )
 			}
 			else
 			{
 				context.strokeStyle = 'green'
-				if( objs[current].faces[i].who )
+				if( faces[i].refimg )
 				{
-					str=objs[current].faces[i].who
+					str=faces[i].refimg.person.tag
 					if( $('#distance').prop('checked') )
-						str += "("+objs[current].faces[i].distance+")"
+						str += "("+faces[i].refimg_lnk.face_distance.toFixed(2)+")"
 					DrawLabelOnFace( str )
 				}
 			}
@@ -156,13 +157,15 @@ function FaceToggle()
 // also deals with fullsecreen if needed
 function ViewImageOrVideo()
 {
-    if( objs[current].type == 'Image' )
+    // can happen if no content to display
+    if( ! document.viewing ) return
+    if( document.viewing.type.name == 'Image' )
    {
-        im.src='../' + objs[current].url
+        im.src='../' + document.viewing.FullPathOnFS
        $('#video_div').hide()
        if( $('#fname_toggle').prop('checked' ) )
            $('#img-cap').show()
-        $('#fname_i').html(PrettyFname(objs[current].url))
+        $('#fname_i').html(PrettyFname(document.viewing.FullPathOnFS))
        $('#figure').show()
        if( fullscreen )
            $('#canvas').get(0).requestFullscreen()
@@ -170,11 +173,11 @@ function ViewImageOrVideo()
            if( document.fullscreen )
                document.exitFullscreen()
    }
-    if( objs[current].type == 'Video' )
+    if( document.viewing.type.name == 'Video' )
    {
        $('#figure').hide()
-        $('#video').prop('src', '../' + objs[current].url )
-        $('#fname_v').html(PrettyFname(objs[current].url))
+        $('#video').prop('src', '../' + document.viewing.FullPathOnFS )
+        $('#fname_v').html(PrettyFname(document.viewing.FullPathOnFS))
        if( $('#fname_toggle').prop('checked' ) )
            $('#img-cap').hide()
        ResizeVideo()
@@ -221,32 +224,33 @@ $(document).ready( function()

            item_list = { not_a_face: { name: "Not a face", which_face: '-1' } }

-            for( i=0; i<objs[current].faces.length; i++ )
+            faces=document.viewing.file_details.faces
+            for( i=0; i<faces.length; i++ )
            {
-                fx = objs[current].faces[i].x / ( im.width/canvas.width )
-                fy = objs[current].faces[i].y / ( im.height/canvas.height )
-                fw = objs[current].faces[i].w / ( im.width/canvas.width )
-                fh = objs[current].faces[i].h / ( im.height/canvas.height )
+                fx = faces[i].face_left / ( im.width/canvas.width )
+                fy = faces[i].face_top / ( im.height/canvas.height )
+                fw = faces[i].w / ( im.width/canvas.width )
+                fh = faces[i].h / ( im.height/canvas.height )

                if( x >= fx && x <= fx+fw && y >= fy && y <= fy+fh )
                {
-                    if( objs[current].faces[i].override )
+                    if( faces[i].override )
 					{
-                        item_list['remove_force_match_override']={ 'name': 'Remove override for this face', 'which_face': i, 'id': objs[current].faces[i].id }
+                        item_list['remove_force_match_override']={ 'name': 'Remove override for this face', 'which_face': i, 'id': faces[i].id }
 					}
-					else if( objs[current].faces[i].who )
+					else if( faces[i].refimg )
 					{
-                        item_list['match']={ 'name': objs[current].faces[i].who, 'which_face': i, 'id': objs[current].faces[i].id }
-                        item_list['match_add_refimg']={ 'name': 'Add this as refimg for ' + objs[current].faces[i].who, 
-                            'person_id': objs[current].faces[i].pid, 'who': objs[current].faces[i].who, 'which_face': i, 'id': objs[current].faces[i].id,  }
-                        item_list['wrong_person']={ 'name': 'wrong person', 'which_face': i, 'id': objs[current].faces[i].id }
+                        item_list['match']={ 'name': faces[i].refimg.person.tag, 'which_face': i, 'id': faces[i].id }
+                        item_list['match_add_refimg']={ 'name': 'Add this as refimg for ' + faces[i].refimg.person.tag, 
+                            'person_id': faces[i].refimg.person.id, 'who': faces[i].refimg.person.tag, 'which_face': i, 'id': faces[i].id,  }
+                        item_list['wrong_person']={ 'name': 'wrong person', 'which_face': i, 'id': faces[i].id }
 					}
                    else
                    {
-                        item_list['no_match_new_person']={ 'name': 'Add as reference image to NEW person', 'which_face': i, 'id': objs[current].faces[i].id }
-                        item_list['no_match_new_refimg']={ 'name': 'Add as reference image to EXISTING person', 'which_face': i, 'id': objs[current].faces[i].id }
+                        item_list['no_match_new_person']={ 'name': 'Add as reference image to NEW person', 'which_face': i, 'id': faces[i].id }
+                        item_list['no_match_new_refimg']={ 'name': 'Add as reference image to EXISTING person', 'which_face': i, 'id': faces[i].id }
 						for( var el in NMO ) {
-							item_list['NMO_'+el]={'type_id': NMO[el].type_id, 'name': 'Override: ' + NMO[el].name, 'which_face': i, 'id': objs[current].faces[i].id }
+							item_list['NMO_'+el]={'type_id': NMO[el].type_id, 'name': 'Override: ' + NMO[el].name, 'which_face': i, 'id': faces[i].id }
 						}
                    }
                    delete item_list['not_a_face']
@@ -280,11 +284,11 @@ function OverrideForceMatch( person_id, key )
 	}
 	ofm='&person_id='+person_id+'&face_id='+item[key].id
 	$.ajax({ type: 'POST', data: ofm, url: '/add_force_match_override', success: function(data) { 
-		objs[current].faces[item[key].which_face].override={}
-		objs[current].faces[item[key].which_face].override.who=data.person_tag
-		objs[current].faces[item[key].which_face].override.distance='N/A'
-		objs[current].faces[item[key].which_face].override.type_id=NMO[fm_idx].id
-		objs[current].faces[item[key].which_face].override.type_name=NMO[fm_idx].name
+		document.viewing.file_details.faces[item[key].which_face].override={}
+		document.viewing.file_details.faces[item[key].which_face].override.who=data.person_tag
+		document.viewing.file_details.faces[item[key].which_face].override.distance='N/A'
+		document.viewing.file_details.faces[item[key].which_face].override.type_id=NMO[fm_idx].id
+		document.viewing.file_details.faces[item[key].which_face].override.type_name=NMO[fm_idx].name

 		$('#dbox').modal('hide')
 		$('#faces').prop('checked',true)
@@ -294,6 +298,23 @@ function OverrideForceMatch( person_id, key )
 	} )
 }

+// function that handles the POSTed data that comes back when we add a
+// reference image to a new or existing person (right-click on a face)
+// used in success callbacks from CreatePersonAndRefimg() and AddRefimgTo()
+function handleAddRefimgData(key, data)
+{
+    document.viewing.file_details.faces[item[key].which_face].refimg=data.refimg
+    document.viewing.file_details.faces[item[key].which_face].refimg_lnk={}
+    // if we used this img, for now set distance to 0 - it is an exact match!
+    document.viewing.file_details.faces[item[key].which_face].refimg_lnk.face_distance=0.0
+    $('#dbox').modal('hide')
+    $('#faces').prop('checked',true)
+    DrawImg()
+    CheckForJobs()
+}
+
+// when we right-click a face and make a new person, this code creates and
+// associates the face 
 function CreatePersonAndRefimg( key )
 {
 	d='&face_id='+item[key].id
@@ -302,29 +323,17 @@ function CreatePersonAndRefimg( key )
 		+'&surname='+$('#surname').val()
 		+'&refimg_data='+item[key].refimg_data
 	$.ajax({ type: 'POST', data: d, url: '/match_with_create_person',
-        success: function(data) {
-			objs[current].faces[item[key].which_face].who=data.who
-			objs[current].faces[item[key].which_face].distance=data.distance
-			$('#dbox').modal('hide')
-			$('#faces').prop('checked',true)
-			DrawImg()
-            CheckForJobs()
-		}
+        success: function(data) { handleAddRefimgData(key, data ) },
 	})
 }

+// when we right-click a face and connect to an existing person, this connects
+// the refimg and associates the face
 function AddRefimgTo( person_id, key, search )
 {
 	d='&face_id='+item[key].id+'&person_id='+person_id+'&refimg_data='+item[key].refimg_data+'&search='+search
    $.ajax({ type: 'POST', data: d, url: '/add_refimg_to_person',
-        success: function(data) {
-			objs[current].faces[item[key].which_face].who=data.who
-			objs[current].faces[item[key].which_face].distance=data.distance
-			$('#dbox').modal('hide')
-			$('#faces').prop('checked',true)
-			DrawImg()
-            CheckForJobs()
-		}
+        success: function(data) { handleAddRefimgData(key, data ) },
 	})
 }

@@ -367,15 +376,15 @@ function SearchForPerson(content, key, face_id, face_pos, type_id)

 function RemoveOverrideForceMatch(face_pos)
 {
-    if( objs[current].faces[face_pos].override )
-        who=objs[current].faces[face_pos].override.who
+    if( document.viewing.file_details.faces[face_pos].override )
+        who=document.viewing.file_details.faces[face_pos].override.who
    else
-	    who=objs[current].faces[face_pos].who
+	    who=document.viewing.file_details.faces[face_pos].refimg.person.tag

-	d='&face_id='+objs[current].faces[face_pos].id+'&person_tag='+who+'&file_eid='+current
+	d='&face_id='+document.viewing.file_details.faces[face_pos].id+'&person_tag='+document.viewing.file_details.faces[face_pos].refimg.person.tag+'&file_eid='+document.viewing.id
    $.ajax({ type: 'POST', data: d, url: '/remove_force_match_override',
        success: function(data) {
-			delete objs[current].faces[face_pos].override
+			delete document.viewing.file_details.faces[face_pos].override
 			$('#dbox').modal('hide')
 			DrawImg()
            CheckForJobs()
@@ -387,10 +396,10 @@ function RemoveOverrideForceMatch(face_pos)

 function RemoveOverrideNoMatch(face_pos, type_id)
 {
-	d='&face_id='+objs[current].faces[face_pos].id+'&type_id='+type_id
+	d='&face_id='+document.viewing.file_details.faces[face_pos].id+'&type_id='+type_id
    $.ajax({ type: 'POST', data: d, url: '/remove_no_match_override',
        success: function(data) {
-			delete objs[current].faces[face_pos].override
+			delete document.viewing.file_details.faces[face_pos].override
 			$('#dbox').modal('hide')
 			DrawImg()
            CheckForJobs()
@@ -405,11 +414,11 @@ function AddNoMatchOverride(type_id, face_id, face_pos, type_id)
 	d='&type_id='+type_id+'&face_id='+face_id
    $.ajax({ type: 'POST', data: d, url: '/add_no_match_override',
        success: function(data) {
-			objs[current].faces[face_pos].override={}
-			objs[current].faces[face_pos].override.who=NMO[type_id].name
-			objs[current].faces[face_pos].override.distance='N/A'
-			objs[current].faces[face_pos].override.type_id=type_id
-			objs[current].faces[face_pos].override.type_name=NMO[type_id].name
+			document.viewing.file_details.faces[face_pos].override={}
+			document.viewing.file_details.faces[face_pos].override.who=NMO[type_id].name
+			document.viewing.file_details.faces[face_pos].override.distance='N/A'
+			document.viewing.file_details.faces[face_pos].override.type_id=type_id
+			document.viewing.file_details.faces[face_pos].override.type_name=NMO[type_id].name
 			$('#dbox').modal('hide')
 			$('#faces').prop('checked',true)
 			DrawImg()
@@ -457,17 +466,17 @@ function FaceDBox(key, item)
    div+='</div><div class="col-6">'
    if ( key == 'remove_force_match_override' )
 	{
-		if( objs[current].faces[face_pos].override.type_name == 'Manual match to existing person' )
-			div+='<div class="row col-12">remove this override (force match to: ' + objs[current].faces[face_pos].override.who + ')</div>'
+		if( document.viewing.file_details.faces[face_pos].override.type_name == 'Manual match to existing person' )
+			div+='<div class="row col-12">remove this override (force match to: ' + document.viewing.file_details.faces[face_pos].override.who + ')</div>'
 		else
 			div+='<div class="row col-12">remove this override (no match)</div>'
 		div+='<div class="row">'
 		div+='<button class="btn btn-outline-info col-6" type="button" onClick="$(\'#dbox\').modal(\'hide\'); return false">Cancel</button>'
 		div+='<button class="btn btn-outline-danger col-6" type="button" '
-		if( objs[current].faces[face_pos].override.type_name == 'Manual match to existing person' )
+		if( document.viewing.file_details.faces[face_pos].override.type_name == 'Manual match to existing person' )
 			div+='onClick="RemoveOverrideForceMatch(' +face_pos+ ')">Remove</button>'
 		else
-			div+='onClick="RemoveOverrideNoMatch(' +face_pos+','+objs[current].faces[face_pos].override.type_id+ ')">Remove</button>'
+			div+='onClick="RemoveOverrideNoMatch(' +face_pos+','+document.viewing.file_details.faces[face_pos].override.type_id+ ')">Remove</button>'
 		div+='</div>'
 	}
    if ( key == 'no_match_new_person' )
@@ -542,7 +551,7 @@ function FaceDBox(key, item)
 // pops results up in a dbox
 function JoblogSearch()
 {
-    data="eid="+current
+    data="eid="+document.viewing.id
    $.ajax({ type: 'POST', data: data, url: '/joblog_search', success: function(res) {
        data = JSON.parse(res)
        div ='<div><table class="table table-striped table-sm sm-txt">'
@@ -559,3 +568,8 @@ function JoblogSearch()
        }
    })
 }
+
+function setVideoSource(newSrc) {
+    $('#videoSource').attr('src', newSrc);
+    $('#video')[0].load();
+}
--- a/internal/js/view_transform.js
+++ b/internal/js/view_transform.js
@@ -1,37 +0,0 @@
-// POST to a check URL, that will tell us if the transformation has completed,
-// if not, try again in 1 second... If it has finished then reset the thumbnail
-// to full colour, put it back to being an entry and reset the thumbnail to the
-// newly created one that was sent back in the response to the POST
-function CheckTransformJob(id,job_id)
-{
-    CheckForJobs()
-    $.ajax(
-        {
-            type: 'POST', data: '&job_id='+job_id, url: '/check_transform_job', success: function(data) { 
-                if( data.finished )
-                {
-                    // stop throbber, remove grayscale & then force reload with timestamped version of im.src
-                    grayscale=0
-                    throbber=0
-                    im.src=im.src + '?t=' + new Date().getTime();
-                    return false;
-                }
-                else
-                {
-                    setTimeout( function() { CheckTransformJob(id,job_id) }, 1000,id, job_id ); 
-                }
-            }, 
-        } )
-}
-
-// for each highlighted image, POST the transform with amt (90, 180, 270,
-// fliph, flipv) which will let the job manager know what to do to this file.
-// we also grayscale the thumbnail out, remove the entry class for now, show
-// the spinning wheel, and finally kick of the checking for the transform job
-// to finish
-function Transform(amt)
-{
-    post_data = '&amt='+amt+'&id='+current
-    // send /transform for this image, grayscale the thumbmail, add color spinning wheel overlay, and start checking for job end
-    $.ajax({ type: 'POST', data: post_data, url: '/transform', success: function(data) { grayscale=1; throbber=1; DrawImg(); CheckTransformJob(current,data.job_id); return false; } })
-}
--- a/job.py
+++ b/job.py
@@ -3,7 +3,7 @@ from flask_wtf import FlaskForm
 from flask import request, render_template, redirect, make_response, jsonify, url_for
 from settings import Settings
 from main import db, app, ma
-from sqlalchemy import Sequence, func
+from sqlalchemy import Sequence, func, select
 from sqlalchemy.exc import SQLAlchemyError
 from datetime import datetime, timedelta
 import pytz
@@ -280,7 +280,8 @@ def joblog_search():
    from sqlalchemy import text

    eid=request.form['eid']
-    ent=Entry.query.get(eid)
+    stmt = select(Entry).where(Entry.id == eid)
+    ent = db.session.scalars(stmt).one_or_none()
    logs=Joblog.query.join(Job).filter(Joblog.log.ilike(text(f"'%%{ent.name}%%'"))).with_entities(Joblog.log, Job.id, Job.name, Job.state, Joblog.log_date).all()

    # turn DB output into json and return it to the f/e
--- a/pa_job_manager.py
+++ b/pa_job_manager.py
@@ -513,42 +513,6 @@ class PA_JobManager_FE_Message(Base):
        return "<id: {}, job_id: {}, level: {}, message: {}".format(self.id, self.job_id, self.level, self.message)


-##############################################################################
-# Class describing PA_UserState and in the DB (via sqlalchemy)
-# the state for a User defines a series of remembered states for a user
-# to optimise their viewing, etc.   If we scan and fine new files, we need to
-# invalidate these cached values, so we have this class here just for that
-##############################################################################
-class PA_UserState(Base):
-    __tablename__ = "pa_user_state"
-    id = Column(Integer, Sequence('pa_user_state_id_seq'), primary_key=True )
-    pa_user_dn = Column(String, ForeignKey('pa_user.dn'), primary_key=True )
-    last_used = Column(DateTime(timezone=True))
-    path_type = Column(String, primary_key=True, unique=False, nullable=False )
-    noo = Column(String, unique=False, nullable=False )
-    grouping = Column(String, unique=False, nullable=False )
-    how_many = Column(Integer, unique=False, nullable=False )
-    st_offset = Column(Integer, unique=False, nullable=False )
-    size = Column(Integer, unique=False, nullable=False )
-    folders = Column(Boolean, unique=False, nullable=False )
-    root = Column(String, unique=False, nullable=False )
-    cwd = Column(String, unique=False, nullable=False )
-    ## for now being lazy and not doing a separate table until I settle on needed fields and when
-    # only used if ptype == View
-    view_eid = Column(Integer, unique=False, nullable=False )
-    orig_ptype = Column(String, unique=False, nullable=False )
-    # only used if view and orig_ptype was search
-    orig_search_term = Column(String, unique=False, nullable=False )
-    orig_url = Column(String, unique=False, nullable=False )
-    current = Column(Integer)
-    first_eid = Column(Integer)
-    last_eid = Column(Integer)
-    num_entries = Column(Integer)
-
-    def __repr__(self):
-        return f"<pa_user_dn: {self.pa_user_dn}, path_type: {self.path_type}, noo: {self.noo}, grouping: {self.grouping}, how_many: {self.how_many}, st_offset: {self.st_offset}, size: {self.size}, folders: {self.folders}, root: {self.root}, cwd: {self.cwd}, view_eid: {self.view_eid}, orig_ptype: {self.orig_ptype}, orig_search_term: {self.orig_search_term}, orig_url: {self.orig_url}, current={self.current}, first_eid={self.first_eid}, last_eid={self.last_eid}, num_entries={self.num_entries}>"
-
-
 ##############################################################################
 # PAprint(): convenience function to prepend a timestamp to a printed string
 ##############################################################################
@@ -1131,7 +1095,6 @@ def DisconnectAllOverrides(job):
 def JobForceScan(job):
    JobProgressState( job, "In Progress" )
    DisconnectAllOverrides(job)
-    session.query(PA_UserState).delete()
    session.query(FaceFileLink).delete()
    session.query(FaceRefimgLink).delete()
    session.query(Face).delete()
@@ -1668,18 +1631,6 @@ def find_last_successful_ai_scan(job):
        return ai_job.last_update.timestamp()
    return 0

-####################################################################################################################################
-# when an import job actually finds new files, then the pa_user_state caches will become invalid (offsets are now wrong) 
-####################################################################################################################################
-def DeleteOldPA_UserState(job):
-# clear them out for now - this is 'dumb', just delete ALL. Eventually, can do this based on just the path &/or whether the last_used is
-# newer than this delete moment (only would be a race condition between an import changing things and someone simultaneously viewing)
-#    path=[jex.value for jex in job.extra if jex.name == "path"][0]
-    session.query(PA_UserState).delete()
-    return
-
-
-
 ####################################################################################################################################
 # JobImportDir(): job that scan import dir and processes entries in there - key function that uses os.walk() to traverse the 
 # file system and calls AddFile()/AddDir() as necessary
@@ -1788,8 +1739,6 @@ def JobImportDir(job):
    if found_new_files:
        job.extra.append( JobExtra( name="new_files", value=str(found_new_files) ) )
        session.add(job)
-        # this will invalidate pa_user_state for this path's contents (offsets are now wrong), clear them out
-        DeleteOldPA_UserState(job)

    rm_cnt=HandleAnyFSDeletions(job)

--- a/path.py
+++ b/path.py
@@ -42,50 +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]
-
-################################################################################
-# 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 )
-    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 )
-    return ret
--- a/person.py
+++ b/person.py
@@ -3,8 +3,9 @@ from flask_wtf import FlaskForm
 from flask import request, render_template, redirect, url_for, make_response, jsonify
 from main import db, app, ma
 from settings import Settings, AIModel
-from sqlalchemy import Sequence, func
+from sqlalchemy import Sequence, func, select
 from sqlalchemy.exc import SQLAlchemyError
+from sqlalchemy.orm import joinedload
 from flask_login import login_required, current_user
 from werkzeug.utils import secure_filename
 from shared import GenFace, GenThumb, PA
@@ -114,7 +115,7 @@ def AddRefimgToPerson( filename, person ):
        SetFELog( f"<b>Failed to add Refimg:</b>&nbsp;{e.orig}", "danger" )
    except Exception as e:
        SetFELog( f"<b>Failed to modify Refimg:</b>&nbsp;{e}", "danger" )
-    return
+    return refimg

 ################################################################################
 # TempRefimgFile: helper function that takes data POST'd (from dialog box to
@@ -182,9 +183,12 @@ def match_with_create_person():
    p = Person( tag=request.form["tag"], surname=request.form["surname"], firstname=request.form["firstname"] )
    # add this fname (of temp refimg) to person
    fname=TempRefimgFile( request.form['refimg_data'], p.tag )
-    AddRefimgToPerson( fname, p )
+    r=AddRefimgToPerson( fname, p )
    SetFELog( f"Created person: {p.tag}" )
-    return make_response( jsonify( who=p.tag, distance='0.0' ) )
+    refimg_schema=RefimgSchema(many=False)
+    r_data=refimg_schema.dump(r)
+
+    return make_response( jsonify( refimg=r_data, who=p.tag, distance='0.0' ) )

 ################################################################################
 # /person/<id> -> GET/POST(save or delete) -> shows/edits/delets a single person
@@ -267,7 +271,7 @@ def add_refimg():
    except Exception as e:
        SetFELog( f"<b>Failed to load reference image:</b>&nbsp;{e}", "danger" )

-    AddRefimgToPerson( fname, person )
+    r=AddRefimgToPerson( fname, person )
    return redirect( url_for( 'person', id=person.id) )

 ################################################################################
@@ -289,6 +293,29 @@ def find_persons(who):

    return make_response( resp )

+class FaceRefimgLinkSchema(ma.SQLAlchemyAutoSchema):
+    class Meta: model = FaceRefimgLink
+    face_distance = ma.auto_field()  # Explicitly include face_distance
+    load_instance = True
+
+class PersonSchema(ma.SQLAlchemyAutoSchema):
+    class Meta: model=Person
+    load_instance = True
+
+class RefimgSchema(ma.SQLAlchemyAutoSchema):
+    class Meta:
+        model = Refimg
+        exclude = ('face',)
+    load_instance = True
+    person = ma.Nested(PersonSchema)
+
+class FaceSchema(ma.SQLAlchemyAutoSchema):
+    class Meta:
+        model=Face
+        exclude = ('face',)
+    load_instance = True
+    refimg = ma.Nested(RefimgSchema,allow_none=True)
+    refimg_lnk = ma.Nested(FaceRefimgLinkSchema,allow_none=True)

 ################################################################################
 # /add_refimg_to_person/ -> POST 
@@ -296,12 +323,19 @@ def find_persons(who):
@app.route("/add_refimg_to_person", methods=["POST"])
@login_required
 def add_refimg_to_person():
-    f = Face.query.get( request.form['face_id'] )
-    p = Person.query.get( request.form['person_id'] )
+    stmt = select(Face).options( joinedload(Face.refimg_lnk) ).where(Face.id == request.form['face_id'])
+    f=db.session.execute(stmt).scalars().first()
+    stmt = select(Person).options( joinedload(Person.refimg) ).where(Person.id == request.form['person_id'])
+    p=db.session.execute(stmt).scalars().first()

    # add this fname (of temp refimg) to person
    fname=TempRefimgFile( request.form['refimg_data'], p.tag )
-    AddRefimgToPerson( fname, p )
+    r=AddRefimgToPerson( fname, p )
+
+    # connect the refimg to the face in the db, now we have added this refimg to the person
+    frl=FaceRefimgLink( face_id=f.id, refimg_id=r.id, face_distance=0 )
+    db.session.add(frl)
+    db.session.commit()

    if request.form['search'] == "true":
        jex=[]
@@ -316,7 +350,12 @@ def add_refimg_to_person():
        jex.append( JobExtra( name=f"path_type", value=str(ptype.id) ) )
        job=NewJob( name="run_ai_on_path", num_files=0, wait_for=None, jex=jex, desc="Look for face(s) in storage path(s)" )

-    return make_response( jsonify( who=p.tag, distance='0.0' ) )
+    refimg_schema=RefimgSchema(many=False)
+    r_data=refimg_schema.dump(r)
+    frl_schema=FaceRefimgLinkSchema(many=False)
+    frl_data=refimg_schema.dump(r)
+
+    return make_response( jsonify( refimg=r_data, frl=frl_data ) )

 ################################################################################
 # /add_force_match_override -> POST
--- a/query.py
+++ b/query.py
@@ -0,0 +1,41 @@
+from flask_login import UserMixin, login_required
+from main import db
+#from sqlalchemy import Sequence
+#from flask import request, redirect, make_response, jsonify
+#from main import db, app, ma
+#from sqlalchemy.exc import SQLAlchemyError
+
+
+# pylint: disable=no-member
+
+################################################################################
+# Class describing Person in the database and DB via sqlalchemy
+# id is unique id in DB
+# dn is ldap distinguised name
+# any entry in this DB is effectively a record you already authed successfully
+# so acts as a session marker.   If you fail ldap auth, you dont get a row here
+################################################################################
+class Query(UserMixin,db.Model):
+    __tablename__ = "query"
+    id = db.Column(db.Integer, db.Sequence('query_id_seq'), primary_key=True)
+    path_type = db.Column(db.String)
+    noo = db.Column(db.String)
+    grouping = db.Column(db.String)
+    q_offset = db.Column(db.Integer)
+    folder = db.Column(db.Boolean)
+    entry_list = db.Column(db.String)
+    root = db.Column(db.String)
+    cwd = db.Column(db.String)
+    search_term = db.Column(db.String)
+    current = db.Column(db.Integer)
+    created = db.Column(db.DateTime(timezone=True))
+
+    def __repr__(self):
+        str=f"<{self.__class__.__name__}("
+        for k, v in self.__dict__.items():
+            str += f"{k}={v!r}, "
+        str=str.rstrip(", ") + ")>"
+        return str
+        
+    def get_id(self):
+        return self.dn
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,5 @@
 numpy==1.26.4
+setuptools
 flask
 flask_login
 flask-ldap3-login
--- a/shared.py
+++ b/shared.py
@@ -93,8 +93,8 @@ def CreateSelect(name, selected, list, js="", add_class="", vals={} ):
 # TODO: can this be collapsed into using above - probably if the 'selected' passed in was 'In Folder' or 'Flat View' -- but I think that isn't in a var???
 # Helper function used in html files to create a bootstrap'd select with options.  Same as CreateSelect() really, only contains
 # hard-coded True/False around the if selected part, but with string based "True"/"False" in the vals={}, and list has "In Folders", "Flat View"
-def CreateFoldersSelect(selected, add_class=""):
-    str  = f'<select id="folders" name="folders" class="{add_class} sm-txt bg-white text-info border-info border-1 p-1" onChange="this.form.submit()">'
+def CreateFoldersSelect(selected, js="", add_class=""):
+    str  = f'<select id="folders" name="folders" class="{add_class} sm-txt bg-white text-info border-info border-1 p-1" onChange="{js};this.form.submit()">'
    # if selected is true, then folders == true, so make this the selected option
    if( selected ):
        str += '<option selected value="True">In Folders</option>'
--- a/states.py
+++ b/states.py
@@ -1,10 +1,12 @@
 from flask import request, render_template, redirect, url_for
+from settings import Settings, SettingsIPath, SettingsSPath, SettingsRBPath
 from flask_login import login_required, current_user
 from main import db, app, ma 
 from shared import PA
 from user import PAUser
 from datetime import datetime
 from job import SetFELog
+from shared import SymlinkName
 import pytz
 import re

@@ -17,30 +19,17 @@ class PA_UserState(db.Model):
    __tablename__ = "pa_user_state"
    id = db.Column(db.Integer, db.Sequence('pa_user_state_id_seq'), primary_key=True )
    pa_user_dn = db.Column(db.String, db.ForeignKey('pa_user.dn'), primary_key=True )
-    last_used = db.Column(db.DateTime(timezone=True))
    path_type = db.Column(db.String, primary_key=True, unique=False, nullable=False )
    noo = db.Column(db.String, unique=False, nullable=False )
    grouping = db.Column(db.String, unique=False, nullable=False )
    how_many = db.Column(db.Integer, unique=False, nullable=False )
-    st_offset = db.Column(db.Integer, unique=False, nullable=False )
    size = db.Column(db.Integer, unique=False, nullable=False )
    folders = db.Column(db.Boolean, unique=False, nullable=False )
    root = db.Column(db.String, unique=False, nullable=False )
    cwd = db.Column(db.String, unique=False, nullable=False )
-    ## for now being lazy and not doing a separate table until I settle on needed fields and when
-    # only used if ptype == View
-    view_eid = db.Column(db.Integer, unique=False, nullable=False )
-    orig_ptype = db.Column(db.String, unique=False, nullable=False )
-    # only used if view and orig_ptype was search
-    orig_search_term = db.Column(db.String, unique=False, nullable=False )
-    orig_url = db.Column(db.String, unique=False, nullable=False )
-    current = db.Column(db.Integer)
-    first_eid = db.Column(db.Integer)
-    last_eid = db.Column(db.Integer)
-    num_entries = db.Column(db.Integer)

    def __repr__(self):
-        return f"<pa_user_dn: {self.pa_user_dn}, path_type: {self.path_type}, noo: {self.noo}, grouping: {self.grouping}, how_many: {self.how_many}, st_offset: {self.st_offset}, size: {self.size}, folders: {self.folders}, root: {self.root}, cwd: {self.cwd}, view_eid: {self.view_eid}, orig_ptype: {self.orig_ptype}, orig_search_term: {self.orig_search_term}, orig_url: {self.orig_url}, current={self.current}, first_eid={self.first_eid}, last_eid={self.last_eid}, num_entries={self.num_entries}>"
+        return f"<pa_user_dn: {self.pa_user_dn}, path_type: {self.path_type}, noo: {self.noo}, grouping: {self.grouping}, how_many: {self.how_many}, size: {self.size}, folders: {self.folders}, root: {self.root}, cwd: {self.cwd}>"


 ################################################################################
@@ -50,156 +39,35 @@ class PA_UserState(db.Model):
 ################################################################################
 class States(PA):
    def __init__(self, request):
-        self.path_type=''
-        self.orig_search_term = ''
        self.url = request.path
-        self.view_eid = None
-        self.current=0
-        self.first_eid=0
-        self.last_eid=0
-        self.num_entries=0
-
-        # this is any next/prev or noo, grouping, etc. change (so use referrer to work out what to do with this)
-        # because this can happen on a view, or files_up, etc. change this FIRST
-        if 'change_file_opts' in request.path:
-            base=request.base_url
-            base=base.replace("change_file_opts", "")
-            self.url = "/"+request.referrer.replace(base, "" )
-
-        # if view_list, then we really are a view, and view_eid should be in the form
-        if 'view_list' in request.path:
-            self.path_type = 'View'
-            self.view_eid = request.form['view_eid']
-            self.url = request.form['orig_url']
-        # this occurs ONLY when a POST to /view/<id> occurs (at this stage orig_url will be from an import, storage, bin or search)
-        elif 'view' in request.path:
-            self.path_type = 'View'
-            self.view_eid = self.url[6:]
-            # use orig url to define defaults/look up states for 'last' import/storage/bin/search
-            if request.method == "POST":
-                self.url = request.form['orig_url']
-            else:
-                # GET's occur on redirect, and we don't have a form, so get it from pref
-                st=self.url[8:]
-                if request.referrer and 'search' in request.referrer:
-                    st=re.sub( '.+/search/', '', request.referrer )
-                else:
-                    st=''
-                pref=PA_UserState.query.filter(PA_UserState.pa_user_dn==current_user.dn,PA_UserState.path_type==self.path_type,PA_UserState.view_eid==self.view_eid,PA_UserState.orig_search_term==st).first()
-                if not pref:
-                    SetFELog( message=f"ERROR: pref not found - dn={current_user.dn}, st={st}, s={self}????" , level="danger", persistent=True, cant_close=False )
-                    SetFELog( message=f"WARNING: I think this error occurred because you reloaded a page and the server had restarted between your original page load and this page reload, is that possible?" , level="warning", persistent=True, cant_close=False )
-                    redirect("/")
-                else:
-                    if not hasattr( pref, 'orig_url' ):
-                        SetFELog( message=f"ERROR: orig_url not in pref - dn={current_user.dn}, st={st}, self={self}, pref={pref}????" , level="danger", persistent=True, cant_close=True )
-                        redirect("/")
-                    self.url = pref.orig_url

+        # set the prefix based on path
+        path=None
        if 'files_ip' in self.url or 'file_list_ip' in self.url:
-            if self.path_type == "View":
-                self.orig_ptype = 'Import'
-                self.orig_url = self.url
-            else:
            self.path_type = 'Import'
+            path = SettingsIPath()
        elif 'files_sp' in self.url:
-            if self.path_type == "View":
-                self.orig_ptype = 'Storage'
-                self.orig_url = self.url
-            else:
            self.path_type = 'Storage'
+            path = SettingsSPath()
        elif 'files_rbp' in self.url:
-            if self.path_type == "View":
-                self.orig_ptype = 'Bin'
-                self.orig_url = self.url
-            else:
            self.path_type = 'Bin'
+            path = SettingsRBPath()
        elif 'search' in self.url:
-            # okay if we are a search, but came from a view then get last_search_state form prefs and use it
-            m=re.match( '.*search/(.+)$', self.url )
-            if m == None:
-                SetFELog( message=f"ERROR: DDP messed up, seems we are processing a search, but cant see the search term - is this even possible?" )
-                return
-            self.orig_search_term = m[1]
-            if self.path_type == "View":
-                self.orig_ptype = 'Search'
-                self.orig_url = self.url
-            else:
            self.path_type = 'Search'
-        elif 'view' in self.url:
-            # use url to get eid of viewed entry
-            self.view_eid = self.url[6:]
-
-            # force this to be a search so rest of code won't totally die, but also not return anything
-            self.path_type="Search"
-            self.orig_url=self.url
-        elif 'change_file_opts' not in self.url:
-            SetFELog( message=f"ERROR: DDP messed up, failed to match URL {self.url} for settings this will fail, redirecting to home" , level="danger", persistent=True, cant_close=True )
-            SetFELog( message=f"referrer={request.referrer}" , level="danger", persistent=True, cant_close=True )
-            return
-
-        if self.path_type == 'View':
-            pref=PA_UserState.query.filter(PA_UserState.pa_user_dn==current_user.dn,PA_UserState.path_type==self.path_type,PA_UserState.view_eid==self.view_eid,PA_UserState.orig_search_term==self.orig_search_term).first()
-            if not hasattr( self, 'orig_ptype' ):
-                self.orig_ptype='View'
-                self.orig_url=''
-                SetFELog( message=f"ERROR: No orig ptype? s={self} - pref={pref}, redirecting to home" , level="danger", persistent=True, cant_close=True )
-                SetFELog( message=f"referrer={request.referrer}" , level="danger", persistent=True, cant_close=True )
-                redirect("/")
-
-            # should find original path or search for this view (if not a search, search_term='')
-            orig_pref=PA_UserState.query.filter(PA_UserState.pa_user_dn==current_user.dn,PA_UserState.path_type==self.orig_ptype,PA_UserState.orig_search_term==self.orig_search_term).first()
-            if not orig_pref:
-                SetFELog( message=f"ERROR: DDP messed up 2, failed to find orig_pref for a view pt={self.path_type} for search={self.orig_search_term}" , level="danger", persistent=True, cant_close=True )
-                SetFELog( message=f"referrer={request.referrer}" , level="danger", persistent=True, cant_close=True )
-                return
-        elif self.path_type == 'Search':
-            pref=PA_UserState.query.filter(PA_UserState.pa_user_dn==current_user.dn,PA_UserState.path_type==self.path_type,PA_UserState.orig_search_term==self.orig_search_term).first()
+            self.search_term = ''
        else:
-            pref=PA_UserState.query.filter(PA_UserState.pa_user_dn==current_user.dn,PA_UserState.path_type==self.path_type).first()
+            self.path_type=''

-        if pref:
-            self.grouping=pref.grouping
-            self.how_many=pref.how_many
-            self.offset=pref.st_offset
-            self.size=pref.size
-            self.cwd=pref.cwd
-            self.orig_ptype=pref.orig_ptype
-            self.orig_search_term=pref.orig_search_term
-            self.orig_url = pref.orig_url
-            self.view_eid = pref.view_eid
-            self.current = pref.current
-            if self.path_type == "View":
-                self.root='static/' + self.orig_ptype
-                self.first_eid=orig_pref.first_eid
-                self.last_eid=orig_pref.last_eid
-                self.num_entries=orig_pref.num_entries
-                self.noo=orig_pref.noo
-                self.folders=orig_pref.folders
-                self.orig_search_term=orig_pref.orig_search_term
-            else:
-                self.root=pref.root
-                self.first_eid = pref.first_eid
-                self.last_eid = pref.last_eid
-                self.num_entries = pref.num_entries
-                self.noo=pref.noo
-                self.folders=pref.folders
+        if path:
+            self.prefix = SymlinkName(self.path_type,path,path+'/')
        else:
+            self.prefix=None
+
        # retreive defaults from 'PAUser' where defaults are stored
        u=PAUser.query.filter(PAUser.dn==current_user.dn).one()
        self.grouping=u.default_grouping
        self.how_many=u.default_how_many
-            self.offset=0
        self.size=u.default_size
-            if self.path_type == "View":
-                self.root='static/' + self.orig_ptype
-                self.first_eid=orig_pref.first_eid
-                self.last_eid=orig_pref.last_eid
-                self.num_entries=orig_pref.num_entries
-                self.noo=orig_pref.noo
-                self.folders=orig_pref.folders
-                self.orig_search_term=orig_pref.orig_search_term
-            else:
        self.root='static/' + self.path_type
        if self.path_type == 'Import':
            self.noo = u.default_import_noo
@@ -212,102 +80,17 @@ class States(PA):
            self.noo=u.default_search_noo
            self.folders=False
                
+        self.default_flat_noo=u.default_import_noo
+        self.default_folder_noo=u.default_storage_noo
+        self.default_search_noo=u.default_search_noo
        self.cwd=self.root
-            if not hasattr(self, 'orig_ptype'):
-                self.orig_ptype=None
-            if not hasattr(self, 'orig_search_term'):
-                self.orig_search_term=None
-            self.orig_url = self.url
-
-        # the above are defaults, if we are here, then we have current values, use them instead if they are set -- AI: searches dont set them so then we use those in the DB first
-        if request.method=="POST":
-            if self.path_type != "View" and 'noo' in request.form:
-                # we are changing values based on a POST to the form, if we changed the noo option, we need to reset things
-                if 'change_file_opts' in request.path and self.noo != request.form['noo']:
-                    self.noo=request.form['noo']
-                    self.first_eid=0
-                    self.last_eid=0
-                    self.offset=0
-            if 'how_many' in request.form:
-                self.how_many=request.form['how_many']
-            if 'offset' in request.form:
-                self.offset=int(request.form['offset'])
-            if 'grouping' in request.form:
-                self.grouping=request.form['grouping']
-            # this can be null if we come from view by details
-            if 'size' in request.form:
-                self.size = request.form['size']
-            # seems html cant do boolean, but uses strings so convert
-            if self.path_type != "View" and 'folders' in request.form:
-                # we are changing values based on a POST to the form, if we are in folder view and we changed the folders option, we need to reset things
-                if 'change_file_opts' in request.path:
-                    if self.folders and self.folders != request.form['folders']:
-                        self.num_entries=0
-                        self.first_eid=0
-                        self.last_eid=0
-                    if request.form['folders'] == "False":
-                        self.folders=False
-                    else:
-                        self.folders=True
-                        # have to force grouping to None if we flick to folders from a flat view with grouping (otherwise we print out 
-                        # group headings for child content that is not in the CWD)
-                        self.grouping=None
-            if 'orig_url' in request.form:
-                self.orig_url = request.form['orig_url']
-
-            # possible to not be set for an AI: search
-            if 'cwd' in request.form:
-                self.cwd = request.form['cwd']
-            if 'prev' in request.form:
-                self.offset -= int(self.how_many)
-                # just in case we hit prev too fast, stop this...
-                if self.offset < 0:
-                    self.offset=0
-            if 'next' in request.form:
-                if (self.offset + int(self.how_many)) < self.num_entries:
-                    self.offset += int(self.how_many)
-                else:
-                    # tripping this still
-                    SetFELog( message=f"WARNING: next image requested, but would go past end of list? - ignore this" , level="warning", persistent=True, cant_close=False )
-            if 'current' in request.form:
-                self.current = int(request.form['current'])
-
-        last_used=datetime.now(pytz.utc)
-        # now save pref 
-        if not pref:
-            # insert new pref for this combo (might be a new search or view, or first time for a path)
-            pref=PA_UserState( pa_user_dn=current_user.dn, last_used=last_used, path_type=self.path_type, view_eid=self.view_eid,
-                noo=self.noo, grouping=self.grouping, how_many=self.how_many, st_offset=self.offset, size=self.size,
-                folders=self.folders, root=self.root, cwd=self.cwd, orig_ptype=self.orig_ptype, orig_search_term=self.orig_search_term, 
-                orig_url=self.orig_url, current=self.current, first_eid=self.first_eid, last_eid=self.last_eid, num_entries=self.num_entries )
-        else:
-            # update this pref with the values calculated above (most likely from POST to form)
-            pref.pa_user_dn=current_user.dn
-            pref.path_type=self.path_type
-            pref.view_eid=self.view_eid
-            pref.noo=self.noo
-            pref.grouping=self.grouping
-            pref.how_many=self.how_many
-            pref.st_offset=self.offset
-            pref.size=self.size
-            pref.folders=self.folders
-            pref.root = self.root
-            pref.cwd = self.cwd
-            pref.orig_ptype = self.orig_ptype
-            pref.orig_search_term = self.orig_search_term
-            pref.orig_url = self.orig_url
-            pref.last_used = last_used
-            pref.first_eid = self.first_eid
-            pref.last_eid = self.last_eid
-            pref.num_entries = self.num_entries
-            # only passed in (at the moment) in view_list
-            pref.current = self.current
-
-        db.session.add(pref)
-        db.session.commit()
-
        return

+    def to_dict(self):
+        # Automatically include all instance attributes
+        return {key: value for key, value in vars(self).items()}
+    
+
 ################################################################################
 # /states -> GET only -> prints out list of all prefs (simple for now)
 ################################################################################
--- a/tables.sql
+++ b/tables.sql
@@ -1,189 +1,193 @@
-alter database PA set timezone to 'Australia/Victoria'; 
+ALTER DATABASE pa SET TIMEZONE TO 'aUSTRALIA/vICTORIA'; 

-create sequence PA_USER_ID_SEQ;
-create sequence PA_USER_STATE_ID_SEQ;
-create sequence FACE_ID_SEQ;
-create sequence PATH_ID_SEQ;
-create sequence PATH_TYPE_ID_SEQ;
-create sequence FILE_ID_SEQ;
-create sequence FILE_TYPE_ID_SEQ;
-create sequence JOBEXTRA_ID_SEQ;
-create sequence JOBLOG_ID_SEQ;
-create sequence JOB_ID_SEQ;
-create sequence PERSON_ID_SEQ;
-create sequence REFIMG_ID_SEQ;
-create sequence SETTINGS_ID_SEQ;
-create sequence PA_JOB_MANAGER_ID_SEQ;
-create sequence PA_JOB_MANAGER_FE_MESSAGE_ID_SEQ;
-create sequence FACE_OVERRIDE_TYPE_ID_SEQ;
-create sequence FACE_OVERRIDE_ID_SEQ;
+CREATE SEQUENCE pa_user_id_seq;
+CREATE SEQUENCE pa_user_state_id_seq;
+CREATE SEQUENCE face_id_seq;
+CREATE SEQUENCE path_id_seq;
+CREATE SEQUENCE path_type_id_seq;
+CREATE SEQUENCE file_id_seq;
+CREATE SEQUENCE file_type_id_seq;
+CREATE SEQUENCE jobextra_id_seq;
+CREATE SEQUENCE joblog_id_seq;
+CREATE SEQUENCE job_id_seq;
+CREATE SEQUENCE person_id_seq;
+CREATE SEQUENCE refimg_id_seq;
+CREATE SEQUENCE settings_id_seq;
+CREATE SEQUENCE pa_job_manager_id_seq;
+CREATE SEQUENCE pa_job_manager_fe_message_id_seq;
+CREATE SEQUENCE face_override_type_id_seq;
+CREATE SEQUENCE face_override_id_seq;
+CREATE SEQUENCE query_id_seq;

 -- these are hard-coded at present, not sure I can reflexively find models from API?
-create table AI_MODEL ( ID integer, NAME varchar(24), DESCRIPTION varchar(80), constraint PK_AI_MODEL primary key(ID) );
-insert into AI_MODEL values ( 1, 'hog', 'normal' );
-insert into AI_MODEL values ( 2, 'cnn', 'more accurate / much slower' );
+CREATE TABLE ai_model ( id INTEGER, name VARCHAR(24), description VARCHAR(80), CONSTRAINT pk_ai_model PRIMARY KEY(id) );
+INSERT INTO ai_model VALUES ( 1, 'HOG', 'NORMAL' );
+INSERT INTO ai_model VALUES ( 2, 'CNN', 'MORE ACCURATE / MUCH SLOWER' );

-create table SETTINGS( 
-    ID integer, 
-	BASE_PATH varchar, IMPORT_PATH varchar, STORAGE_PATH varchar, RECYCLE_BIN_PATH varchar, METADATA_PATH varchar, 
-	AUTO_ROTATE Boolean,
-    DEFAULT_REFIMG_MODEL integer, DEFAULT_SCAN_MODEL integer, DEFAULT_THRESHOLD float,
-    FACE_SIZE_LIMIT integer,
-    SCHEDULED_IMPORT_SCAN integer, SCHEDULED_STORAGE_SCAN integer, 
-    SCHEDULED_BIN_CLEANUP integer, BIN_CLEANUP_FILE_AGE integer,
-    JOB_ARCHIVE_AGE integer,
-    constraint PK_SETTINGS_ID primary key(ID),
-    constraint FK_DEFAULT_REFIMG_MODEL foreign key (DEFAULT_REFIMG_MODEL) references AI_MODEL(ID),
-    constraint FK_DEFAULT_SCAN_MODEL foreign key (DEFAULT_SCAN_MODEL) references AI_MODEL(ID) );
+CREATE TABLE settings( 
+    id INTEGER, 
+	base_path VARCHAR, import_path VARCHAR, storage_path VARCHAR, recycle_bin_path VARCHAR, metadata_path VARCHAR, 
+	auto_rotate BOOLEAN,
+    default_refimg_model INTEGER, default_scan_model INTEGER, default_threshold FLOAT,
+    face_size_limit INTEGER,
+    scheduled_import_scan INTEGER, scheduled_storage_scan INTEGER, 
+    scheduled_bin_cleanup INTEGER, bin_cleanup_file_age INTEGER,
+    job_archive_age INTEGER,
+    CONSTRAINT pk_settings_id PRIMARY KEY(id),
+    CONSTRAINT fk_default_refimg_model FOREIGN KEY (default_refimg_model) REFERENCES ai_model(id),
+    CONSTRAINT fk_default_scan_model FOREIGN KEY (default_scan_model) REFERENCES ai_model(id) );

-create table PA_USER( 
-    ID integer, 
-    DN varchar unique, 
-    DEFAULT_IMPORT_NOO varchar,
-    DEFAULT_STORAGE_NOO varchar,
-    DEFAULT_SEARCH_NOO varchar,
-    DEFAULT_GROUPING varchar(16),
-    DEFAULT_HOW_MANY integer,
-    DEFAULT_SIZE integer,
-    DEFAULT_IMPORT_FOLDERS Boolean,
-    DEFAULT_STORAGE_FOLDERS Boolean,
-    constraint PK_PA_USER_ID primary key(ID) );
+CREATE TABLE pa_user( 
+    id INTEGER, 
+    dn VARCHAR UNIQUE, 
+    default_import_noo VARCHAR,
+    default_storage_noo VARCHAR,
+    default_search_noo VARCHAR,
+    default_grouping VARCHAR(16),
+    default_how_many INTEGER,
+    default_size INTEGER,
+    default_import_folders BOOLEAN,
+    default_storage_folders BOOLEAN,
+    CONSTRAINT pk_pa_user_id PRIMARY KEY(id) );

-- this is totally not 3rd normal form, but when I made it that, it was so complex, it was stupid
-- so for the little data here, I'm deliberately doing a redundant data structure
-create table PA_USER_STATE ( ID integer, PA_USER_DN varchar(128), PATH_TYPE varchar(16), 
-    NOO varchar(16), GROUPING varchar(16), HOW_MANY integer, ST_OFFSET integer, SIZE integer, FOLDERS Boolean, 
-    ROOT varchar, CWD varchar, 
-    ORIG_PTYPE varchar, ORIG_SEARCH_TERM varchar, ORIG_URL varchar, 
-    VIEW_EID integer, CURRENT integer, FIRST_EID integer, LAST_EID integer, NUM_ENTRIES integer, LAST_USED timestamptz,
-    constraint FK_PA_USER_DN foreign key (PA_USER_DN) references PA_USER(DN),
-    constraint PK_PA_USER_STATES_ID primary key(ID ) );
+-- FIXME: NEED TO RETHINK THIS, not sure this even needs to be in the DB
+CREATE TABLE pa_user_state ( id INTEGER, pa_user_dn VARCHAR(128), path_type VARCHAR(16), 
+    noo VARCHAR(16), grouping VARCHAR(16), how_many INTEGER, size INTEGER, folders BOOLEAN,
+    root VARCHAR, cwd VARCHAR,
+    CONSTRAINT fk_pa_user_dn FOREIGN KEY (pa_user_dn) REFERENCES pa_user(dn),
+    CONSTRAINT pk_pa_user_states_id PRIMARY KEY(id ) );

-create table FILE_TYPE ( ID integer, NAME varchar(32) unique, constraint PK_FILE_TYPE_ID primary key(ID) );
-
-create table PATH_TYPE ( ID integer, NAME varchar(16) unique, constraint PK_PATH_TYPE_ID primary key(ID) );
-
-create table PATH ( ID integer, TYPE_ID integer, PATH_PREFIX varchar(1024), NUM_FILES integer,
-    constraint PK_PATH_ID primary key(ID),
-    constraint FK_PATH_TYPE_TYPE_ID foreign key (TYPE_ID) references PATH_TYPE(ID) );
-
-create table ENTRY( ID integer, NAME varchar(128), TYPE_ID integer, EXISTS_ON_FS boolean,
-    constraint PK_ENTRY_ID primary key(ID),
-    constraint FK_FILE_TYPE_TYPE_ID foreign key (TYPE_ID) references FILE_TYPE(ID) );
-
-create table FILE ( EID integer, SIZE_MB integer, HASH varchar(34), THUMBNAIL varchar, FACES_CREATED_ON float, LAST_HASH_DATE float, LAST_AI_SCAN float, YEAR integer, MONTH integer, DAY integer, WOY integer,
-    constraint PK_FILE_ID primary key(EID), 
-    constraint FK_FILE_ENTRY_ID foreign key (EID) references ENTRY(ID) );
-
-create table DEL_FILE ( FILE_EID integer, ORIG_PATH_PREFIX varchar(1024), constraint PK_DEL_FILE_FILE_EID primary key (FILE_EID),
-    constraint FK_ENTRY_ID foreign key (FILE_EID) references FILE(EID) );
-
-create table DIR ( EID integer, REL_PATH varchar(256), NUM_FILES integer, LAST_IMPORT_DATE float, 
-    constraint PK_DIR_EID primary key(EID),
-    constraint FK_DIR_ENTRY_ID foreign key (EID) references ENTRY(ID) );
-
-create table PATH_DIR_LINK ( path_id integer, dir_eid integer,
-    constraint PK_PDL_path_id_dir_eid primary key (path_id, dir_eid),
-    constraint FK_PDL_PATH_ID foreign key (PATH_ID) references PATH(ID),
-    constraint FK_PDL_DIR_EID foreign key (DIR_EID) references DIR(EID) );
-
-create table ENTRY_DIR_LINK ( entry_id integer, dir_eid integer,
-    constraint PK_EDL_entry_id_dir_eid primary key (entry_id, dir_eid),
-    constraint FK_EDL_ENTRY_ID foreign key (ENTRY_ID) references ENTRY(ID),
-    constraint FK_EDL_DIR_EID foreign key (DIR_EID) references DIR(EID) );
-
-create table PERSON ( ID integer default nextval('PERSON_ID_SEQ'), TAG varchar(48), FIRSTNAME varchar(48), SURNAME varchar(48),
-    constraint PK_PERSON_ID primary key(ID) );
-alter sequence PERSON_ID_SEQ owned by PERSON.ID;
+CREATE TABLE query ( id INTEGER, path_type VARCHAR(16), noo VARCHAR(16), grouping VARCHAR(16), q_offset INTEGER,
+    entry_list VARCHAR, folders BOOLEAN, root VARCHAR, cwd VARCHAR, search_term VARCHAR, current INTEGER,
+    created TIMESTAMPTZ,
+    CONSTRAINT pk_query_id PRIMARY KEY(id ) );


-create table REFIMG ( ID integer, FNAME varchar(128), FACE bytea, ORIG_W integer, ORIG_H integer,
-    FACE_TOP integer, FACE_RIGHT integer, FACE_BOTTOM integer, FACE_LEFT integer, CREATED_ON float, THUMBNAIL varchar, MODEL_USED integer, 
-    constraint PK_REFIMG_ID primary key(ID),
-    constraint FK_REFIMG_MODEL_USED foreign key (MODEL_USED) references AI_MODEL(ID) );
-alter sequence REFIMG_ID_SEQ owned by REFIMG.ID;
+CREATE TABLE file_type ( id INTEGER, name VARCHAR(32) UNIQUE, CONSTRAINT pk_file_type_id PRIMARY KEY(id) );

-create table FACE( ID integer, FACE bytea, FACE_TOP integer, FACE_RIGHT integer, FACE_BOTTOM integer, FACE_LEFT integer, 
-    W integer, H integer, constraint PK_FACE_ID primary key(ID) );
+CREATE TABLE path_type ( id INTEGER, name VARCHAR(16) UNIQUE, CONSTRAINT pk_path_type_id PRIMARY KEY(id) );

-create table FACE_FILE_LINK( FACE_ID integer, FILE_EID integer, MODEL_USED integer,
-    constraint PK_FFL_FACE_ID_FILE_ID primary key(FACE_ID, FILE_EID),
-    constraint FK_FFL_FACE_ID foreign key (FACE_ID) references FACE(ID) on delete cascade,
-    constraint FK_FFL_FILE_EID foreign key (FILE_EID) references FILE(EID),
-    constraint FK_FFL_MODEL_USED foreign key (MODEL_USED) references AI_MODEL(ID) );
+CREATE TABLE path ( id INTEGER, type_id INTEGER, path_prefix VARCHAR(1024), num_files INTEGER,
+    CONSTRAINT pk_path_id PRIMARY KEY(id),
+    CONSTRAINT fk_path_type_type_id FOREIGN KEY (type_id) REFERENCES path_type(id) );

-create table FACE_REFIMG_LINK( FACE_ID integer, REFIMG_ID integer, FACE_DISTANCE float,
-    constraint PK_FRL_FACE_ID_REFIMG_ID primary key(FACE_ID, REFIMG_ID), 
-    constraint FK_FRL_FACE_ID foreign key (FACE_ID) references FACE(ID) on delete cascade,
-    constraint FK_FRL_REFIMG_ID foreign key (REFIMG_ID) references REFIMG(ID) );
+CREATE TABLE entry( id INTEGER, name VARCHAR(128), type_id INTEGER, exists_on_fs BOOLEAN,
+    CONSTRAINT pk_entry_id PRIMARY KEY(id),
+    CONSTRAINT fk_file_type_type_id FOREIGN KEY (type_id) REFERENCES file_type(id) );

-create table FACE_OVERRIDE_TYPE ( ID integer, NAME varchar unique, constraint PK_FACE_OVERRIDE_TYPE_ID primary key(ID) );
-insert into FACE_OVERRIDE_TYPE values ( (select nextval('FACE_OVERRIDE_TYPE_ID_SEQ')), 'Manual match to existing person' );
-insert into FACE_OVERRIDE_TYPE values ( (select nextval('FACE_OVERRIDE_TYPE_ID_SEQ')), 'Not a face' );
-insert into FACE_OVERRIDE_TYPE values ( (select nextval('FACE_OVERRIDE_TYPE_ID_SEQ')), 'Too young' );
-insert into FACE_OVERRIDE_TYPE values ( (select nextval('FACE_OVERRIDE_TYPE_ID_SEQ')), 'Ignore face' );
+CREATE TABLE file ( eid INTEGER, size_mb INTEGER, hash VARCHAR(34), thumbnail VARCHAR, faces_created_on FLOAT, last_hash_date FLOAT, last_ai_scan FLOAT, year INTEGER, month INTEGER, day INTEGER, woy INTEGER,
+    CONSTRAINT pk_file_id PRIMARY KEY(eid), 
+    CONSTRAINT fk_file_entry_id FOREIGN KEY (eid) REFERENCES entry(id) );
+
+CREATE TABLE del_file ( file_eid INTEGER, orig_path_prefix VARCHAR(1024), CONSTRAINT pk_del_file_file_eid PRIMARY KEY (file_eid),
+    CONSTRAINT fk_entry_id FOREIGN KEY (file_eid) REFERENCES file(eid) );
+
+CREATE TABLE dir ( eid INTEGER, rel_path VARCHAR(256), num_files INTEGER, last_import_date FLOAT, 
+    CONSTRAINT pk_dir_eid PRIMARY KEY(eid),
+    CONSTRAINT fk_dir_entry_id FOREIGN KEY (eid) REFERENCES entry(id) );
+
+CREATE TABLE path_dir_link ( PATH_ID INTEGER, DIR_EID INTEGER,
+    CONSTRAINT pk_pdl_PATH_ID_DIR_EID PRIMARY KEY (PATH_ID, DIR_EID),
+    CONSTRAINT fk_pdl_path_id FOREIGN KEY (path_id) REFERENCES path(id),
+    CONSTRAINT fk_pdl_dir_eid FOREIGN KEY (dir_eid) REFERENCES dir(eid) );
+
+CREATE TABLE entry_dir_link ( ENTRY_ID INTEGER, DIR_EID INTEGER,
+    CONSTRAINT pk_edl_ENTRY_ID_DIR_EID PRIMARY KEY (ENTRY_ID, DIR_EID),
+    CONSTRAINT fk_edl_entry_id FOREIGN KEY (entry_id) REFERENCES entry(id),
+    CONSTRAINT fk_edl_dir_eid FOREIGN KEY (dir_eid) REFERENCES dir(eid) );
+
+CREATE TABLE person ( id INTEGER DEFAULT NEXTVAL('person_id_seq'), tag VARCHAR(48), firstname VARCHAR(48), surname VARCHAR(48),
+    CONSTRAINT pk_person_id PRIMARY KEY(id) );
+ALTER SEQUENCE person_id_seq OWNED BY person.id;
+
+
+CREATE TABLE refimg ( id INTEGER, fname VARCHAR(128), face BYTEA, orig_w INTEGER, orig_h INTEGER,
+    face_top INTEGER, face_right INTEGER, face_bottom INTEGER, face_left INTEGER, created_on FLOAT, thumbnail VARCHAR, model_used INTEGER, 
+    CONSTRAINT pk_refimg_id PRIMARY KEY(id),
+    CONSTRAINT fk_refimg_model_used FOREIGN KEY (model_used) REFERENCES ai_model(id) );
+ALTER SEQUENCE refimg_id_seq OWNED BY refimg.id;
+
+CREATE TABLE face( id INTEGER, face BYTEA, face_top INTEGER, face_right INTEGER, face_bottom INTEGER, face_left INTEGER, 
+    w INTEGER, h INTEGER, CONSTRAINT pk_face_id PRIMARY KEY(id) );
+
+CREATE TABLE face_file_link( face_id INTEGER, file_eid INTEGER, model_used INTEGER,
+    CONSTRAINT pk_ffl_face_id_file_id PRIMARY KEY(face_id, file_eid),
+    CONSTRAINT fk_ffl_face_id FOREIGN KEY (face_id) REFERENCES face(id) ON DELETE CASCADE,
+    CONSTRAINT fk_ffl_file_eid FOREIGN KEY (file_eid) REFERENCES file(eid),
+    CONSTRAINT fk_ffl_model_used FOREIGN KEY (model_used) REFERENCES ai_model(id) );
+
+CREATE TABLE face_refimg_link( face_id INTEGER, refimg_id INTEGER, face_distance FLOAT,
+    CONSTRAINT pk_frl_face_id_refimg_id PRIMARY KEY(face_id, refimg_id), 
+    CONSTRAINT fk_frl_face_id FOREIGN KEY (face_id) REFERENCES face(id) ON DELETE CASCADE,
+    CONSTRAINT fk_frl_refimg_id FOREIGN KEY (refimg_id) REFERENCES refimg(id) );
+
+CREATE TABLE face_override_type ( id INTEGER, name VARCHAR UNIQUE, CONSTRAINT pk_face_override_type_id PRIMARY KEY(id) );
+INSERT INTO face_override_type VALUES ( (SELECT NEXTVAL('face_override_type_id_seq')), 'mANUAL MATCH TO EXISTING PERSON' );
+INSERT INTO face_override_type VALUES ( (SELECT NEXTVAL('face_override_type_id_seq')), 'nOT A FACE' );
+INSERT INTO face_override_type VALUES ( (SELECT NEXTVAL('face_override_type_id_seq')), 'tOO YOUNG' );
+INSERT INTO face_override_type VALUES ( (SELECT NEXTVAL('face_override_type_id_seq')), 'iGNORE FACE' );

 -- keep non-redundant FACE because, when we rebuild data we may have a null FACE_ID, but still want to connect to this override
 -- from a previous AI pass... (would happen if we delete a file and then reimport/scan it), OR, more likely we change (say) a threshold, etc.
 -- any reordering of faces, generates new face_ids... (but if the face data was the same, then this override should stand)
-create table FACE_NO_MATCH_OVERRIDE ( ID integer, FACE_ID integer, TYPE_ID integer,
-    constraint FK_FNMO_FACE_ID foreign key (FACE_ID) references FACE(ID),
-    constraint FK_FNMO_TYPE foreign key (TYPE_ID) references FACE_OVERRIDE_TYPE(ID),
-    constraint PK_FNMO_ID primary key(ID) );
+CREATE TABLE face_no_match_override ( id INTEGER, face_id INTEGER, type_id INTEGER,
+    CONSTRAINT fk_fnmo_face_id FOREIGN KEY (face_id) REFERENCES face(id),
+    CONSTRAINT fk_fnmo_type FOREIGN KEY (type_id) REFERENCES face_override_type(id),
+    CONSTRAINT pk_fnmo_id PRIMARY KEY(id) );

 -- manual match goes to person not refimg, so on search, etc. we deal with this anomaly (via sql not ORM)
-create table FACE_FORCE_MATCH_OVERRIDE ( ID integer, FACE_ID integer, PERSON_ID integer, constraint PK_FACE_FORCE_MATCH_OVERRIDE_ID primary key(ID) );
+CREATE TABLE face_force_match_override ( id INTEGER, face_id INTEGER, person_id INTEGER, CONSTRAINT pk_face_force_match_override_id PRIMARY KEY(id) );

-create table DISCONNECTED_NO_MATCH_OVERRIDE ( FACE bytea, TYPE_ID integer, 
-	constraint FK_DNMO_TYPE_ID foreign key (TYPE_ID) references FACE_OVERRIDE_TYPE(ID),
-	constraint PK_DNMO_FACE primary key (FACE) );
+CREATE TABLE disconnected_no_match_override ( face BYTEA, type_id INTEGER, 
+	CONSTRAINT fk_dnmo_type_id FOREIGN KEY (type_id) REFERENCES face_override_type(id),
+	CONSTRAINT pk_dnmo_face PRIMARY KEY (face) );

-create table DISCONNECTED_FORCE_MATCH_OVERRIDE ( FACE bytea, PERSON_ID integer, 
-	constraint FK_DFMO_PERSON_ID foreign key (PERSON_ID) references PERSON(ID),
-	constraint PK_DFMO_FACE primary key (FACE) );
+CREATE TABLE disconnected_force_match_override ( face BYTEA, person_id INTEGER, 
+	CONSTRAINT fk_dfmo_person_id FOREIGN KEY (person_id) REFERENCES person(id),
+	CONSTRAINT pk_dfmo_face PRIMARY KEY (face) );

-create table PERSON_REFIMG_LINK ( PERSON_ID integer, REFIMG_ID integer,
-    constraint PK_PRL primary key(PERSON_ID, REFIMG_ID), 
-    constraint FK_PRL_PERSON_ID foreign key (PERSON_ID) references PERSON(ID), 
-    constraint FK_PRL_REFIMG_ID foreign key (REFIMG_ID) references REFIMG(ID), 
-    constraint U_PRL_REFIMG_ID unique(REFIMG_ID) );
+CREATE TABLE person_refimg_link ( person_id INTEGER, refimg_id INTEGER,
+    CONSTRAINT pk_prl PRIMARY KEY(person_id, refimg_id), 
+    CONSTRAINT fk_prl_person_id FOREIGN KEY (person_id) REFERENCES person(id), 
+    CONSTRAINT fk_prl_refimg_id FOREIGN KEY (refimg_id) REFERENCES refimg(id), 
+    CONSTRAINT u_prl_refimg_id UNIQUE(refimg_id) );

-create table JOB ( 
-    ID integer, START_TIME timestamptz, LAST_UPDATE timestamptz, NAME varchar(64), STATE varchar(128), 
-    NUM_FILES integer, CURRENT_FILE_NUM integer, CURRENT_FILE varchar(256), WAIT_FOR integer, PA_JOB_STATE varchar(48),
-    constraint PK_JOB_ID primary key(ID) );
+CREATE TABLE job ( 
+    id INTEGER, start_time TIMESTAMPTZ, last_update TIMESTAMPTZ, name VARCHAR(64), state VARCHAR(128), 
+    num_files INTEGER, current_file_num INTEGER, current_file VARCHAR(256), wait_for INTEGER, pa_job_state VARCHAR(48),
+    CONSTRAINT pk_job_id PRIMARY KEY(id) );

 -- used to pass / keep extra values, e.g. num_files for jobs that have sets of files, or out* for adding output from jobs that you want to pass to next job in the chain
-create table JOBEXTRA ( ID integer, JOB_ID integer, NAME varchar(32), VALUE varchar,
-    constraint PK_JOBEXTRA_ID primary key(ID), constraint FK_JOBEXTRA_JOB_ID foreign key(JOB_ID) references JOB(ID) );
+CREATE TABLE jobextra ( id INTEGER, job_id INTEGER, name VARCHAR(32), value VARCHAR,
+    CONSTRAINT pk_jobextra_id PRIMARY KEY(id), CONSTRAINT fk_jobextra_job_id FOREIGN KEY(job_id) REFERENCES job(id) );

-create table JOBLOG ( ID integer, JOB_ID integer, LOG_DATE timestamptz, LOG varchar, 
-    constraint PK_JL_ID primary key(ID), constraint FK_JL_JOB_ID foreign key(JOB_ID) references JOB(ID) );
+CREATE TABLE joblog ( id INTEGER, job_id INTEGER, log_date TIMESTAMPTZ, log VARCHAR, 
+    CONSTRAINT pk_jl_id PRIMARY KEY(id), CONSTRAINT fk_jl_job_id FOREIGN KEY(job_id) REFERENCES job(id) );

-create table PA_JOB_MANAGER_FE_MESSAGE ( ID integer, JOB_ID integer, LEVEL varchar(16), MESSAGE varchar(8192), PERSISTENT boolean, CANT_CLOSE boolean,
-    constraint PA_JOB_MANAGER_FE_ACKS_ID primary key(ID),
-    constraint FK_PA_JOB_MANAGER_FE_MESSAGE_JOB_ID foreign key(JOB_ID) references JOB(ID) );
+CREATE TABLE pa_job_manager_fe_message ( id INTEGER, job_id INTEGER, level VARCHAR(16), message VARCHAR(8192), persistent BOOLEAN, cant_close BOOLEAN,
+    CONSTRAINT pa_job_manager_fe_acks_id PRIMARY KEY(id),
+    CONSTRAINT fk_pa_job_manager_fe_message_job_id FOREIGN KEY(job_id) REFERENCES job(id) );

 -- default data for types of paths
-insert into PATH_TYPE values ( (select nextval('PATH_TYPE_ID_SEQ')), 'Import' );
-insert into PATH_TYPE values ( (select nextval('PATH_TYPE_ID_SEQ')), 'Storage' );
-insert into PATH_TYPE values ( (select nextval('PATH_TYPE_ID_SEQ')), 'Bin' );
-insert into PATH_TYPE values ( (select nextval('PATH_TYPE_ID_SEQ')), 'Metadata' );
+INSERT INTO path_type VALUES ( (SELECT NEXTVAL('path_type_id_seq')), 'iMPORT' );
+INSERT INTO path_type VALUES ( (SELECT NEXTVAL('path_type_id_seq')), 'sTORAGE' );
+INSERT INTO path_type VALUES ( (SELECT NEXTVAL('path_type_id_seq')), 'bIN' );
+INSERT INTO path_type VALUES ( (SELECT NEXTVAL('path_type_id_seq')), 'mETADATA' );

 -- default data for types of files
-insert into FILE_TYPE values ( (select nextval('FILE_TYPE_ID_SEQ')), 'Image' );
-insert into FILE_TYPE values ( (select nextval('FILE_TYPE_ID_SEQ')), 'Video' );
-insert into FILE_TYPE values ( (select nextval('FILE_TYPE_ID_SEQ')), 'Directory' );
-insert into FILE_TYPE values ( (select nextval('FILE_TYPE_ID_SEQ')), 'Unknown' );
+INSERT INTO file_type VALUES ( (SELECT NEXTVAL('file_type_id_seq')), 'iMAGE' );
+INSERT INTO file_type VALUES ( (SELECT NEXTVAL('file_type_id_seq')), 'vIDEO' );
+INSERT INTO file_type VALUES ( (SELECT NEXTVAL('file_type_id_seq')), 'dIRECTORY' );
+INSERT INTO file_type VALUES ( (SELECT NEXTVAL('file_type_id_seq')), 'uNKNOWN' );

 -- fake data only for making testing easier
--insert into PERSON values ( (select nextval('PERSON_ID_SEQ')), 'dad', 'Damien', 'De Paoli' );
--insert into PERSON values ( (select nextval('PERSON_ID_SEQ')), 'mum', 'Mandy', 'De Paoli' );
--insert into PERSON values ( (select nextval('PERSON_ID_SEQ')), 'cam', 'Cameron', 'De Paoli' );
--insert into PERSON values ( (select nextval('PERSON_ID_SEQ')), 'mich', 'Michelle', 'De Paoli' );
+--INSERT INTO person VALUES ( (SELECT NEXTVAL('person_id_seq')), 'dad', 'Damien', 'De Paoli' );
+--INSERT INTO person VALUES ( (SELECT NEXTVAL('person_id_seq')), 'mum', 'Mandy', 'De Paoli' );
+--INSERT INTO person VALUES ( (SELECT NEXTVAL('person_id_seq')), 'cam', 'Cameron', 'De Paoli' );
+--INSERT INTO person VALUES ( (SELECT NEXTVAL('person_id_seq')), 'mich', 'Michelle', 'De Paoli' );
 -- DEV(ddp):
-insert into SETTINGS ( id, base_path, import_path, storage_path, recycle_bin_path, metadata_path, auto_rotate, default_refimg_model, default_scan_model, default_threshold, face_size_limit, scheduled_import_scan, scheduled_storage_scan, scheduled_bin_cleanup, bin_cleanup_file_age, job_archive_age ) values ( (select nextval('SETTINGS_ID_SEQ')), '/home/ddp/src/photoassistant/', 'images_to_process/', 'photos/', '.pa_bin/', '.pa_metadata/', true, 1, 1, '0.55', 43, 1, 1, 7, 30, 3 );
+INSERT INTO settings ( ID, BASE_PATH, IMPORT_PATH, STORAGE_PATH, RECYCLE_BIN_PATH, METADATA_PATH, AUTO_ROTATE, DEFAULT_REFIMG_MODEL, DEFAULT_SCAN_MODEL, DEFAULT_THRESHOLD, FACE_SIZE_LIMIT, SCHEDULED_IMPORT_SCAN, SCHEDULED_STORAGE_SCAN, SCHEDULED_BIN_CLEANUP, BIN_CLEANUP_FILE_AGE, JOB_ARCHIVE_AGE ) VALUES ( (SELECT NEXTVAL('settings_id_seq')), '/HOME/DDP/SRC/PHOTOASSISTANT/', 'IMAGES_TO_PROCESS/', 'PHOTOS/', '.PA_BIN/', '.PA_METADATA/', TRUE, 1, 1, '0.55', 43, 1, 1, 7, 30, 3 );
 -- DEV(cam):
--insert into SETTINGS ( id, base_path, import_path, storage_path, recycle_bin_path, metadata_path, auto_rotate, default_refimg_model, default_scan_model, default_threshold, face_size_limit, scheduled_import_scan, scheduled_storage_scan, scheduled_bin_cleanup, bin_cleanup_file_age, job_archive_age ) values ( (select nextval('SETTINGS_ID_SEQ')), 'c:/Users/cam/Desktop/code/python/photoassistant/', 'c:\images_to_process', 'photos/', '.pa_bin/', '.pa_metadata/', true, 1, 1, '0.55', 43, 1, 1, 7, 30, 3 );
+--INSERT INTO settings ( id, base_path, import_path, storage_path, recycle_bin_path, metadata_path, auto_rotate, default_refimg_model, default_scan_model, default_threshold, face_size_limit, scheduled_import_scan, scheduled_storage_scan, scheduled_bin_cleanup, bin_cleanup_file_age, job_archive_age ) VALUES ( (select nextval('SETTINGS_ID_SEQ')), 'c:/Users/cam/Desktop/code/python/photoassistant/', 'c:\images_to_process', 'photos/', '.pa_bin/', '.pa_metadata/', TRUE, 1, 1, '0.55', 43, 1, 1, 7, 30, 3 );
 -- PROD:
--insert into SETTINGS ( id, base_path, import_path, storage_path, recycle_bin_path, metadata_path, auto_rotate, default_refimg_model, default_scan_model, default_threshold, face_size_limit, scheduled_import_scan, scheduled_storage_scan, scheduled_bin_cleanup, bin_cleanup_file_age, job_archive_age ) values ( (select nextval('SETTINGS_ID_SEQ')), '/export/docker/storage/', 'Camera_uploads/', 'photos/', '.pa_bin/', '.pa_metadata/', true, 1, 1, '0.55', 43, 1, 1, 7, 30, 4 );
+--INSERT INTO settings ( id, base_path, import_path, storage_path, recycle_bin_path, metadata_path, auto_rotate, default_refimg_model, default_scan_model, default_threshold, face_size_limit, scheduled_import_scan, scheduled_storage_scan, scheduled_bin_cleanup, bin_cleanup_file_age, job_archive_age ) VALUES ( (SELECT NEXTVAL('settings_id_seq')), '/export/docker/storage/', 'Camera_uploads/', 'photos/', '.pa_bin/', '.pa_metadata/', TRUE, 1, 1, '0.55', 43, 1, 1, 7, 30, 4 );
--- a/templates/base.html
+++ b/templates/base.html
@@ -136,7 +136,7 @@

 {% if not InDBox %}
 	{%block script_content %}{% endblock script_content %}
-        <div id="status_container" class="position-fixed top-0 end-0 p-0 my-5" "z-index: 11"> </div>
+        <div id="status_container" class="position-fixed top-0 end-0 p-0 my-5" style="z-index: 9999"> </div>
        <!-- CheckForJobs(), will see if there are any messages/jobs and keep doing this until there are 0 more and then stop -->
        <script>
            $(document).ready(function() { CheckForJobs() } )
--- a/templates/file_list.html
+++ b/templates/file_list.html
@@ -1,64 +1,50 @@
 {% extends "base.html" %} {% block main_content %}
+    <script src="{{ url_for( 'internal', filename='js/files_support.js')}}"></script>
+
    <div class="container-fluid">
        <h3 class="offset-2">{{page_title}}</h3>
-        <form id="main_form" method="POST">
-            <input id="offset" type="hidden" name="offset" value="{{OPT.offset}}">
-            <input id="grouping" type="hidden" name="grouping" value="">
-            <input id="folders" type="hidden" name="folders" value="False">
            <div class="col col-auto">
                <div class="input-group">
-                    {{CreateSelect( "noo", OPT.noo, ["Oldest", "Newest","A to Z", "Z to A"], "$('#offset').val(0)", "rounded-start py-1 my-1")|safe }}
-                    {{CreateSelect( "how_many", OPT.how_many|string, ["10", "25", "50", "75", "100", "150", "200", "500"], "", "rounded-end py-1 my-1" )|safe }}
+                    {{CreateSelect( "noo", OPT.noo, ["Oldest", "Newest","A to Z", "Z to A"], "changeOPT(getPageFileList); return false", "rounded-start py-1 my-1")|safe }}
+                    {{CreateSelect( "how_many", OPT.how_many|string, ["10", "25", "50", "75", "100", "150", "200", "500"], "changeOPT(getPageFileList); return false", "rounded-end py-1 my-1" )|safe }}
                    <div class="mb-1 col my-auto d-flex justify-content-center">
-                        {% set prv_disabled="" %}
-                        {% if OPT.offset|int == 0 %}
-                            {% set prv_disabled="disabled" %}
-                        {% endif %}
-                        <button id="prev" {{prv_disabled}} name="prev" class="prev sm-txt btn btn-outline-secondary">
+                        <button id="prev" name="prev" class="prev sm-txt btn btn-outline-secondary" onClick="prevPage(getPageFileList)">
                            <svg width="16" height="16" fill="currentColor"><use xlink:href="{{url_for('internal', filename='icons.svg')}}#prev"/></svg>
                        </button>
-                        <span class="sm-txt my-auto">&nbsp;{{OPT.how_many}} files&nbsp;</span>
-                        {% set nxt_disabled="" %}
-                        {% if entry_data|length < OPT.how_many|int %}
-                            {% set nxt_disabled="disabled" %}
-                        {% endif %}
-                        <button id="next" {{nxt_disabled}} name="next" class="next sm-txt btn btn-outline-secondary">
+                        <span class="how_many_text sm-txt my-auto">&nbsp;{{OPT.how_many}} files&nbsp;</span>
+                        <button id="next" name="next" class="next sm-txt btn btn-outline-secondary" onClick="nextPage(getPageFileList)">
                            <svg width="16" height="16" fill="currentColor"><use xlink:href="{{url_for('internal', filename='icons.svg')}}#next"/></svg>
                        </button>
                    </div class="col...">
                </div class="input-group...">
            </div class="col col-auto">
-        </form
-        <div class="row">
-            <table class="table table-striped table-sm col-xl-12">
-            <thead><tr class="table-primary"><th>Name</th><th>Size (MB)</th><th>Path Prefix</th><th>Hash</th></tr></thead><tbody>
-                {% for obj in entry_data %}
-                    <tr><td>
-                        {% if obj.type.name == "Image" or obj.type.name == "Video" %}
-                            <figure class="figure" font-size: 24px;>
-                                <div style="position:relative; width:100%">
-                                    {% if obj.type.name=="Image" %}
-                                        <a href="{{obj.in_dir.in_path.path_prefix}}/{{obj.in_dir.rel_path}}/{{obj.name}}">
-                                    {% elif obj.type.name == "Video" %}
-                                        <a href="{{obj.in_dir.in_path.path_prefix}}/{{obj.in_dir.rel_path}}/{{obj.name}}">
-                                    {% endif %}
-                                    <img class="thumb" style="display:block" height="48" src="data:image/jpeg;base64,{{obj.file_details.thumbnail}}"></img>
-                                    {% if obj.type.name=="Image" or obj.type.name == "Video" %}
-                                        </a>
-                                    {% endif %}
-                                </div>
-                                <figcaption class="figure-caption">{{obj.name}}</figcaption>
-                            </figure>
-                        {% endif %}
-                    </td>
-                    {% if obj.type.name != "Directory" %}
-                        <td>{{obj.file_details.size_mb}}</td><td>{{obj.in_dir.in_path.path_prefix.replace("static/","")}}/{{obj.in_dir.rel_path}}</td><td>{{obj.file_details.hash}}</td>
-                    {% else %}
-                        <td></td><td></td><td></td>
-                    {% endif %}
-                    </tr>
-                {% endfor %}
-            </tbody></table>
-        </div class="row">
    </div class="container">
+    <div id="file_list_div" class="container-fluid pt-2">
+    </div class="container">
+    <div class="container-fluid">
+        <input type="hidden" name="cwd" id="cwd" value="{{OPT.cwd}}">
+        <div class="row">
+            <div class="col my-auto d-flex justify-content-center">
+                <button aria-label="prev" id="prev" name="prev" class="prev sm-txt btn btn-outline-secondary disabled" onClick="prevPage(getPageFileList)" disabled>
+                    <svg width="16" height="16" fill="currentColor"><use xlink:href="{{url_for('internal', filename='icons.svg')}}#prev"/></svg>
+                </button>
+                <span class="how_many_text sm-txt my-auto">&nbsp;{{OPT.how_many}} files&nbsp;</span>
+                <button aria-label="next" id="next" name="next" class="next sm-txt btn btn-outline-secondary" onClick="nextPage(getPageFileList)">
+                    <svg width="16" height="16" fill="currentColor"><use xlink:href="{{url_for('internal', filename='icons.svg')}}#next"/></svg>
+                </button>
+            </div class="col my-auto">                                                                                                                                                                                   </div class="row">
+    </div class="container-fluid">
 {% endblock main_content %}
+{% block script_content %}
+<script>
+    // this is the list of entry ids for the images for ALL matches for this query
+    var entryList={{query_data.entry_list}}
+    var OPT = {{ OPT.to_dict()|tojson }};
+    OPT.root_eid = {{ query_data.root_eid }};
+
+    // pageList is just those entries shown on this page from the full entryList
+    var pageList=[]
+    // force pageList to set pageList for & render the first page
+    getPage( 1, getPageFileList )
+</script>
+{% endblock script_content %}
--- a/templates/files.html
+++ b/templates/files.html
@@ -1,33 +1,26 @@
 {% extends "base.html" %}
 {% block main_content %}

-    <script src="{{ url_for( 'internal', filename='js/files_support.js')}}"></script>
+    <style>
+        .norm-txt { font-size: 1.0rem }
+        .form-check-input:checked {
+            background-color: #39C0ED;
+            border-color: #CFF4FC;
+        }
+        .form-switch .form-check-input {
+          background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='-4 -4 8 8'%3e%3ccircle r='3' fill='%2339C0ED'/%3e%3c/svg%3e");
+        }
+        .form-switch .form-check-input:focus {
+          background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='-4 -4 8 8'%3e%3ccircle r='3' fill='%23CFF4FC'/%3e%3c/svg%3e");
+        }
+        #tst90:hover,#tst90:focus { filter: invert(73%) sepia(27%) saturate(3970%) hue-rotate(146deg) brightness(94%) contrast(100%); }
+    </style>
    <script src="{{ url_for( 'internal', filename='js/files_transform.js')}}"></script>
+    <script src="{{ url_for( 'internal', filename='js/files_support.js')}}"></script>
+    <script src="{{ url_for( 'internal', filename='js/view_support.js')}}"></script>

-    <script>
-        document.fake_shift=0
-        document.fake_ctrl=0
-        var move_paths=[]
-        {% for p in move_paths %}
-            p = new Object()
-            p.type = '{{p.type}}'
-            p.path = '{{p.path}}'
-            p.icon_url = '{{p.icon_url}}'
-            move_paths.push(p)
-        {% endfor %}
-
-        document.OPT = '{{OPT}}'
-        document.entries = '{{entry_data}}'
-        document.how_many = '{{OPT.how_many}}'
-        document.entries_len = '{{entry_data|length}}'
-    </script>
-
+    <div id="files_div">
        <div class="container-fluid">
-        <form id="main_form" method="POST" action="/change_file_opts">
-            <input type="hidden" name="cwd" id="cwd" value="{{OPT.cwd}}">
-            {% if search_term is defined %}
-                <input type="hidden" name="search_term" id="view_term" value="{{search_term}}">
-            {% endif %}
            <div class="d-flex row mb-2">
                {% if OPT.folders %}
                    <div class="my-auto col col-auto">
@@ -47,15 +40,14 @@
                {% endif %}
                <div class="col col-auto">
                    <div class="input-group">
-                    {{CreateSelect( "noo", OPT.noo, ["Oldest", "Newest","A to Z", "Z to A"], "$('#offset').val(0)", "rounded-start py-2")|safe }}
-                    {{CreateSelect( "how_many", OPT.how_many|string, ["10", "25", "50", "75", "100", "150", "200", "500"])|safe }}
+                    {{CreateSelect( "noo", OPT.noo, ["Oldest", "Newest","A to Z", "Z to A"], "changeOPT(getPageFigures); return false", "rounded-start py-2")|safe }}
+                    {{CreateSelect( "how_many", OPT.how_many|string, ["10", "25", "50", "75", "100", "150", "200", "500"], "changeOPT(getPageFigures); return false" )|safe }}
                    {% if OPT.folders %}
-                        <input type="hidden" name="grouping" id="grouping" value="{{OPT.grouping}}">
-                        {{CreateFoldersSelect( OPT.folders, "rounded-end" )|safe }}
+                        {{CreateFoldersSelect( OPT.folders, "changeOPT(getPageFigures); return false", "rounded-end" )|safe }}
                    {% else %}
-                        {{CreateFoldersSelect( OPT.folders )|safe }}
+                        {{CreateFoldersSelect( OPT.folders, "changeOPT(getPageFigures); return false" )|safe }}
                        <span class="sm-txt my-auto btn btn-outline-info disabled border-top border-bottom">grouped by:</span>
-                        {{CreateSelect( "grouping", OPT.grouping, ["None", "Day", "Week", "Month"], "", "rounded-end")|safe }}
+                        {{CreateSelect( "grouping", OPT.grouping, ["None", "Day", "Week", "Month"], "OPT.grouping=$('#grouping').val();drawPageOfFigures();return false", "rounded-end")|safe }}
                    {% endif %}
                    </div class="input-group">
                </div class="col">
@@ -63,23 +55,16 @@
                    <div class="col col-auto my-auto">
                        <span class="alert alert-primary p-2">Searched for: '{{search_term}}'</span>
                    </div class="col my-auto">
-                    <script>
-                        $('#folders').prop('disabled', 'disabled').removeClass('border-info').addClass('border-secondary').removeClass('text-info').addClass('text-secondary');
-                    </script>
                {% endif %}
                <div class="col flex-grow-1 my-auto d-flex justify-content-center w-100">
-                    <button aria-label="prev" id="prev" name="prev" class="prev sm-txt btn btn-outline-secondary">
+                    <button aria-label="prev" id="prev" name="prev" class="prev sm-txt btn btn-outline-secondary disabled" onClick="prevPage(getPageFigures)" disabled>
                        <svg width="16" height="16" fill="currentColor"><use xlink:href="{{url_for('internal', filename='icons.svg')}}#prev"/></svg>
                    </button>
-                    <span class="sm-txt my-auto">&nbsp;{{OPT.how_many}} files&nbsp;</span>
-                    {% set nxt_disabled="" %}
-                    {% if not entry_data or entry_data|length < OPT.how_many|int %}
-                        {% set nxt_disabled="disabled" %}
-                    {% endif %}
-                    <button aria-label="next" id="next" {{nxt_disabled}} name="next" class="next sm-txt btn btn-outline-secondary">
+                    <span class="how_many_text sm-txt my-auto">&nbsp;{{OPT.how_many}} files&nbsp;</span>
+                    <button aria-label="next" id="next" name="next" class="next sm-txt btn btn-outline-secondary" onClick="nextPage(getPageFigures)">
                        <svg width="16" height="16" fill="currentColor"><use xlink:href="{{url_for('internal', filename='icons.svg')}}#next"/></svg>
                    </button>
-                    <button aria-label="move" id="move" disabled name="move" class="sm-txt btn btn-outline-primary ms-4" onClick="MoveDBox(move_paths,'{{url_for('internal', filename='icons.svg')}}'); return false;">
+                    <button aria-label="move" id="move" disabled name="move" class="sm-txt btn btn-outline-primary ms-4" onClick="MoveDBox(move_paths); return false;">
                        <svg width="16" height="16" fill="currentColor"><use xlink:href="{{url_for('internal', filename='icons.svg')}}#folder_plus"/></svg>
                    </button>
                    {% if "files_rbp" in request.url %}
@@ -92,339 +77,208 @@
                    </button>
                    <button style="visibility:hidden" class="btn btn-outline-secondary" aria-label="shift-key" id="shift-key" onclick="document.fake_shift=1-document.fake_shift; event.stopPropagation(); return false">shift</button>
                    <button style="visibility:hidden" class="btn btn-outline-secondary" aria-label="ctrl-key" id="ctrl-key" onclick="document.fake_ctrl=1-document.fake_ctrl; event.stopPropagation(); return false">ctrl</button>
-                </div>
+                </div class="col flex-grow-1">
                <div class="d-flex col col-auto justify-content-end">
-                    <div class="btn-group">
-                    {% if OPT.size == 64 %}
-                        {% set bt="btn-info text-white" %}
-                    {% else %}
-                        {% set bt="btn-outline-info" %}
-                    {% endif %}
-                        <button aria-label="extra small" id="64" class="px-2 sm-txt sz-but btn {{bt}}" onClick="$('#size').val(64)">XS</button>
-                    {% if OPT.size == 96 %}
-                        {% set bt="btn-info text-white" %}
-                    {% else %}
-                        {% set bt="btn-outline-info" %}
-                    {% endif %}
-                        <button aria-label="small" id="96" class="px-2 sm-txt sz-but btn {{bt}}" onClick="$('#size').val(96)">S</button>
-                    {% if OPT.size == 128 %}
-                        {% set bt="btn-info text-white" %}
-                    {% else %}
-                        {% set bt="btn-outline-info" %}
-                    {% endif %}
-                        <button aria-label="medium" id="128" class="px-2 sm-txt sz-but btn {{bt}}" onClick="$('#size').val(128)">M</button>
-                    {% if OPT.size == 192 %}
-                        {% set bt="btn-info text-white" %}
-                    {% else %}
-                        {% set bt="btn-outline-info" %}
-                    {% endif %}
-                        <button aria-label="large" id="192" class="px-2 sm-txt sz-but btn {{bt}}" onClick="$('#size').val(192)">L</button>
-                    {% if OPT.size == 256 %}
-                        {% set bt="btn-info text-white" %}
-                    {% else %}
-                        {% set bt="btn-outline-info" %}
-                    {% endif %}
-                        <button aria-label="extra large" id="256" class="px-2 sm-txt sz-but btn {{bt}}" onClick="$('#size').val(256)">XL</button>
-                    </div class="btn-group">
-                </div class="col">
-                <input id="offset" type="hidden" name="offset" value="{{OPT.offset}}">
-                <input id="size" type="hidden" name="size" value="{{OPT.size}}">
-            </div class="form-row">
-            {% set eids=namespace( str="" ) %}
-            {# gather all the file eids and collect them in case we go gallery mode #}
-            {% for obj in entry_data %}
-                {% if obj.type.name != "Directory" %}
-                    {% set eids.str = eids.str + obj.id|string +"," %}
-                {% endif %}
-            {% endfor %}
-            <input name="eids" id="eids" type="hidden" value="{{eids.str}}">
-        </form>
-    </div>
-    {% set ecnt=namespace( val=0 ) %}
-    <div class="row ms-2">
-        {% set last = namespace(printed=0) %}
-        {# rare event of empty folder, still need to show back button #}
-        {% if OPT.folders and entry_data|length == 0 %}
-            {% if OPT.cwd != OPT.root %}
-                <figure id="_back" class="dir entry m-1" ecnt="{{ecnt.val}}" dir="{{OPT.cwd|ParentPath}}" type="Directory">
-                    <svg class="svg" width="{{OPT.size|int-22}}" height="{{OPT.size|int-22}}"><use xlink:href="{{url_for('internal', filename='icons.svg')}}#folder_back"/></svg>
-                    <figcaption class="figure-caption text-center">Back</figcaption>
-                </figure class="figure">
-                {% set ecnt.val=ecnt.val+1 %}
-                <script>f=$('#_back'); w=f.find('svg').width(); f.find('figcaption').width(w);</script>
-            {% else %}
-                <div class="col col-auto g-0 m-1">
-                    <svg class="svg" width="{{OPT.size|int-22}}" height="{{OPT.size|int-22}}"><use xlink:href="{{url_for('internal', filename='icons.svg')}}#folder_back_gray"/></svg>
-                </div>
-            {% endif %}
-        {% endif %}
-        {% if not entry_data %}
-            <span class="alert alert-danger p-2 col-auto"> No matches for: '{{search_term}}'</span>
-        {% endif %}
-        {% for obj in entry_data %}
-            {% if loop.index==1 and OPT.folders %}
-                {% if OPT.cwd != OPT.root %}
-                    <figure class="col col-auto g-0 dir entry m-1" ecnt="{{ecnt.val}}" dir="{{OPT.cwd|ParentPath}}" type="Directory">
-                        <svg class="svg" width="{{OPT.size|int-22}}" height="{{OPT.size|int-22}}" fill="currentColor">
-                            <use xlink:href="{{url_for('internal', filename='icons.svg')}}#folder_back"/></svg>
-                        <figcaption class="svg_cap figure-caption text-center">Back</figcaption>
-                    </figure class="figure">
-                    {% set ecnt.val=ecnt.val+1 %}
-                {% else %}
-                    {# create an even lighter-grey, unclickable back button - so folders dont jump around when you go into them #}
-                    <div class="col col-auto g-0 m-1">
-                        <svg class="svg" width="{{OPT.size|int-22}}" height="{{OPT.size|int-22}}"><use xlink:href="{{url_for('internal', filename='icons.svg')}}#folder_back_gray"/></svg>
-                    </div>
-                {% endif %}
-            {% endif %}
-            {% if not OPT.folders and obj.type.name == "Directory" %}
-                {% continue %}
-            {% endif %}
-            {% if OPT.grouping == "Day" %}
-                {% if last.printed != obj.file_details.day %}
-                    <div class="row ps-3"><h6>Day: {{obj.file_details.day}} of {{obj.file_details.month}}/{{obj.file_details.year}}</h6></div>
-                    {% set last.printed = obj.file_details.day %}
-                {% endif %}
-            {% elif OPT.grouping == "Week" %}
-                {% if last.printed != obj.file_details.woy %}
-                    <div class="row ps-3"><h6>Week #: {{obj.file_details.woy}} of {{obj.file_details.year}}</h6></div>
-                    {% set last.printed = obj.file_details.woy %}
-                {% endif %}
-            {% elif OPT.grouping == "Month" %}
-                {% if last.printed != obj.file_details.month %}
-                    <div class="row ps-3"><h6>Month: {{obj.file_details.month}} of {{obj.file_details.year}}</h6></div>
-                    {% set last.printed = obj.file_details.month %}
-                {% endif %}
-            {% endif %}
-            {% if obj.type.name == "Image" or obj.type.name == "Video" or obj.type.name == "Unknown" %}
-                {% if (not OPT.folders) or ((obj.in_dir.in_path.path_prefix+'/'+obj.in_dir.rel_path+'/'+obj.name) | TopLevelFolderOf(OPT.cwd)) %}
-                    <figure id="{{obj.id}}" ecnt="{{ecnt.val}}" class="col col-auto g-0 figure entry m-1" path_type="{{obj.in_dir.in_path.type.name}}" size="{{obj.file_details.size_mb}}" hash="{{obj.file_details.hash}}" in_dir="{{obj.in_dir.in_path.path_prefix}}/{{obj.in_dir.rel_path}}" fname="{{obj.name}}" yr="{{obj.file_details.year}}" date="{{obj.file_details.year}}{{"%02d" % obj.file_details.month}}{{"%02d" % obj.file_details.day}}" pretty_date="{{obj.file_details.day}}/{{obj.file_details.month}}/{{obj.file_details.year}}" type="{{obj.type.name}}">
-                        {% if obj.type.name=="Image" or obj.type.name=="Unknown" %}
-                            <div style="position:relative; width:100%">
-                                {% if obj.file_details.thumbnail %}
-                                    <a href="{{obj.in_dir.in_path.path_prefix}}/{{obj.in_dir.rel_path}}/{{obj.name}}">
-                                        <img alt="{{obj.name}}" class="thumb" height="{{OPT.size}}" src="data:image/jpeg;base64,{{obj.file_details.thumbnail}}"></img></a>
-                                {% else %}
-                                    <a href="{{obj.in_dir.in_path.path_prefix}}/{{obj.in_dir.rel_path}}/{{obj.name}}">
-                                        <svg width="{{OPT.size}}" height="{{OPT.size}}" fill="white"><use xlink:href="{{url_for('internal', filename='icons.svg')}}#unknown_ftype"/></svg>
-                                    </a>
-                                {% endif %}
-                                {% if search_term is defined %}
-                                    <div style="position:absolute; bottom: 0px; left: 2px;">
-                                        <svg width="16" height="16" fill="white"><use xlink:href="{{url_for('internal', filename='icons.svg')}}#{{LocationIcon(obj)}}"/></svg>
-                                    </div>
-                                {% endif %}
-                                <div id="s{{obj.id}}" style="display:none; position:absolute; top: 50%; left:50%; transform:translate(-50%, -50%);">
-                                    <img height="64px" src="{{url_for('internal', filename='throbber.gif')}}"></img>
-                                </div>
-                            </div>
-                        {% elif obj.type.name == "Video" %}
-                            <div style="position:relative; width:100%">
-                                {% if obj.file_details.thumbnail %}
-                                    <a href="{{obj.in_dir.in_path.path_prefix}}/{{obj.in_dir.rel_path}}/{{obj.name}}">
-                                        <img alt="{{obj.name}}" class="thumb" height="{{OPT.size}}" src="data:image/jpeg;base64,{{obj.file_details.thumbnail}}"></img></a>
-                                {% else %}
-                                    <a href="{{obj.in_dir.in_path.path_prefix}}/{{obj.in_dir.rel_path}}/{{obj.name}}">
-                                        <svg width="{{OPT.size}}" height="{{OPT.size}}" fill="white"><use xlink:href="{{url_for('internal', filename='icons.svg')}}#unknown_ftype"/></svg>
-                                    </a>
-                                {% endif %}
+                    <div class="btn-group" role="group" aria-label="Size radio button group">
+                        <input type="radio" class="btn-check" name="size" id="size-xs" onCLick="changeSize()" autocomplete="off" value="64">
+                        <label class="btn btn-outline-info btn-radio" for="size-xs">XS</label>

-                                <div style="position:absolute; top: 0px; left: 2px;">
-                                    <svg width="16" height="16" fill="white"><use xlink:href="{{url_for('internal', filename='icons.svg')}}#film"/></svg>
-                                </div>
-                                {% if search_term is defined %}
-                                    <div style="position:absolute; bottom: 0px; left: 2px;">
-                                        <svg width="16" height="16" fill="white"><use xlink:href="{{url_for('internal', filename='icons.svg')}}#{{LocationIcon(obj)}}"/></svg>
-                                    </div>
-                                {% endif %}
-                            </div>
-                        {% endif %}
-                    </figure>
-                    {% set ecnt.val=ecnt.val+1 %}
-                {% endif %}
-            {% elif obj.type.name == "Directory" %}
-                {% if OPT.folders %}
-                    {% if obj.dir_details.rel_path | length %}
-                        {% set dirname=obj.dir_details.in_path.path_prefix+'/'+obj.dir_details.rel_path %}
-                    {% else %}
-                        {% set dirname=obj.dir_details.in_path.path_prefix %}
-                    {% endif %}
-                    {# if this dir is the toplevel of the cwd, show the folder icon #}
-                    {% if dirname| TopLevelFolderOf(OPT.cwd) %}
-                        <figure class="col col-auto g-0 dir entry m-1" id={{obj.id}} ecnt={{ecnt.val}} dir="{{dirname}}" type="Directory">
-                            <svg class="svg" width="{{OPT.size|int-22}}" height="{{OPT.size|int-22}}" fill="currentColor">
-                                <use xlink:href="{{url_for('internal', filename='icons.svg')}}#Directory"/></svg>
-                            <figcaption class="svg_cap figure-caption text-center text-wrap text-break">{{obj.name}}</figcaption>
-                        </figure class="figure">
-                        {% set ecnt.val=ecnt.val+1 %}
-                        <script>f=$('#{{obj.id}}'); w=f.find('svg').width(); f.find('figcaption').width(w);</script>
-                    {% endif %}
-                {% endif %}
-            {% endif %}
-        {% endfor %}
+                        <input type="radio" class="btn-check" name="size" id="size-s" onCLick="changeSize()" autocomplete="off" value="96">
+                        <label class="btn btn-outline-info btn-radio" for="size-s">S</label>

+                        <input type="radio" class="btn-check" name="size" id="size-m" onCLick="changeSize()" autocomplete="off" value="128">
+                        <label class="btn btn-outline-info btn-radio" for="size-m">M</label>
+
+                        <input type="radio" class="btn-check" name="size" id="size-l" onCLick="changeSize()" autocomplete="off" value="192">
+                        <label class="btn btn-outline-info btn-radio" for="size-l">L</label>
+
+                        <input type="radio" class="btn-check" name="size" id="size-xl" onCLick="changeSize()" autocomplete="off" value="256">
+                        <label class="btn btn-outline-info btn-radio" for="size-xl">XL</label>
+                    </div>
+                </div class="d-flex col">
+            </div class="d-flex row mb-2">
+        </div container="fluid">
+        <div id="figures" class="row ms-2">
        </div>
        <div class="container-fluid">
-            <form id="nav_form" method="POST" action="/change_file_opts">
-                <input type="hidden" name="cwd" id="cwd" value="{{OPT.cwd}}">
            <div class="row">
                <div class="col my-auto d-flex justify-content-center">
-                        <button aria-label="prev" id="prev" name="prev" class="prev sm-txt btn btn-outline-secondary">
+                    <button aria-label="prev" id="prev" name="prev" class="prev sm-txt btn btn-outline-secondary disabled" onClick="prevPage(getPageFigures)" disabled>
                        <svg width="16" height="16" fill="currentColor"><use xlink:href="{{url_for('internal', filename='icons.svg')}}#prev"/></svg>
                    </button>
-                        <span class="sm-txt my-auto">&nbsp;{{OPT.how_many}} files&nbsp;</span>
-                        <button aria-label="next" id="next" {{nxt_disabled}} name="next" class="next sm-txt btn btn-outline-secondary">
+                    <span class="how_many_text sm-txt my-auto">&nbsp;{{OPT.how_many}} files&nbsp;</span>
+                    <button aria-label="next" id="next" name="next" class="next sm-txt btn btn-outline-secondary" onClick="nextPage(getPageFigures)">
+                        <svg width="16" height="16" fill="currentColor"><use xlink:href="{{url_for('internal', filename='icons.svg')}}#next"/></svg>
+                    </button>
+                </div class="col my-auto">
+            </div class="row">
+        </div class="container-fluid">
+    </div id="files_div">
+    <div id="viewer_div" class="d-none">
+        <div id="viewer" class="container-fluid">
+            <div class="row">
+                <button title="Show previous image" class="col-auto btn btn-outline-info px-2" 
+                    style="padding: 10%" id="la" 
+                    onClick="
+                        getPreviousEntry()
+                        setDisabledForViewingNextPrevBttons()
+                        ViewImageOrVideo()
+                        ">
+                    <svg width="16" height="16" fill="currentColor">
+                        <use xlink:href="{{url_for('internal', filename='icons.svg')}}#prev"/></svg>
+                </button>
+                <figure class="col col-auto border border-info rounded m-0 p-1" id="figure">
+                    <canvas id="canvas"></canvas>
+                    <img id="throbber" src="{{url_for('internal', filename='throbber.gif')}}" style="display:none;">
+                    <script>
+                        var im=new Image();
+                        im.onload=DrawImg
+                        var context = canvas.getContext('2d')
+                    </script>
+                    <figcaption id="img-cap" class="figure-caption text-center text-wrap text-break">
+                        <span id="fname_i"></span></figcaption>
+                </figure>
+                <div id="video_div" class="col col-auto">
+                    <video id="video" class="col col-auto" controls>
+                        <source id="videoSource" src="" type="video/mp4">
+                        Your browser does not support the video tag.
+                    </video>
+                    <figcaption id="vid-cap" class="figure-caption text-center text-wrap text-break">
+                        <span id="fname_v"></span></figcaption>
+                </div>
+                <button title="Show next image" class="col-auto btn btn-outline-info px-2" style="padding: 10%" id="ra" 
+                    onClick="
+                        getNextEntry()
+                        setDisabledForViewingNextPrevBttons()
+                        ViewImageOrVideo()
+                    ">
+                    <svg width="16" height="16" fill="currentColor">
+                        <use xlink:href="{{url_for('internal', filename='icons.svg')}}#next"/></svg>
+                </button>
+            </div class="row">
+            <div class="row">
+                {# this whole div, just takes up the same space as the left button and is hidden for alignment only #}
+                <div class="col-auto px-0">
+                    <button class="btn btn-outline-info px-2 invisible" disabled>
                        <svg width="16" height="16" fill="currentColor"><use xlink:href="{{url_for('internal', filename='icons.svg')}}#next"/></svg>
                    </button>
                </div>
+                <span class="col-auto my-auto">Show:</span>
+                <div title="Toggle showing filename (hotkey: n)" class="d-flex form-check form-switch border border-info rounded col col-auto my-auto py-1 justify-content-center ps-5">
+                  <input class="form-check-input" type="checkbox" id="fname_toggle" onChange="$('.figure-caption').toggle()" checked>
+                  <label class="form-check-label ps-1" for="fname_toggle">Filename</label>
                </div>
-            </form>
-        </div class="container">
+                <div title="Toggle showing matched faces (hotkey: f)" class="d-flex form-check form-switch border border-info rounded col col-auto my-auto py-1 justify-content-center ps-5">
+                  <input class="form-check-input" type="checkbox" onChange="FaceToggle()" id="faces">
+                  <label class="form-check-label ps-1" for="faces">Faces</label>
+                </div>
+                <div title="Toggle showing 'distance' on matched faces (hotkey: d)" class="d-flex form-check form-switch border border-info rounded col col-auto my-auto py-1 justify-content-center ps-5">
+                  <input class="form-check-input" type="checkbox" onChange="DrawImg()" id="distance">
+                  <label class="form-check-label ps-1" for="distance">Distance</label>
+                </div>
+                <div title="Change the model used to detect faces" class="col col-auto my-auto">
+                    AI Model:
+                    {# can use 0 as default, it will be (re)set correctly in DrawImg() anyway #}
+                    {{CreateSelect( "model", 0, ["N/A", "normal", "slow/accurate"], "", "rounded norm-txt", [0,1,2])|safe }}
+                </div>
+                <div class="col col-auto pt-1">
+                    <button class="btn btn-outline-info p-1" title="Rotate by 90 degrees" onClick="Transform(90)">
+                        <img src="{{url_for('internal', filename='rot90.png')}}" width="32" height="32" onMouseOver="this.src='{{url_for('internal', filename='rot90-invert.png')}}'" 
+                    onMouseOut="this.src='{{url_for('internal', filename='rot90.png')}}'" />
+                    </button>
+                    <button class="btn btn-outline-info p-1" title="Rotate by 180 degrees" onClick="Transform(180)">
+                        <img src="{{url_for('internal', filename='rot180.png')}}" width="32" height="32" onMouseOver="this.src='{{url_for('internal', filename='rot180-invert.png')}}'"
+                    onMouseOut="this.src='{{url_for('internal', filename='rot180.png')}}'" />
+                    </button>
+                    <button class="btn btn-outline-info p-1" title="Rotate by 270 degrees" onClick="Transform(270)">
+                        <img src="{{url_for('internal', filename='rot270.png')}}" width="32" height="32" onMouseOver="this.src='{{url_for('internal', filename='rot270-invert.png')}}'"
+                    onMouseOut="this.src='{{url_for('internal', filename='rot270.png')}}'" />
+                    </button>
+                    <button class="btn btn-outline-info p-1" title="Flip horizontally" onClick="Transform('fliph')">
+                        <svg width="32" height="32" fill="currentColor"><use xlink:href="{{url_for('internal', filename='icons.svg')}}#flip_h"/></svg>
+                    </button>
+                    <button class="btn btn-outline-info p-1" title="Flip vertically" onClick="Transform('flipv')">
+                        <svg width="32" height="32" fill="currentColor"><use xlink:href="{{url_for('internal', filename='icons.svg')}}#flip_v"/></svg>
+                    </button>
+                    <button class="btn btn-outline-info p-1" title="View in Fullscreen mode (hotkey: F)" onClick="fullscreen=true; ViewImageOrVideo()">
+                        <svg width="32" height="32" fill="currentColor"><use xlink:href="{{url_for('internal', filename='icons.svg')}}#fullscreen"/></svg>
+                    </button>
+                    <button class="btn btn-outline-info p-1" title="Show logs relating to this filename (hotkey: l)" onClick="JoblogSearch()">
+                        <svg width="32" height="32" fill="currentColor"><use xlink:href="{{url_for('internal', filename='icons.svg')}}#log"/></svg>
+                    </button>
+                    <button class="btn btn-outline-info p-1" title="View Original" onClick="window.location='/'+document.viewing.FullPathOnFS">
+                        <svg width="32" height="32" fill="currentColor"><use xlink:href="{{url_for('internal', filename='icons.svg')}}#download"/></svg>
+                    </button>
+                    <button id="del" class="btn btn-outline-danger p-1" title="Delete (hotkey: Del)" 
+                        onClick="$.ajax({ type: 'POST', data: '&eid-0='+document.viewing.id, url: '/delete_files', success: function(data){ window.location='/'; return false; } })">
+                        <svg width="32" height="32" fill="currentColor"><use xlink:href="{{url_for('internal', filename='icons.svg')}}#trash"/></svg>
+                    </button>
+                </div>
+            </div class="row">
+        </div id="viewer">
+    </div id="viewer_div">
 {% endblock main_content %}
+
 {% block script_content %}
-
 <script>
+    // GLOBALS
+    document.fake_shift=0
+    document.fake_ctrl=0

-$('.figure').click( function(e) { DoSel(e, this ); SetButtonState(); return false; });
-$(document).on('click', function(e) { $('.highlight').removeClass('highlight') ; SetButtonState() });
+    // FIXME: used by viewer code - should probably get rid of this?
+    var fullscreen=false;

-function CallViewRouteWrapper()
-{
-    CallViewRoute( $(this).attr("id") )
-}
+    // this is the current entry (object) we are viewing - an image/video (used when we dbl-click to view & then in next/prev in view)
+    document.viewing=null;

-function CallViewRoute(id)
-{
-    s='<form id="_fm" method="POST" action="/view/' + id + '">'
-    s+='<input type="hidden" name="eids" value="'+$("#eids").val() + '">'
-    s+='<input type="hidden" name="cwd" value="{{OPT.cwd}}">'
-    s+='<input type="hidden" name="root" value="{{OPT.root}}">'
-    s+='<input type="hidden" name="offset" value="{{OPT.offset}}">'
-    s+='<input type="hidden" name="how_many" value="{{OPT.how_many}}">'
-    s+='<input type="hidden" name="orig_url" value="{{request.path}}">'
-    s+='<input type="hidden" name="view_eid" value="'+id+'">'
-    {% if search_term is defined %}
-        s+='<input type="hidden" name="search_term" value="{{search_term}}">'
-    {% endif %}
-    s+='</form>'
-    $(s).appendTo('body').submit();
-}
+    var OPT = {{ OPT.to_dict()|tojson }};
+    OPT.root_eid = {{ query_data.root_eid }};

-$('.figure').dblclick( CallViewRouteWrapper )
+    // get items out of query_data into convenience javascript vars...
+    var move_paths = {{ query_data.move_paths|tojson }};
+    var NMO={{query_data.NMO|tojson}}
+    var people={{query_data.people|tojson}}

-// different context menu on files 
-$.contextMenu({
-    selector: '.entry',
-    itemClickEvent: "click",
-    build: function($triggerElement, e) {
-        // when right-clicking & no selection add one OR deal with ctrl/shift right-lick as it always changes seln
-        if( NoSel() || e.ctrlKey || e.shiftKey )
+    // this is the list of entry ids for the images for ALL matches for this query 
+    var entryList={{query_data.entry_list}}
+
+    // pageList is just those entries shown on this page from the full entryList
+    var pageList=[]
+    // force pageList to set pageList for & render the first page
+    getPage(1,getPageFigures)
+
+    // FIXME: doco, but also gather all globals together, many make them all document. to be obviously global (and add fullscreen)
+    var gap=0.8
+    var grayscale=0
+    var throbber=0
+
+    function PrettyFname(fname)
    {
-            DoSel(e, e.currentTarget )
-            SetButtonState();
-        }
-
-        if( FiguresOrDirsOrBoth() == "figure" )
+        s='<span class="alert alert-secondary py-2">'
+        if( fname.indexOf( "static/Import" ) == 0 ) 
        {
-            item_list = {
-                details: { name: "Details..." },
-                view: { name: "View File" },
-                sep: "---",
+            s+='<svg width="20" height="20" fill="currentColor"><use xlink:href="{{url_for('internal', filename='icons.svg')}}#import"/></svg>'
+            tmp_path=fname.replace(imp_path,"" )
        }
-            if( e.currentTarget.getAttribute('type') == 'Image' )
+        if( fname.indexOf( "static/Storage" ) == 0 ) 
        {
-                item_list['transform'] = { 
-                    name: "Transform",
-                    items: {
-                        "r90": { "name" : "Rotate 90 degrees" },
-                        "r180": { "name" : "Rotate 180 degrees" },
-                        "r270": { "name" : "Rotate 270 degrees" },
-                        "fliph": { "name" : "Flip horizontally" },
-                        "flipv": { "name" : "Flip vertically" }
+            s+='<svg width="20" height="20" fill="currentColor"><use xlink:href="{{url_for('internal', filename='icons.svg')}}#db"/></svg>'
+            tmp_path=fname.replace("static/Storage","" )
        }
-                }
-
-            }
-            item_list['move'] = { name: "Move selected file(s) to new folder" }
-            item_list['sep2'] = { sep: "---" }
-        }
-        else
-            item_list = {
-                move: { name: "Move selection(s) to new folder" }
-            }
-        
-        item_list['ai'] = {
-                name: "Scan file for faces",
-                items: {
-                    "ai-all": {"name": "all"},
-                    {% for p in people %}
-                        "ai-{{p.tag}}": {"name": "{{p.tag}}"},
-                    {% endfor %}
-                }
-            }
-        
-        if( SelContainsBinAndNotBin() ) {
-            item_list['both']= { name: 'Cannot delete and restore at same time', disabled: true }
-        } else {
-            if (e.currentTarget.getAttribute('path_type') == 'Bin' )
-                item_list['undel']= { name: "Restore selected file(s)" }
-            else if( e.currentTarget.getAttribute('type') != 'Directory' )
-                item_list['del']= { name: "Delete Selected file(s)" }
-        }
-
-        return {
-            callback: function( key, options) {
-                if( key == "details" ) { DetailsDBox() }
-                if( key == "view" ) { CallViewRoute( $(this).attr('id') ) }
-                if( key == "move" ) { MoveDBox(move_paths, "{{url_for('internal', filename='icons.svg')}}") }
-                if( key == "del"  ) { DelDBox('Delete') }
-                if( key == "undel") { DelDBox('Restore') }
-                if( key == "r90"  ) { Transform(90) }
-                if( key == "r180" ) { Transform(180) }
-                if( key == "r270" ) { Transform(270) }
-                if( key == "fliph" ) { Transform("fliph") }
-                if( key == "flipv" ) { Transform("flipv") }
-                if( key.startsWith("ai")) { RunAIOnSeln(key) }
-                // dont flow this event through the dom
-                e.stopPropagation()
-            },
-            items: item_list
-        };
-    }
-});
-
-
-$(document).ready(function() {
-    if( {{OPT.offset}} == 0 )
+        if( fname.indexOf( "static/Bin" ) == 0 ) 
        {
-        $('.prev').addClass('disabled')
-        $('.prev').prop('disabled', true)
+            s+='<svg width="20" height="20" fill="currentColor"><use xlink:href="{{url_for('internal', filename='icons.svg')}}#trash-fill"/></svg>'
+            tmp_path=fname.replace("static/Bin","" )
+        }
+        s+=tmp_path+'</span>'
+        return s
    }
-    $(".dir").click( function(e) { $('#offset').val(0) ; $('#cwd').val( $(this).attr('dir') ) ; $('#main_form').submit() } )
-} )

-$( document ).keydown(function(event) {
-    switch (event.key)
-    {
-        case "Delete":
-            {% if "files_rbp" in request.url %}
-                if( ! NoSel() ) DelDBox('Restore');
-            {% else %}
-                if( ! NoSel() ) DelDBox('Delete');
-            {% endif %}
-            break;
-    } })
+    // check the size radiobutton
+    $(`input[name="size"][value="${OPT.size}"]`).prop('checked', true)

-function isMobile() {
-    try{ document.createEvent("TouchEvent"); return true; }
-    catch(e){ return false; }
-}
-
-if( isMobile() )
-{
-    $('#shift-key').css('visibility', 'visible');
-    $('#ctrl-key').css('visibility', 'visible');
-}
+    window.addEventListener('resize', DrawImg, false);
+    window.addEventListener('resize', ResizeVideo, false);

 </script>
 {% endblock script_content %}
--- a/templates/refimg.html
+++ b/templates/refimg.html
@@ -34,9 +34,7 @@
    <!-- browsers can put the fakepath in for security, remove it -->
 	function DoMagic() {
 		str=$("#new_file_chooser").val()
-		console.log(str)
 		str=str.replace('C:\\fakepath\\', '' )
-		console.log(str)
 		$("#fname").val(str)
 	}
 </script>
--- a/templates/states.html
+++ b/templates/states.html
@@ -56,44 +56,6 @@
            </div>
        </div>
    </div class="col-7">
-
-    <div class="row pt-5">
-        <alert class="alert alert-warning">The following values are based on the defaults above and subsequent changes as you navigate the application and are not set by hand.  The following content is for checking/debugging only.</alert>
-    </div class="row">
-
-    <div class="row">
-        <table id="pa_user_state_tbl" class="table table-striped table-sm" data-toolbar="#toolbar" data-search="true">
-            <thead>
-                <tr class="table-primary"><th>Path</th><th>New or Oldest</th><th>How Many</th><th>Folders?</th><th>Group by</th><th>Thumb size</th><th>DB retrieve offset</th><th>Root</th><th>cwd</th></tr>
-            </thead>
-            <tbody>
-            {% for st in states %}
-                <tr>
-                    <td>{{st.path_type}}
-                        {% if st.path_type == 'Search' %}
-                            "{{st.orig_search_term}}"
-                        {% endif %}
-                        {% if st.path_type == 'View' %}
-                            (orig: id={{st.view_eid}} in {{st.orig_ptype}})
-                            {% if st.orig_ptype == 'Search' %}
-                                "{{st.orig_search_term}}"
-                            {% endif %}
-                        {% endif %}
-                        
-                    </td>
-                    <td>{{st.noo}}</td>
-                    <td>{{st.how_many}}</td>
-                    <td>{{st.folders}}</td>
-                    <td>{{st.grouping}}</td>
-                    <td>{{st.size}}</td>
-                    <td>{{st.st_offset}}</td>
-                    <td>{{st.root}}</td>
-                    <td>{{st.cwd}}</td>
-                </tr>
-            {% endfor %}
-            </tbody>
-        </table>
-    </div class="row">
 </div class="container-fluid">
 {% endblock main_content %}
 {% block script_content %}
--- a/templates/viewer.html
+++ b/templates/viewer.html
@@ -1,332 +0,0 @@
-{% extends "base.html" %} {% block main_content %}
-{# make the form-switch / toggle info color set, give or take #}
-<style>
-.norm-txt { font-size: 1.0rem }
-.form-check-input:checked {
-    background-color: #39C0ED;
-    border-color: #CFF4FC;
-}
-.form-switch .form-check-input {
-  background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='-4 -4 8 8'%3e%3ccircle r='3' fill='%2339C0ED'/%3e%3c/svg%3e");
-}
-.form-switch .form-check-input:focus {
-  background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='-4 -4 8 8'%3e%3ccircle r='3' fill='%23CFF4FC'/%3e%3c/svg%3e");
-}
-#tst90:hover,#tst90:focus { filter: invert(73%) sepia(27%) saturate(3970%) hue-rotate(146deg) brightness(94%) contrast(100%); }
-</style>
-
-<script src="{{ url_for( 'internal', filename='js/view_transform.js')}}"></script>
-<script src="{{ url_for( 'internal', filename='js/view_support.js')}}"></script>
-
-<script>
-    var gap=0.8
-    var grayscale=0
-    var throbber=0
-
-    var objs=[]
-    var NMO=[]
-    var current={{current}}
-    var eids="{{eids}}"
-    var eid_lst=eids.split(",")
-    var offset={{OPT.offset}}
-    var first_eid={{OPT.first_eid}}
-    var last_eid={{OPT.last_eid}}
-	var imp_path="static/Import/{{imp_path}}"
-	var st_path="static/Storage/{{st_path}}"
-	var bin_path="static/Bin/{{bin_path}}"
-
-    {% for id in objs %}
-        e=new Object()
-        e.url = "{{objs[id].FullPathOnFS()|safe}}"
-        e.type = "{{objs[id].type.name}}"
-        {% if objs[id].file_details.faces %}
-            e.face_model="{{objs[id].file_details.faces[0].facefile_lnk.model_used}}"
-        {% endif %}
-        e.faces=[]
-        {% for face in objs[id].file_details.faces %}
-            data = { 'id': '{{face.id}}', 'x': '{{face.face_left}}', 'y': '{{face.face_top}}', 'w': '{{face.w}}', 'h':'{{face.h}}' }
-            {% if face.refimg %}
-                data['pid']='{{face.refimg.person.id}}'
-                data['who']='{{face.refimg.person.tag}}'
-                data['distance']="{{face.refimg_lnk.face_distance|round(2)}}"
-            {% endif %}
-            {% if face.no_match_override %}
-				data['override'] = {
-					'face_id'  : '{{face.no_match_override.face_id}}',
-					'type_id'  : '{{face.no_match_override.type.id}}',
-					'type_name': '{{face.no_match_override.type.name}}',
-					'who'      : '{{face.no_match_override.type.name}}',
-					'distance' : 'N/A'
-				}
-            {% endif %}
-            {% if face.manual_override %}
-				data['override'] = {
-					'face_id'  : '{{face.manual_override.face_id}}',
-					'type_id'  : '{{face.manual_override.type.id}}',
-					'type_name': '{{face.manual_override.type.name}}',
-					'who'      : '{{face.manual_override.person.tag}}',
-					'distance' : 'N/A'
-				}
-            {% endif %}
-            e.faces.push( data )
-        {% endfor %}
-        objs[{{id}}]=e
-    {% endfor %}
-
-    {% for el in NMO_data %}
-		NMO[{{el.id}}] = { 'type_id': {{el.id}}, 'name': '{{el.name}}' }
-    {% endfor %}
-	
-
-
-    function PrettyFname(fname)
-    {
-        s='<span class="alert alert-secondary py-2">'
-        if( fname.indexOf( "static/Import" ) == 0 ) 
-        {
-            s+='<svg width="20" height="20" fill="currentColor"><use xlink:href="{{url_for('internal', filename='icons.svg')}}#import"/></svg>'
-            tmp_path=fname.replace(imp_path,"" )
-        }
-        if( fname.indexOf( "static/Storage" ) == 0 ) 
-        {
-            s+='<svg width="20" height="20" fill="currentColor"><use xlink:href="{{url_for('internal', filename='icons.svg')}}#db"/></svg>'
-            tmp_path=fname.replace("static/Storage","" )
-        }
-        if( fname.indexOf( "static/Bin" ) == 0 ) 
-        {
-            s+='<svg width="20" height="20" fill="currentColor"><use xlink:href="{{url_for('internal', filename='icons.svg')}}#trash-fill"/></svg>'
-            tmp_path=fname.replace("static/Bin","" )
-        }
-        s+=tmp_path+'</span>'
-        return s
-    }
-
-    function CallViewListRoute(dir)
-    {
-        // dont allow mad spamming of arrows
-        $("#la").prop("disabled", true)
-        $("#ra").prop("disabled", true)
-        data="eids="+$("#eids").val()
-        data+="&cwd={{OPT.cwd}}"
-        data+="&root={{OPT.root}}"
-        data+="&orig_url={{OPT.orig_url}}"
-        data+="&view_eid={{OPT.view_eid}}"
-        // direction (next/prev)
-        data+="&"+dir+ "=1"
-        {% if search_term is defined %}
-            data+="&search_term={{search_term}}"
-        {% endif %}
-        $.ajax({ type: 'POST', data: data, url: '/view_list', success: function(res){ 
-                current=res.current
-                eids=res.eids
-                objs=res.objs
-                eid_lst=eids.split(",")
-                offset=res.offset
-                // okay, we now have results back, can reset next/prev buttons
-                if( current != first_eid )
-                    $("#la").prop("disabled", false)
-                if( current != last_eid )
-                    $("#ra").prop("disabled", false)
-                ViewImageOrVideo()
-            }
-        })
-    }
-
-</script>
-
-<div id="viewer" class="container-fluid">
-    
-    {% set max=eids.split(',')|length %}
-        <input type="hidden" name="eids" value={{eids}}>
-        <div class="row">
-                <button title="Show previous image" class="col-auto btn btn-outline-info px-2" style="padding: 10%" id="la"
-                {% if OPT.first_eid == current %}
-                    disabled
-                {% endif %}
-                    onClick="
-                        cidx = eid_lst.indexOf(current.toString())
-                        prev=cidx-1
-                        if( prev < 0 )
-                        {
-                            if( offset )
-                            {
-                                CallViewListRoute('prev')
-                                return
-                            }
-                            else
-                            {
-                                $('#la').attr('disabled', true )
-                                prev=0
-                            }
-                        }
-                        $('#ra').attr('disabled', false )
-                        current=eid_lst[prev]
-                        ViewImageOrVideo()
-                        if( current == first_eid )
-                            $('#la').attr('disabled', true )
-                        ">
-                    <svg width="16" height="16" fill="currentColor"><use xlink:href="{{url_for('internal', filename='icons.svg')}}#prev"/></svg>
-                </button>
-                    <figure class="col col-auto border border-info rounded m-0 p-1" id="figure">
-                        <canvas id="canvas"></canvas>
-                        <img id="throbber" src="{{url_for('internal', filename='throbber.gif')}}" style="display:none;">
-                        <script>
-                            var im=new Image();
-                            im.onload=DrawImg
-                            im.src="../" + objs[current].url
-                            var context = canvas.getContext('2d')
-                            window.addEventListener('resize', DrawImg, false);
-                        </script>
-                        <figcaption id="img-cap" class="figure-caption text-center text-wrap text-break"><span id="fname_i"></span></figcaption>
-                    </figure>
-                    <script>$('#fname_i').html(PrettyFname(objs[current].url))</script>
-                    {% if objs[current].type.name != "Image" %}
-                        <script>$('#figure').hide()</script>
-                    {% endif %}
-                    <div id="video_div" class="col col-auto">
-                        <video id="video" class="col col-auto" controls>
-                            <source src="../{{objs[current].FullPathOnFS()}}" type="video/mp4">
-                            Your browser does not support the video tag.
-                        </video>
-                        <figcaption id="vid-cap" class="figure-caption text-center text-wrap text-break"><span id="fname_v"></span></figcaption>
-						<script>$('#fname_v').html(PrettyFname(objs[current].url))</script>
-                    </div>
-                    <script>
-                        window.addEventListener('resize', ResizeVideo, false);
-                        ResizeVideo()
-                        {% if objs[current].type.name != "Video" %}
-                           $('#video_div').hide()
-                        {% endif %}
-                    </script>
-
-                    <button title="Show next image" class="col-auto btn btn-outline-info px-2" style="padding: 10%" id="ra" 
-                        {% if OPT.last_eid == current %}
-                            disabled
-                        {% endif %}
-                        onClick="
-                            cidx = eid_lst.indexOf(current.toString())
-                            if( cidx < eid_lst.length-1 )
-                            {
-                                current=eid_lst[cidx+1]
-                                ViewImageOrVideo()
-                                if( current != first_eid )
-                                    $('#la').attr('disabled', false )
-                            }
-                            else
-                                    CallViewListRoute('next')
-                            
-                            if( current == last_eid )
-                            {
-                                $('#ra').attr('disabled', true )
-                                return
-                            }
-                        ">
-                        <svg width="16" height="16" fill="currentColor"><use xlink:href="{{url_for('internal', filename='icons.svg')}}#next"/></svg>
-                    </button>
-        </div id="/form-row">
-{# use this for color of toggles: https://www.codeply.com/p/4sL9uhevwJ #}
-    <div class="row">
-        {# this whole div, just takes up the same space as the left button and is hidden for alignment only #}
-        <div class="col-auto px-0">
-            <button class="btn btn-outline-info px-2" disabled style="visibility:hidden"> 
-                <svg width="16" height="16" fill="currentColor"><use xlink:href="{{url_for('internal', filename='icons.svg')}}#next"/></svg>
-            </button>
-        </div>
-        <span class="col-auto my-auto">Show:</span>
-        <div title="Toggle showing filename (hotkey: n)" class="d-flex form-check form-switch border border-info rounded col col-auto my-auto py-1 justify-content-center ps-5">
-          <input class="form-check-input" type="checkbox" id="fname_toggle" onChange="$('.figure-caption').toggle()" checked>
-          <label class="form-check-label ps-1" for="fname_toggle">Filename</label>
-        </div>
-        <div title="Toggle showing matched faces (hotkey: f)" class="d-flex form-check form-switch border border-info rounded col col-auto my-auto py-1 justify-content-center ps-5">
-          <input class="form-check-input" type="checkbox" onChange="FaceToggle()" id="faces">
-          <label class="form-check-label ps-1" for="faces">Faces</label>
-        </div>
-        <div title="Toggle showing 'distance' on matched faces (hotkey: d)" class="d-flex form-check form-switch border border-info rounded col col-auto my-auto py-1 justify-content-center ps-5">
-          <input class="form-check-input" type="checkbox" onChange="DrawImg()" id="distance">
-          <label class="form-check-label ps-1" for="distance">Distance</label>
-        </div>
-        <div title="Change the model used to detect faces" class="col col-auto my-auto">
-            AI Model:
-            {# can use 0 as default, it will be (re)set correctly in DrawImg() anyway #}
-            {{CreateSelect( "model", 0, ["N/A", "normal", "slow/accurate"], "", "rounded norm-txt", [0,1,2])|safe }}
-        </div>
-        <div class="col col-auto pt-1">
-            <button class="btn btn-outline-info p-1" title="Rotate by 90 degrees" onClick="Transform(90)">
-		<img src="{{url_for('internal', filename='rot90.png')}}" width="32" height="32" onMouseOver="this.src='{{url_for('internal', filename='rot90-invert.png')}}'" 
-		    onMouseOut="this.src='{{url_for('internal', filename='rot90.png')}}'" />
-            </button>
-            <button class="btn btn-outline-info p-1" title="Rotate by 180 degrees" onClick="Transform(180)">
-		<img src="{{url_for('internal', filename='rot180.png')}}" width="32" height="32" onMouseOver="this.src='{{url_for('internal', filename='rot180-invert.png')}}'"
-		    onMouseOut="this.src='{{url_for('internal', filename='rot180.png')}}'" />
-            </button>
-            <button class="btn btn-outline-info p-1" title="Rotate by 270 degrees" onClick="Transform(270)">
-		<img src="{{url_for('internal', filename='rot270.png')}}" width="32" height="32" onMouseOver="this.src='{{url_for('internal', filename='rot270-invert.png')}}'"
-		    onMouseOut="this.src='{{url_for('internal', filename='rot270.png')}}'" />
-            </button>
-            <button class="btn btn-outline-info p-1" title="Flip horizontally" onClick="Transform('fliph')">
-                <svg width="32" height="32" fill="currentColor"><use xlink:href="{{url_for('internal', filename='icons.svg')}}#flip_h"/></svg>
-            </button>
-            <button class="btn btn-outline-info p-1" title="Flip vertically" onClick="Transform('flipv')">
-                <svg width="32" height="32" fill="currentColor"><use xlink:href="{{url_for('internal', filename='icons.svg')}}#flip_v"/></svg>
-            </button>
-            <button class="btn btn-outline-info p-1" title="View in Fullscreen mode (hotkey: F)" onClick="fullscreen=true; ViewImageOrVideo()">
-                <svg width="32" height="32" fill="currentColor"><use xlink:href="{{url_for('internal', filename='icons.svg')}}#fullscreen"/></svg>
-            </button>
-            <button class="btn btn-outline-info p-1" title="Show logs relating to this filename (hotkey: l)" onClick="JoblogSearch()">
-                <svg width="32" height="32" fill="currentColor"><use xlink:href="{{url_for('internal', filename='icons.svg')}}#log"/></svg>
-            </button>
-            <button class="btn btn-outline-info p-1" title="View Original" onClick="window.location='/'+objs[current].url">
-                <svg width="32" height="32" fill="currentColor"><use xlink:href="{{url_for('internal', filename='icons.svg')}}#download"/></svg>
-            </button>
-            <button id="del" class="btn btn-outline-danger p-1" title="Delete (hotkey: Del)" 
-                onClick="$.ajax({ type: 'POST', data: '&eid-0={{current}}', url: '/delete_files', success: function(data){ window.location='/'; return false; } })">
-                <svg width="32" height="32" fill="currentColor"><use xlink:href="{{url_for('internal', filename='icons.svg')}}#trash"/></svg>
-            </button>
-        </div>
-    </div class="row">
-{% endblock main_content %}
-{% block script_content %}
-<script>
-$( document ).keydown(function(event) {
-    // if dbox is visible, dont process this hot-key, we are inputting text
-    // into inputs instead
-    if( $("#dbox").is(':visible') )
-        return
-    switch (event.key) 
-    {
-        case "Left": // IE/Edge specific value
-        case "ArrowLeft":
-            if( $('#la').prop('disabled') == false )
-                $('#la').click()
-            break;
-        case "Right": // IE/Edge specific value
-        case "ArrowRight":
-            if( $('#ra').prop('disabled') == false )
-                $('#ra').click()
-            break;
-        case "d":
-            $('#distance').click()
-            break;
-        case "f":
-            $('#faces').click()
-            break;
-        case "n":
-            $('#fname_toggle').click()
-            break;
-        case "F":
-            fullscreen=!document.fullscreen
-            ViewImageOrVideo()
-            break;
-        case "l":
-            JoblogSearch()
-            break;
-        case "Delete":
-            $('#del').click()
-        default:
-            return; // Quit when this doesn't handle the key event.
-    }
-});
-
-var fullscreen=false;
-</script>
-{% endblock script_content %}
Author	SHA1	Message	Date
Damien De Paoli	846bdc4e52	fix up linking between face to refimg when we add that face to a person from right-click	2025-10-07 23:52:06 +11:00
Damien De Paoli	541cbec0de	update adding refimg to new or existing person via right-click on a face to use new data structures	2025-10-07 23:43:07 +11:00
Damien De Paoli	071164d381	remove dead code	2025-10-07 23:42:17 +11:00
Damien De Paoli	1adb1bc7af	no longer have pa_user_state data really, ditch the table	2025-10-07 23:42:02 +11:00
Damien De Paoli	747f524343	remove more dead code	2025-10-07 23:41:38 +11:00
Damien De Paoli	4feae96511	remove comments/format	2025-10-07 23:31:37 +11:00
Damien De Paoli	e6c9429466	remove search term from DB	2025-10-07 23:30:28 +11:00
Damien De Paoli	005b5be2b9	remove search_term from DB fields we want	2025-10-07 23:28:54 +11:00
Damien De Paoli	f369b6d796	ticked off a couple of items around no content being better displayed	2025-10-07 00:01:30 +11:00
Damien De Paoli	eb7bb84e09	add some padding, and set root_eid - Its 0 when nothing at all in Path (first run/empty). Also, started override for marshmallow, but overrides wont work yet	2025-10-07 00:00:50 +11:00
Damien De Paoli	7f13d78700	deal with completely empty directories, remove ChangeSize and move that content into changeSize	2025-10-06 21:41:35 +11:00
Damien De Paoli	e5d6ce9b73	move MoveDBox into full javascript and fold it into internal/js/files_support.js, also remove unused parameter for MoveDBox, and use marshmallow to pass people in query_data - overall just cleaner more consistent code for existing functionality	2025-10-05 23:20:17 +11:00
Damien De Paoli	e0654edd21	alter move_paths from a specific var passed in the render_template, to be folded into query_data var	2025-10-05 22:36:49 +11:00
Damien De Paoli	24c2922f74	actually set NMO var based on marshmallow data	2025-10-05 22:21:57 +11:00
Damien De Paoli	24c3762c61	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	2025-10-05 22:19:58 +11:00
Damien De Paoli	40f0b5d369	refactor most javascript code, moved what can be moved into files_support.js, made keydown() items only apply when I go to the viewer code	2025-10-04 23:25:46 +10:00
Damien De Paoli	2f5c6ec949	update for sqlalchemy v2	2025-10-04 23:23:39 +10:00
Damien De Paoli	81ebf6fa01	use to_dict() here, so we can use \|json in jscript	2025-10-04 22:45:28 +10:00
Damien De Paoli	7a4f5ddb17	update z-index so we dont get buttons being higher than toast popup	2025-10-04 22:45:01 +10:00
Damien De Paoli	00e42447fc	make download link work with document.viewing rather than objs[current]	2025-10-04 10:43:00 +10:00
Damien De Paoli	50f9fbee20	update to use new viewing data structures, consolidate to one set of transform functions with successCallback to cover the files vs viewer content. Updated TODO appropriately	2025-10-04 10:39:11 +10:00
Damien De Paoli	1b9b4c9c4f	update to use new viewing data structures, consolidate to one set of transform functions with successCallback to cover the files vs viewer content. Updated TODO appropriately	2025-10-04 10:39:06 +10:00
Damien De Paoli	86761994df	need to check length of faces, not just it exists - it comes back as an empty array when no faces	2025-10-04 10:37:29 +10:00
Damien De Paoli	4138f392d3	clean up includes, double up of fullscreen var, and use of current still	2025-10-04 10:37:00 +10:00
Damien De Paoli	525b823632	dont crash server if we have not scanned the Path yet	2025-10-04 10:34:54 +10:00
Damien De Paoli	d019dc7960	more things to test/fix	2025-10-03 21:40:59 +10:00
Damien De Paoli	a15fbd74d5	update for new db models/marshmallow object	2025-10-03 21:40:48 +10:00
Damien De Paoli	3c8babb619	made basic viewer now handle new marshmallowed data - faces, model_used, face_distance, etc.	2025-10-03 21:28:25 +10:00
Damien De Paoli	cd73c16545	include refimg_lnk and facefile_lnk into Face to be used in viewer	2025-10-03 21:10:52 +10:00
Damien De Paoli	efaec00127	OMG, face_distance is float not int, how has this ever worked	2025-10-03 21:10:04 +10:00
Damien De Paoli	0777bbe237	remove more dead code	2025-10-02 23:14:42 +10:00
Damien De Paoli	b0c738fcc1	moved cFO() to changeOPT() into internal/js, transformed file_list_ip to work with new query_data model, made the Size buttons use modern bootstrap5 radio buttons and work again without the form for all file* routes. Removed a lot of dead code, moved code to resetNextPrev buttons to anytime we getPage, reducing code, handle setting OPT in jscript via a to_dict() for States. Overall, search and file_list_ip now work. Only main thing left is the override code	2025-10-02 23:11:14 +10:00
Damien De Paoli	2b9e0e19a2	add a to_dict() for States, and then I can use a 1-liner to set a var in jscript	2025-10-02 18:20:31 +10:00
Damien De Paoli	e526d99389	no longer maintain too much state per user, remove all need to update it	2025-10-02 17:54:51 +10:00
Damien De Paoli	5a923359bc	remove dead viewing code	2025-10-02 17:54:31 +10:00
Damien De Paoli	a147308b64	removed fields from PA_USER_STATE, no longer needed with new viewing logic	2025-10-02 17:51:47 +10:00
Damien De Paoli	9e943c7e1f	removed fields from PA_USER_STATE, no longer needed with new viewing logic	2025-10-02 17:51:39 +10:00
Damien De Paoli	87651e80a0	fix up capitalisation of bOOLEAN, and removed fields from PA_USER_STATE, no longer needed with new viewing logic	2025-10-02 17:51:25 +10:00
Damien De Paoli	2e952deda0	added code to support changing noo/how_many/folders and do this with json data back and forth, update the UI, all works - only search is missing now. Lots of dead code can still be deleted	2025-10-01 23:48:19 +10:00
Damien De Paoli	b9b7a24326	removing done items	2025-10-01 23:43:15 +10:00
Damien De Paoli	a7ce8e66b5	change back to how_many, too hard to fix and the inconsistency broke the GUI change	2025-10-01 23:40:39 +10:00
Damien De Paoli	6199c042e3	remove most of the code, just have States with default values and some derived values such as prefix	2025-10-01 23:40:05 +10:00
Damien De Paoli	c32b99f53e	augment CreateFoldersSelect to support supplying js	2025-10-01 23:39:17 +10:00
Damien De Paoli	175e43c9bb	make viewer work for files_sp, by resetting entryList and pageList for any new directory load	2025-09-30 18:38:54 +10:00
Damien De Paoli	4bb99ce589	catch all to cover when we try to view an img/video and the dir contents is empty, so nothing to show	2025-09-30 18:38:20 +10:00
Damien De Paoli	70ca93b14e	convert files_rbp to new query_data model	2025-09-30 18:37:15 +10:00
Damien De Paoli	a0e06717ac	viewer now works for files_ip, still have broken bits everywhere - files_rbp, change_opts, do I want a back button? lots of dead/old code, probably cam move more js into *_support, and do I want to keep files_support separate to view_support	2025-09-30 00:29:11 +10:00
Damien De Paoli	0851b79e16	remove debug	2025-09-30 00:26:45 +10:00
Damien De Paoli	8e6342b627	quick add of files_div to be able to toggle beween files viewing and viewer itself, moved isMobile to support js, change eids to use query_data - for now, will remove when we consolidate to new approach	2025-09-28 21:48:11 +10:00
Damien De Paoli	5b6dc1b3e9	seems I now need setuptools, this feels like a kludge - watch this space for further upstream changes	2025-09-28 21:45:19 +10:00
Damien De Paoli	59bd2af15e	update to reflect we no longer use sudo for docker commands	2025-09-28 21:44:26 +10:00
Damien De Paoli	1ca5ca192c	move isMobile() to support js, as it has no jinja2 in it	2025-09-28 21:44:02 +10:00
Damien De Paoli	5f8c48ac18	fix highlighting issue - as expected, ecnt was wrong	2025-09-27 17:36:31 +10:00
Damien De Paoli	b67f2d9dcb	now allow files_sp paths to work (and support folders). Highlighting with folders is broken (likely dodgy ecnt). viewing still broken, but basic navigations is finally working with folders now	2025-09-27 12:42:01 +10:00
Damien De Paoli	5842bf2ab8	set OPT values in jscript in files.html, added functions to draw figures on a page based on pageList (subset of entryList) & json data, and tweaked just grouping select as well to also use the draw figures func() in jscript. Needed to move out .figure click handler into the draw figures too. This is now semi-functional, images load, pages next/prev works, grouping works -- BUT only for files_ip -- folders wont work, search wont work, files_sp wont work, viewing a file wont work	2025-09-27 00:31:42 +10:00
Damien De Paoli	be218c5049	first pass of using query data to allow display of files_ip only. Does use pass in list to do next/prev page (of the eids only). No images drawn at all. Definitely NOT, a usable version of PA at the moment	2025-09-26 19:32:09 +10:00
Damien De Paoli	a28f016b8a	when viewing, there is no path and not needed for viewing anyway	2025-09-26 19:30:29 +10:00
Damien De Paoli	d2db7f6184	hash is a string not an Integer, not sure how this issue has been here so long. Also, first pass of using query data to allow display of files_ip only. Definitely NOT, a usable version of PA at the moment	2025-09-26 19:26:23 +10:00
Damien De Paoli	9ec8195d0a	first pass of supprot functions to allow query/entry_list to drive pagination, and do not go back to the server to calc next/prev page	2025-09-26 19:25:19 +10:00
Damien De Paoli	2325dcd22a	work out prefix and store it away in States so we can just use if in updated json data calc for files	2025-09-26 19:24:10 +10:00
Damien De Paoli	e0b597c58c	add entry_list to query table	2025-09-26 19:22:36 +10:00
Damien De Paoli	0895268df2	more thoughts on change over to json, etc	2025-09-26 19:20:47 +10:00
Damien De Paoli	efceef7e57	added BUG-140 - db restarts cause job mgr to fail	2025-09-26 14:57:32 +10:00
Damien De Paoli	21059a6235	reformatted to be normal sql, added query table	2025-09-20 19:32:47 +10:00
Damien De Paoli	4d80fa4e7c	first pass at new query table	2025-09-20 19:32:21 +10:00