Commit Graph

323 Commits

Author SHA1 Message Date
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 2021-06-12 17:25:47 +10:00
f776a6a3c1 fixed up commit where I removed the data on the POST, so del/restore stopped working 2021-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.) 2021-06-12 16:36:40 +10:00
68f0fdcc33 only show meaningful extra job content on job summary page - for now path* only 2021-06-11 23:32:48 +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 2021-06-11 19:03:37 +10:00
2451d25a0c spelling fix 2021-06-11 19:02:22 +10:00
0b6acd1899 changed to consistently use restore instead of awful undelete 2021-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 2021-06-10 17:45:08 +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 2021-06-09 21:34:16 +10:00
9676738bdc made dialog be 75-100% to better fit content, added upstream-d URLs for jquery contextMenu 2021-06-09 21:32:53 +10:00
824aae3f94 clicking on the bg removes selection/highlights 2021-06-09 18:06:57 +10:00
8e4b5fe09b minor formatting fix to make dbox work better 2021-06-09 17:57:58 +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. 2021-06-08 21:16:49 +10:00
43f60cba93 default for grouping should be None not Day when searching (only time there is no grouping value set) AND this matches defaults now set in files.py ViewingOptions function 2021-06-06 17:34:45 +10:00
6d854628ae removed unnecessary css/js -> copied form pybook and not used, also made all upstream/internet resources local. NOTE: static/upstream is not in git, can just be downloaded from internet if needed again anyway 2021-06-06 17:24:55 +10:00
46fc90ddeb if via folders or grouping is none we create the row of images. if we are searching, added mini icon in bottom-left to show where the image is from (import/storage/bin) 2021-06-06 17:23:23 +10:00
7e2494884e can now toggle between folder or flat view, its a bit ugly, but it works 2021-06-06 14:09:11 +10:00
9b926938e4 added viewing recycle bin via folders, added comments, cleaned up TODO to note this is done 2021-05-26 18:32:52 +10:00
5e03650ed5 first cut of paths actually working with folder viewing - for now defaulting on for both Storage only 2021-05-01 18:16:45 +10:00
3237e3bf8f fixed up dup code to work with paths, added path_types throughout and updated TODO to be clear on what next 2021-04-17 17:43:42 +10:00
ca7391e21b fixed hard-coded static/storage, now use in_path.path_prefix 2021-04-12 00:06:26 +10:00
095b7c8333 Path in the DB is complete, still have hacks around displaying folders (hardcoded path name) 2021-04-11 15:35:01 +10:00
fddd47a1ab now using uselist=False to ensure file_details, dir_details, in_dir are one-to-one, and dont have useless list of 1 element. updated TODO to reflect order of how to tackle change over to paths and dirs 2021-04-10 11:28:17 +10:00
1ece519a2a added first pass of viewing by folders, see TODO for next steps 2021-04-06 17:05:24 +10:00
5f42e19bcd use kfid instead of kfname for consistency, and now we have 2 loops of kfids, then keep the count explicit (kfid.count) rather than implicity loop.index 2021-03-28 16:17:01 +11:00
a1c2b3f72b fixed way we account for remaining deletes, this should genuinely fix the dup counting stuff now 2021-03-27 15:12:03 +11:00
932d05b8e3 improved duplicate counting, removed concept of sets, and validated counts work via DB selects, and they do 2021-03-27 14:24:27 +11:00
b1771baa2d providing some totals via the code, and fudging numbers to show how many keep/del due to auto rules, and how many manual choices left 2021-03-25 19:53:26 +11:00
a6161d1fa2 add in file cnt inside dup paths 2021-03-24 19:35:49 +11:00
92c5ee3e9d keep processing all dups, even when > pagesize, so that alert at end is definitive about automatic matches that will be deleted. Also, fixed issue where a duplicate in the root dir of an import / storage path, was showing as blank after TrimmedPath() 2021-03-23 18:37:32 +11:00
055dd58d34 better formatting for all automatic matches, deal with automatic matching of preferred_paths, put <input type=hidden> fields in for files in storage and import paths, only display headings/content if it actually exists 2021-03-21 17:00:36 +11:00
86ff96fefb now passing single DD var (duplicate data) from files.py for simplicity, also added the beginnings of support for regex-d auto keeping / auto deleting of files, and paths - noting that path data from dups.py seems to not be working with my test data at present, so html showing it needs testing too 2021-03-21 12:18:59 +11:00
2cd55580a9 rewrote dups.html to now use newer model, where we will auto-delete those that match the regexp, and not show a per row view of these. Also removed extra / unneeded line when processing deleting files 2021-03-17 20:04:25 +11:00
0d0607e9c6 made help go via on mouse over instead of onclick 2021-03-06 17:26:28 +11:00
76aee3a10a okay fix_dups page now has functioning pagination, highlights regex matching "good" files as green, and just a file as yellow if we cant find the right one, so easily shows where to really pat attention. Has DBox based help page, and overall just a better UI/UX 2021-03-06 17:18:11 +11:00
b9dea327d0 use pagesize not page_size, and pass it in based on job extras, also use path based on job extras, so we fix issue of fix_dups not knowing which path from settings was used (import or storage) 2021-03-06 11:45:21 +11:00
1dc8477758 first pass of paginated dups, with drop-down (non-functional), but otherwise pages work - presume if I clicked it to delete, it would, but then I would need to re-do check_dups OR optimise and get it to come back to dups with next page -- probably preferred -- BUT, need to keep job state between page loads? 2021-03-03 22:05:58 +11:00
689081ef0b put summary counts on dups 2021-03-02 22:44:00 +11:00
269009f14f fixed choosing dup dir alert 2021-03-01 19:13:38 +11:00
477bd6f099 added code to split out storage_path and import_path, still a bit clunky, but functional. SymlinkName also now in shared 2021-02-27 18:30:54 +11:00
7fd6a2eddb fixed BUGs 22 and 23 - both relate to the HTML forms being different for the search and viewing data, so changing one when the other was set, did not pass the values through, e.g. search term not there when you change a viewing option, or after searching, it did not know the grouping options. Fixed from the search side by showing a label of what you are searching for and storing it statically in the viewing form. Sorted by jscript onSubmit func to take 5 viewing options and store the last value in hidden inputs in the search form 2021-02-21 15:40:47 +11:00
33ad544354 removed extra stuff from rmdups job list view, to keep the job list useful 2021-02-17 21:52:58 +11:00
0bfd3b58b3 moved to storing DB ids rather than names of files/dirs for deletions 2021-02-14 16:18:22 +11:00
09d56c5cc5 added comments, also remove url_for on request.endpoint, was breaking when needing a param to be passed 2021-02-14 16:02:20 +11:00
27e881ea8c minor clean up on headings, alerts at top of /fix_dups route 2021-02-13 20:30:21 +11:00
49e0a5a797 now have a partial fix_dups path, it shows the content in a much more reasonable manner, and allows the GUI to select the files/paths to keep, HOWEVER, the form POST is not enabled, and I still need to process the form data -- right now, now sure how I know which files to delete vs keep -> will need hidden vars of options, not just the to_keep - then process them 2021-02-13 20:21:26 +11:00
1499f2ca61 fixed BUG-21: file stucture broken after rescan, and beginnings of new job for checking for duplicate files, and having the back-end job indicate to the front-end that there are duplicates, and the basic route is in the f/e, but not built yet 2021-02-11 20:09:24 +11:00
e6bc751844 added storage_path to settings 2021-02-09 19:37:30 +11:00
a2775baeeb trying diff size for sm-txt - better for larger monitor 2021-02-09 19:37:11 +11:00
b168b0c77b add year as path preprend for storage suggestion 2021-02-09 19:36:56 +11:00