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

Fixed BUG-102 cant switch to folder view

Browse Source
This commit is contained in:
Damien De Paoli
2022-08-02 17:55:10 +10:00
parent a8af00fe66
commit 5221e330c1
3 changed files with 14 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
BUGs
View File

@@ -1,3 +1,3 @@
### Next: 103
### Next: 104
BUG-100: I managed to get 2 photos matching mich in the NOT_WORKING photo (probably dif refimgs but same p.tag?)
BUG-102: cant change from flat view to folder view
BUG-103: thumbnails aren't rotating (at all/sometimes?), e.g. 20220101_164835_10.jpg

48
TODO
View File

@@ -1,47 +1,11 @@
## MIGRATION/NEXT Production build:
drop table FACE_NO_MATCH_OVERRIDE;
drop table FACE_FORCE_MATCH_OVERRIDE;
drop table DISCONNECTED_NO_MATCH_OVERRIDE;
drop table DISCONNECTED_FORCE_MATCH_OVERRIDE;
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_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_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) );
drop table SETTINGS
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) );
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 );
## then docker-compose build...
## GENERAL
* put try: around any os.remove, etc.
* put try: around any os.remove, os.symlink etc.
File "/code/pa_job_manager.py", line 1088, in CreateSymlink
os.symlink(path, symlink)
FileExistsError: [Errno 17] File exists: '/export/docker/storage/.pa_metadata/' -> 'static/Metadata/.pa_metadata'
* remove Paths from SettingsIPath, etc.
* remove multiple Paths from SettingsIPath, etc.
* should I change the rotation code to use that jpeg util to reduce/remove compression loss?

12
states.py
View File

@@ -186,8 +186,7 @@ class States(PA):
self.noo = u.default_storage_noo
self.folders = u.default_storage_folders
else:
# is a search so...
print( "For now, search does not show in folders, force folders=False")
# search so force folders to be false (rather see images, # than series of folders that dont match search themselves)
self.noo=u.default_search_noo
self.folders=False
@@ -219,10 +218,11 @@ class States(PA):
# 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 'ChangeFileOpts' in request.path and self.folders and self.folders != request.form['folders']:
self.num_entries=0
self.first_eid=0
self.last_eid=0
if 'ChangeFileOpts' 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: