Commit Graph

  • 2b9dedb9b9 change how we calculate active jobs, probably will remove it from pa_job_engine, safer with threads I think. But, mostyle, added in client / server socket comms between web FE and job manager, with better job creation message (including link to job detail) and when you view job detail it auto-refreshes every few seconds until job complete) Damien De Paoli 2021-01-17 12:35:28 +11:00
  • abff2d8bab finished moving GenerateFileData out of files.py into pa_job_manager.py Damien De Paoli 2021-01-17 11:31:06 +11:00
  • a89f7fdb2b fixed bugs with wrong sequence names in DB classes, also added AddLogForJob and used it in GenerateFileData, and fixed but where I re-ran a completed job Damien De Paoli 2021-01-17 11:05:14 +11:00
  • c5d8811671 actually create a job for scan now, and let the job manager do the work and send back output via new PA_JobManager_FE_Message table Damien De Paoli 2021-01-17 10:50:43 +11:00
  • 2a33b6e2f4 Fixed BUG-1 - timezone issues, by forcing alter database Damien De Paoli 2021-01-17 10:49:50 +11:00
  • f661cf0489 Fixed BUG-1 - timezone issues, by forcing alter database Damien De Paoli 2021-01-17 10:49:29 +11:00
  • b01bdea505 had to make pa_eng global in Init* func, but that worked, now have a basic harness to run a job, and ran scannow job, by pulling in much of the files.py code, but it will be removed from there when this is finished. Will have to move to IPC (via sockets?) to allow better coordination of new job processing and updating Damien De Paoli 2021-01-16 23:54:31 +11:00
  • e138ab22aa git commit, converted over to base.html pulling Status*, rather than every render_template calling it. Tightened up naming for job manager, fixed a few bugs in there with items like div by zero, created the active jobs link/badge in navbar, have it invoked each time by base.html template and it gets active jobs from DB, pa_job_manager now initiliases from an empty DB and can work out where it is at, no loop/thread/or actual job code yet. jobs.py has basics of a NewJob(), so next step is to force that job to be executed in pa_job_manager, but its tea time Damien De Paoli 2021-01-16 17:51:16 +11:00
  • dc2ea1265f instructions on how to fully reset the DB in docker from tables.sql Damien De Paoli 2021-01-16 17:48:00 +11:00
  • 826e2fd421 switched name to pa_job_manager, feels more appropriate Damien De Paoli 2021-01-16 17:46:54 +11:00
  • a6d2e424d2 added shared.py at least for DB_URL, maybe more Damien De Paoli 2021-01-16 17:46:28 +11:00
  • 2776fdc5b3 fixed bug with creating a person and seeing if they have a refimg yet, also tweaked formatting so when we have more than 5 refimages, they will look right in person.html Damien De Paoli 2021-01-15 17:22:22 +11:00
  • cda9bce7f3 just staring on this, it is not even reference anywhere Damien De Paoli 2021-01-15 16:58:55 +11:00
  • 34814236fc add pa_job_engine_id_seq Damien De Paoli 2021-01-15 16:57:27 +11:00
  • b123f067b1 fix up comment Damien De Paoli 2021-01-15 16:57:14 +11:00
  • 58083dbfab added package dependencies Damien De Paoli 2021-01-15 16:57:07 +11:00
  • 588980a260 Added the ability to add a reference image to a person, and connect the two in the db Cam 2021-01-15 16:55:12 +11:00
  • 3191fb650b Merge branch 'master' of mara.ddp.net:photoassistant Cam 2021-01-15 15:33:59 +11:00
  • 7cda51c89b starting on doing AI with people and refimgs Cam 2021-01-15 15:33:56 +11:00
  • 7d03413e60 fix wrong output on printing Refimg Damien De Paoli 2021-01-15 15:33:30 +11:00
  • 665096f97d minor tweak to fix pixel alignment, its a serious hack, but it *seems to work Damien De Paoli 2021-01-15 14:44:31 +11:00
  • 46f8d84cd3 first thoughts on pa_job_engine - to keep overall pa_job engine state, also a pa_job_state in each action also a wait_for so we can do basic handling of jobs and dependencies Damien De Paoli 2021-01-14 22:13:07 +11:00
  • a8789e60fe first thoughts on pa_job_engine - to keep overall pa_job engine state, also a pa_job_state in each action also a wait_for so we can do basic handling of jobs and dependencies Damien De Paoli 2021-01-14 22:13:00 +11:00
  • a93f9e1da8 changed files table to file to be consistent with other tables in the db Damien De Paoli 2021-01-14 21:58:20 +11:00
  • 348c9132f2 rename of files table to file, included settings defaults to make this work in DEV after rebuild of DB container Damien De Paoli 2021-01-14 21:57:53 +11:00
  • e884accd0a renamed importlog* to job* -- in db, python and html Damien De Paoli 2021-01-14 21:47:12 +11:00
  • 4df3274624 added basics of job idea to TODO Damien De Paoli 2021-01-14 21:46:32 +11:00
  • f7688badd1 created a tables.sql so program can run from a brand new docker / db Damien De Paoli 2021-01-14 21:46:12 +11:00
  • 2dc80d4399 import log lines also included, with appropriate DB / html Damien De Paoli 2021-01-14 12:09:32 +11:00
  • 3684f279e4 first pass of import logging, its not being used, data is in real tables, but faked. will probably have to switch to gunicorn and threading to allow import and serving pages when we use slower AI routines Damien De Paoli 2021-01-14 00:15:54 +11:00
  • e9137c91fa further refinement of gitignore Damien De Paoli 2021-01-13 14:07:24 +11:00
  • 66e9242a8e refined the git ingore in reference images Damien De Paoli 2021-01-13 14:05:44 +11:00
  • d499825f54 Merge branch 'master' of 192.168.0.2:photoassistant Damien De Paoli 2021-01-13 14:03:42 +11:00
  • 923404553c trying to force reference_images/ into git Damien De Paoli 2021-01-13 14:03:36 +11:00
  • e0de421a2a trying to force reference_images/ into git Damien De Paoli 2021-01-13 14:03:26 +11:00
  • d7ab2b7333 fixed paths in the new ref images code Cam 2021-01-13 14:01:52 +11:00
  • d9407b1bab tabs ffs Damien De Paoli 2021-01-13 13:55:36 +11:00
  • 55e3c7145e Merge branch 'master' of 192.168.0.2:photoassistant Damien De Paoli 2021-01-13 13:54:51 +11:00
  • c6bf0424ab better try/except handling for files Damien De Paoli 2021-01-13 13:54:47 +11:00
  • 73bd64b710 Merge branch 'master' of mara.ddp.net:photoassistant Cam 2021-01-13 13:54:33 +11:00
  • f9159bb193 added a logs.py, not completely finished but theoretically just initialise the class to start the logger Cam 2021-01-13 13:54:25 +11:00
  • 2a7151dc66 tried to add a reference_images directory in git, that contains actual uploaded images and the modify/remove also deals with filesystem issues Damien De Paoli 2021-01-13 13:52:56 +11:00
  • 991b654d4c added reference image class, also tweaked DB classes to have foreign keys, so you cant delete a person connected to a file (tested). Also made refimg class do some quirky bootstrap/jquery to get file dialogs not looking like crap Damien De Paoli 2021-01-12 23:58:39 +11:00
  • 5bf41ce6a8 token placholder for AI menu with html Damien De Paoli 2021-01-12 23:58:27 +11:00
  • ed3a85b8f0 added reference image class, also tweaked DB classes to have foreign keys, so you cant delete a person connected to a file (tested). Also made refimg class do some quirky bootstrap/jquery to get file dialogs not looking like crap Damien De Paoli 2021-01-12 23:58:12 +11:00
  • a3a95f636e now have a Person class & associated CReate/Update/Delete functions, and menu in base.html Damien De Paoli 2021-01-12 21:51:33 +11:00
  • 2c170e2a9c not used anymore Damien De Paoli 2021-01-12 21:12:02 +11:00
  • 684d057e59 added admin routes/code to allow a scan now and a forced scan Damien De Paoli 2021-01-12 18:45:13 +11:00
  • e83a40ee52 converted over to a flat settings table, no more key-value pairs of settings Damien De Paoli 2021-01-12 18:32:47 +11:00
  • 86c7fbd0be made file_list.html better as well Damien De Paoli 2021-01-12 17:35:42 +11:00
  • 594a4803cd made file_list.html better as well Damien De Paoli 2021-01-12 17:34:31 +11:00
  • 09f588e7e4 only call GenerateFileData once now Damien De Paoli 2021-01-12 17:13:12 +11:00
  • 21b163acc7 ignore /home/ddp/src/photoassistant/new_img_dir/ as well, so we can test 2 active paths Damien De Paoli 2021-01-12 16:59:15 +11:00
  • d857233723 files now processes multiple paths, and view shows images for any images in appropriate path Damien De Paoli 2021-01-12 16:58:41 +11:00
  • 48748c23be used this to remove unique ids on buttons Damien De Paoli 2021-01-12 15:17:46 +11:00
  • e82adde1f0 minor code cleanup, removed debug Damien De Paoli 2021-01-12 14:59:48 +11:00
  • e35247ea70 video files now have a icon to indicate its a video as well Damien De Paoli 2021-01-12 14:44:11 +11:00
  • 4c662b3a0e removed debug print of video thumbnail, and made file importer look to see if file is newer than last import, if so, process it and store it in the database. If its older skip it. Then at the end of the function return the database as the list we process Damien De Paoli 2021-01-12 13:49:05 +11:00
  • 6e67bcd803 stupid me, the video thumbnail did not have thumb class, so it was not being resized by buttons, now works, ratios still seem odd, but its ok Damien De Paoli 2021-01-12 01:49:51 +11:00
  • 83c7e5379c Merge branch 'master' of 192.168.0.2:photoassistant Damien De Paoli 2021-01-12 01:48:11 +11:00
  • 3a16379aca basic improvement for sizing buttons, but also sizing is smarter, this way I do not need to know the image or thumbnail ratios :) Damien De Paoli 2021-01-12 01:45:26 +11:00
  • 225b919ad2 Merge branch 'master' of mara.ddp.net:photoassistant Cam 2021-01-11 12:51:19 +11:00
  • eeb24611c8 got video thumbnails working, added another pip packages to the README, and edited the templates/files.html accordingly. Cam 2021-01-11 12:50:31 +11:00
  • 38f8a3228d token version of resizing thumbs done Damien De Paoli 2021-01-11 12:34:53 +11:00
  • e730d56018 Merge branch 'master' of mara.ddp.net:photoassistant Cam 2021-01-11 12:05:00 +11:00
  • 050ce69617 added generation of video thumbnails Cam 2021-01-11 12:04:57 +11:00
  • cd34be0316 files view now has icon for videos, better text/image alignment Damien De Paoli 2021-01-11 12:01:38 +11:00
  • 7db4b38805 added view files menu option Damien De Paoli 2021-01-11 11:48:49 +11:00
  • f60b52ec0e Merge branch 'master' of 192.168.0.2:photoassistant Damien De Paoli 2021-01-11 11:48:33 +11:00
  • 80b199bc26 files now shows thumb view - first pass Damien De Paoli 2021-01-11 11:48:01 +11:00
  • 980db74a78 added a bug, and also stuck all of our utility functions for files into a class Cam 2021-01-11 11:47:37 +11:00
  • 6906f02246 Merge branch 'master' of mara.ddp.net:photoassistant Cam 2021-01-11 11:31:21 +11:00
  • cf629ffc10 removed newline...? git weirdness Cam 2021-01-11 11:31:10 +11:00
  • 5741470ce0 moved over to the beginnings of a class for file data, functional again Damien De Paoli 2021-01-11 11:28:49 +11:00
  • ccc8085aaf changed Photo class and DB table to be Files, also reflected through templates/files* - files.html is not used yet Damien De Paoli 2021-01-11 11:00:31 +11:00
  • e0400ff321 fixed up so DB will work for photos, need to do that in batch mode once per photo though -- for another day Damien De Paoli 2021-01-10 21:00:26 +11:00
  • c3debb3425 first pass of click through to see real image Damien De Paoli 2021-01-10 20:50:47 +11:00
  • 608bfb81e8 deleted static/images_to_process, it is now gitignored Damien De Paoli 2021-01-10 20:45:34 +11:00
  • dbd47c4a0d Try this version of symlink creation Damien De Paoli 2021-01-10 20:44:44 +11:00
  • 716610ddbc trying symlinks halfway through testing Cam 2021-01-10 20:37:14 +11:00
  • 57fe12c65d keep static, but not its contents Damien De Paoli 2021-01-10 20:19:43 +11:00
  • 6c8d065dd7 Merge branch 'master' of 192.168.0.2:photoassistant Damien De Paoli 2021-01-10 20:16:52 +11:00
  • aa537c5ae7 moved funcs around so routes are at the bottom of photos.py, created a static route will have to use symlinks to get it to work, but trying this first on windows to see Damien De Paoli 2021-01-10 20:16:12 +11:00
  • 7c84441600 quick fixes to get rid of thumbnails in photos Cam 2021-01-10 20:14:56 +11:00
  • b280b21544 fixed thumbnails by getting rid of the b"" on each thumbnail base64 encoded string Cam 2021-01-10 19:41:06 +11:00
  • 2d88a65ead WARNING: CURRENTLY BROKEN... updated photos.py to use exif data for thumbnails, and templates/photos.html to reflect changes Cam 2021-01-10 18:07:56 +11:00
  • c01c586bcd Merge branch 'master' of mara.ddp.net:photoassistant Cam 2021-01-10 17:50:54 +11:00
  • 1eac80a951 added thumbnail line to db class for photos, and also updated readme Cam 2021-01-10 17:49:58 +11:00
  • 2e4aec7772 removed debugs, added medainfo library to README for installation, added first-pass of thumbnauil, but no code for the actual thumbnail data yet Damien De Paoli 2021-01-10 17:49:12 +11:00
  • 6807e44228 it now at least does a basic view page successfully, with name, size, hash Damien De Paoli 2021-01-10 17:31:09 +11:00
  • ae14ed92c0 Merge branch 'master' of 192.168.0.2:photoassistant Damien De Paoli 2021-01-10 17:13:33 +11:00
  • 955b9f7701 updated file_list var Damien De Paoli 2021-01-10 17:13:23 +11:00
  • 05e31e73a1 updated file_list var Damien De Paoli 2021-01-10 17:13:15 +11:00
  • 0fe9a595b3 tryin first-pass of file metdata into Photos class Cam 2021-01-10 17:12:22 +11:00
  • 89eb73dab6 Merge branch 'master' of mara.ddp.net:photoassistant Cam 2021-01-10 16:59:24 +11:00
  • 3fdd43467a updated readme and gitignore, and also update the photos.py file to check what file types everything are, then return back a python dict with the absolute path to a file and the type. also updated the sqlalchemy model class to better fit all of our changes (added some fields that correspond to our file types and such). Cam 2021-01-10 16:56:39 +11:00
  • f02203057d added my images photo to ignore Damien De Paoli 2021-01-10 16:54:56 +11:00
  • cc5983e629 harness for showing file details in view photos Damien De Paoli 2021-01-10 16:52:30 +11:00
  • 4ed204b9a0 put thead-light class in for table headings Damien De Paoli 2021-01-10 16:30:27 +11:00
  • 1afb794bb8 first pass at seeing if path exists Damien De Paoli 2021-01-10 16:11:24 +11:00