Merge branch 'master' of mara.ddp.net:photoassistant

This commit is contained in:
c-d-p
2021-06-29 15:46:07 +10:00
3 changed files with 11 additions and 6 deletions

5
README
View File

@@ -1,5 +1,10 @@
In here we can put instructions on how to run this / any general info In here we can put instructions on how to run this / any general info
to edit src:
git....
CAM: fill this in pls
ubuntu packages: ubuntu packages:
sudo apt-get install -y mediainfo cmake python3-flask sudo apt-get install -y mediainfo cmake python3-flask

10
TODO
View File

@@ -18,11 +18,11 @@
MatchPersonWithFile() MatchPersonWithFile()
* then in UI: * then in UI:
allow right-click folders in folder view (at least for AI scan) for all files in Dir allow right-click folders in folder view (at least for AI scan) for all files in Dir [DONE]
allow right-click AI allow right-click AI [DONE]
for all persons for all persons [DONE]
for individuals for individuals [DONE]
(and can be on an individual file or an individual dir, or selected files / selected dir) (and can be on an individual file or an individual dir, or selected files / selected dir) [DONE]
* fix up logging in general * fix up logging in general
* comment your code * comment your code

View File

@@ -123,6 +123,6 @@ insert into PERSON_REFIMG_LINK values ( 2, 2 );
insert into PERSON_REFIMG_LINK values ( 3, 3 ); insert into PERSON_REFIMG_LINK values ( 3, 3 );
insert into PERSON_REFIMG_LINK values ( 4, 4 ); insert into PERSON_REFIMG_LINK values ( 4, 4 );
-- DEV: -- DEV:
insert into SETTINGS ( id, import_path, storage_path, recycle_bin_path ) values ( (select nextval('SETTINGS_ID_SEQ')), '/home/ddp/src/photoassistant/images_to_process/#c:/Users/cam/Desktop/code/python/photoassistant/photos/#/home/ddp/src/photoassistant/new_img_dir/', '/home/ddp/src/photoassistant/storage/', '/home/ddp/src/photoassistant/.pa_bin/' ); insert into SETTINGS ( id, import_path, storage_path, recycle_bin_path ) values ( (select nextval('SETTINGS_ID_SEQ')), '/home/ddp/src/photoassistant/images_to_process/#c:/Users/cam/Desktop/code/python/photoassistant/photos/#/home/ddp/src/photoassistant/new_img_dir/', '/home/ddp/src/photoassistant/storage/#c:/Users/cam/Desktop/code/python/photoassistant/storage/', '/home/ddp/src/photoassistant/.pa_bin/#c:/Users/cam/Desktop/code/python/photoassistant/.pa_bin/' );
-- PROD: -- PROD:
--insert into SETTINGS ( id, import_path, storage_path, recycle_bin_path ) values ( (select nextval('SETTINGS_ID_SEQ')), '/export/docker/storage/Camera_uploads/', '/export/docker/storage/photos/', '/export/docker/storage/.pa_bin/' ); --insert into SETTINGS ( id, import_path, storage_path, recycle_bin_path ) values ( (select nextval('SETTINGS_ID_SEQ')), '/export/docker/storage/Camera_uploads/', '/export/docker/storage/photos/', '/export/docker/storage/.pa_bin/' );