4cb10c4a6b
started hooking up right-click menu for Dir and Files all the way through to calling the new ScanFileForPerson() - which is still incomplete but does use the new Faces DB linkages and functions
Damien De Paoli2021-06-28 18:52:05 +10:00
ef3cb3fb6f
added in DB tables for new face DB structures/links
Damien De Paoli2021-06-28 17:05:52 +10:00
31db4fcca1
added in DB tables for new face DB structures/links
Damien De Paoli2021-06-28 17:03:13 +10:00
a6782c24ff
if you dont pass an FLASK_ENV, we now assume development
Damien De Paoli2021-06-28 17:02:41 +10:00
126b17aa33
make prod pa_job_manager have FLASK_ENV of production and use localhost for job mgr host
Damien De Paoli2021-06-27 14:37:53 +10:00
76d278c37a
instructions for upstream bootstrap improved, to note font awesome needs work as I think only I can download
Damien De Paoli2021-06-27 14:31:26 +10:00
f12b48f38d
Merge branch 'master' of 192.168.0.2:photoassistant
Damien De Paoli2021-06-27 14:30:39 +10:00
68d1fcac60
fix BUG with non-existant path causing re-render of previous path
Damien De Paoli2021-06-27 14:30:33 +10:00
26ba27cc0d
updated files.py and files.html to add a context menu submenu to look for faces in an image. Doesnt work yet, but the context menu works
c-d-p
2021-06-27 14:27:46 +10:00
4bda64ca17
hide prod DB inside docker network so only paweb can get to prod, created a new DEV DB on port 65432 and if FLASK_ENV is development you get that one
Damien De Paoli2021-06-27 13:12:42 +10:00
f9d505a1b8
tweaked workers/threads, not sure what is best, but this will do
Damien De Paoli2021-06-26 16:46:38 +10:00
886776f737
Made saved users be in the DB, not in dict in memory of workers in gunicorn - otherwise we had BUG-39, and also added input validation to username to stop ldap injection on login form
Damien De Paoli2021-06-26 16:46:26 +10:00
d1ed80bd35
finished move file work, updated change path / settings and symlink issues, and added user management todo
Damien De Paoli2021-06-24 17:34:59 +10:00
add702a1e2
code for making a new folder and moving content to it
Damien De Paoli2021-06-24 17:34:06 +10:00
0a5e837236
support multiple paths in move DBox via new StoragePathNames() function, and pass that through to jinja
Damien De Paoli2021-06-24 17:33:42 +10:00
a412164ef7
moved styles to force folder naming correctly from base to files.html so that file_list.html didnt end up with crud. Also allowed move DBox to handle multiple storage paths and passes chosen (or only) storage path through to web front-end then to back-end job
Damien De Paoli2021-06-24 17:33:09 +10:00
a45e07ef34
moved styles to force folder naming correctly from base to files.html so that file_list.html didnt end up with crud. Also allowed move DBox to handle multiple storage paths and passes chosen (or only) storage path through to web front-end then to back-end job
Damien De Paoli2021-06-24 17:31:47 +10:00
6c3cdf79eb
force the figcaption to break long words (even without spaces)
Damien De Paoli2021-06-22 21:06:24 +10:00
f4e8d5f9da
fix BUG, that occurred when I switch to folder view with a broken path in the settings -- the init validation only kicks up a fuss if there are no valid import paths, but if one is broken - as in DEV, when I reference Cams dev area, it was causing a dir match for that path to be None - simple if to fix
Damien De Paoli2021-06-22 20:56:01 +10:00
83db6d492b
fix bug I added when switching symlink create to init code, path_type was the id, not a string... use DB to get right val
Damien De Paoli2021-06-22 20:54:52 +10:00
5bca620006
only show error color on actual Fail, so New, etc. does not go red
Damien De Paoli2021-06-22 20:54:08 +10:00
b84c671690
use bootstrap to style job errors, not direct css
Damien De Paoli2021-06-22 20:02:23 +10:00
c8f82dbb6d
move back to DEV settings, while we work on moving files for real
Damien De Paoli2021-06-22 19:51:11 +10:00
2543e6e935
fxied -BUG-35: when restarting paweb, symlinks not in static/, also moved longer-term piece into TODO
Damien De Paoli2021-06-22 19:50:54 +10:00
eb574e3c75
moved InitValidation checks to log to a Job to show errors in front-end, and moved the creation of the symlinks to the InitValidation so we can restart paweb docker container and it will recreate the symlinks in static without needing an import. Also added token highlighting of a failed job
Damien De Paoli2021-06-22 19:30:04 +10:00
9eb82bf1c3
added comment & TODO to recode SymlinkName one day
Damien De Paoli2021-06-22 18:42:03 +10:00
6a4d993440
fixed BUG-36: view details showing all entries -- its a bit crap as its only import dir, but its functional again
Damien De Paoli2021-06-22 18:32:10 +10:00
4dd5cd2f29
fixed BUG-36: view details showing all entries -- its a bit crap as its only import dir, but its functional again
Damien De Paoli2021-06-22 18:31:57 +10:00
decbcaec9a
file_{ip|sp|rbp} now use functions to view flat or folder, and consistently offer Oldest/Newest (per files) and A to Z, Z to A (dir and files)... folder view only does A to Z / Oldest as alpha sort for dirs (dirs dont currently contain date metadata, so unless I add it, it wont work and I dont really think its useful anyway)... BUT, its added to the TODO for another day
Damien De Paoli2021-06-22 18:01:15 +10:00
6da3b7f8a6
(hacked width in fa-stack css from font-awesome to force width:2em from 2.5em) to allow view by folder now has same width for back "button"
Damien De Paoli2021-06-21 18:26:49 +10:00
26cd851325
view by folder now has same width for back "button" (hacked width in fa-stack css from font-awesome to force width:2em from 2.5em) - also made figcation wrap to keep horizontal folder spacing - seems much neater
Damien De Paoli2021-06-21 18:26:18 +10:00
2762f58f98
added quickhack of buttons on bottom of page to make navigation easier
Damien De Paoli2021-06-19 23:28:43 +10:00
18b9ae59be
redid accounting for duplicates with more details around manual choices and fixed up the file counts that were based on subtractions, its all now accounted and includes removal of duplicates in rare case of files in import path and more than copy in storage path being double-counted
Damien De Paoli2021-06-19 17:16:47 +10:00
66455b9f43
putting more threads in, if a DB exec is slow, the whole things stops -- might have DB contention between viewing and importing?
Damien De Paoli2021-06-19 17:15:50 +10:00
f0fcd098e4
put correct folder-based entry retrieval for import and bin paths too AND fixed bug introduced with dup checking that did not sort based on new paths, only old rel_path
Damien De Paoli2021-06-19 17:14:53 +10:00
f275da33e0
if you go into a new dir (up or down), offset is put back to 0
Damien De Paoli2021-06-18 01:05:06 +10:00
d78aa0c076
file_sp now honours offset and how_many, and if you go into a new dir (up or down), offset is put back to 0 - this seems functional now, need to functionalise/replicate into files_ip and files_rbp
Damien De Paoli2021-06-18 01:04:41 +10:00
c61b2b4035
browsing by folders should now only load contents of cwd from DB, faster, also removes bugs of that content not being in first 50 entries
Damien De Paoli2021-06-18 00:41:30 +10:00
9e5e74bcdb
making this look usable on ipad and okay on larger desktop browser
Damien De Paoli2021-06-18 00:40:40 +10:00
beb1ae6eb8
making this look usable on ipad and okay on larger desktop browser
Damien De Paoli2021-06-18 00:40:13 +10:00
288665ec42
set parent_dir each time, not remember last dir as parent... that was simply dumb
Damien De Paoli2021-06-17 19:54:34 +10:00
f8a9f056ed
fix bug where back button goes missing if you go into an empty folder
Damien De Paoli2021-06-17 19:54:09 +10:00
43b39af61d
stop causing SqlAlchemy to have an ambiguous join of entry dir links for files and directories in the class, by removing files from class Entry, and explicitly getting the list of files for a directory via sqlalchemy in RunFuncOnFilesInPath() and ProcessFilesInDir()
Damien De Paoli2021-06-16 23:29:25 +10:00
2b87f84695
added some notes on when I pip3 upgraded some packages
Damien De Paoli2021-06-16 23:27:42 +10:00
b679119cea
recursively chown content in /static, as it now has favicon*, upstream/, etc. in there
Damien De Paoli2021-06-16 23:27:20 +10:00
fcb74df7bf
use a .dockerignore to avoid copying over 500+MB of git and backups, along with not copying some dev only images/dirs. when "docker-compose ... build" is used
Damien De Paoli2021-06-16 23:26:41 +10:00
b09d19570f
improved DBox images/html, improved look of MoveDBox, started plumbing for pa_job_manager to do actual moves, all the data is there, just havent performed the FS or DB move. cleaned up duplicated DEBUGS that are straight before AddLogForJob... tweaked TODO appropriately
Damien De Paoli2021-06-14 18:30:52 +10:00
7c3c8977d6
refined right-click seln. If you have one or more highlights, dont mess with them. If you have none, then select the one you are over. Also finished TODO for view details menu option
Damien De Paoli2021-06-13 22:14:35 +10:00
ae5fb0f747
fixed 3 BUGS: BUG-31: can post move/del/restore DBoxes without highlighted files/content; BUG-33: can call move/del/restore on mixed content - prob. stop it? (e.g right-click from search with highlighted files in both Bin and non Bin locations); BUG-34: shift-clicking (left or right) from a non-highlighted state does not add the shift-clicked item. ALSO removed ability to right-click change sel...
Damien De Paoli2021-06-13 21:35:08 +10:00
ff09742a66
added extra bug re right-click from files in differing Paths
Damien De Paoli2021-06-12 17:33:53 +10:00
93d0eec00e
FIXED: BUG-29: when delete/restore from search view the popup shows a path icon - in wrong spot, move it or lose it AND put trash icon back in alert for location when in Bin, restore icon in that context was wrong
Damien De Paoli2021-06-12 17:25:47 +10:00
22b41899e9
FIXED: BUG-32: sometimes still getting extra directories in Bin, that just have a trailing slash (or 2 or 3, etc.) -- Also improved Job logs for Del/Restore
Damien De Paoli2021-06-12 17:06:54 +10:00
f776a6a3c1
fixed up commit where I removed the data on the POST, so del/restore stopped working
Damien De Paoli2021-06-12 17:06:24 +10:00
471ed3c972
FIXED: BUG-30: when restoring, the OK button is red not green in dbox, added new BUG-32: sometimes still getting extra directories in Bin, that just have a trailing slash (or 2 or 3, etc.)
Damien De Paoli2021-06-12 16:36:40 +10:00
630b455bc0
removed del/restore TODOs its working, moved order of some TODOs too
Damien De Paoli2021-06-11 23:41:35 +10:00
2f3224ea61
put messages to FE in for del / restore. Also, added code to see if files in Bin/ path, if so do quick WARNING, with TODO on how to improve. Finally, when importing Bin paths, just do the intial AddPath (and AddDir), then bail out of further importing. Fixed misssing return on function too
Damien De Paoli2021-06-11 23:39:21 +10:00
68f0fdcc33
only show meaningful extra job content on job summary page - for now path* only
Damien De Paoli2021-06-11 23:32:48 +10:00
8b5633ea23
good spot to stop, some TODOs left, but really delete/restore now works
Damien De Paoli2021-06-11 20:26:56 +10:00
137b3f347d
removed debugs, created ClearOtherDupMessagesAndJobs() function so CheckDups jobs created by restore/delete are removing old f/e messages, e.g. I delete a dup by hand and the dup error disappears :) MAIN thing though is the crazy restore/delete paths are now fully functional, with content in top-level of a path, different paths on import, and in subdirs of import PATHs, also tested mass delete via flat-view of all files, then mass restore -- ALL WORKED :)
Damien De Paoli2021-06-11 20:26:15 +10:00
c3398ef77a
for now made del/restore force a reload of main page, it still does not show you created the del/restore job, but it is better than nothing. Also fixed dumb bug I introduced when handling trash/restore icons and moved an if rather than copied it between the alert for dir in and buttons for del/restore
Damien De Paoli2021-06-11 19:03:37 +10:00
0b6acd1899
changed to consistently use restore instead of awful undelete
Damien De Paoli2021-06-10 17:55:44 +10:00
804c7cbf56
made trash icon be red/Delete or green/Restore for GUI, plumbed this through modified DelDBox() and hooked it all so that you can either click the button, or right-click context menu and you will get the right del/restore dbox and that routes through via ajax to the right URL and actually deletes/restores. Also tweaked right-click to start context menu so that it is also a way to alter highlighting -- this honours ctrl and shift too
Damien De Paoli2021-06-10 17:45:08 +10:00
6a0141504d
added JobDeleteFiles plumbing / tested... removed test code for Undel, and added in CheckDups call for Undel - that is untested though, so debug to that effect still in this commit
Damien De Paoli2021-06-09 21:34:59 +10:00
7bbea21981
switched over to smarter context menu, hooked up delete button to ajax call, but not context menu yet - nor undelete. Made contextmenu detect path of object and del/undel appropriately, which also fixes a few quirks/bugs with no data in DB and trying to find the path of the first/non-existant entry
Damien De Paoli2021-06-09 21:34:16 +10:00
9676738bdc
made dialog be 75-100% to better fit content, added upstream-d URLs for jquery contextMenu
Damien De Paoli2021-06-09 21:32:53 +10:00
3688319ebd
put route in for delete files - from GUI (button only for now, will also be context menu soon)
Damien De Paoli2021-06-09 21:32:18 +10:00
824aae3f94
clicking on the bg removes selection/highlights
Damien De Paoli2021-06-09 18:06:57 +10:00
97a21cadab
created/tested an Undelete function and associated classes, it works but nothing calls it yet
Damien De Paoli2021-06-08 21:17:38 +10:00
060cf8acd2
put beginnings of undelete in context menu -> does nothing as yet, nor does delete for that matter. tweaked the alert displaying folder we are in to better show path icon and location, added a disabled back button in folder view so actual folders dont jumped around when you go into the first folder and a back button used to appear. Peak into first entry to see if we are viewing a Bin path and if so, then we could use undel.... In hindsight this is a hack that needs to be thought through per file (when I search it will break), but its a start for now and shows the right context menu when viewing a specific path.
Damien De Paoli2021-06-08 21:16:49 +10:00
c-d-p
Damien De Paoli