0b4542089b
Accommodate chunk_sequence which now always yields lists.
2020-08-28 17:57:15 -07:00
e40c91a7cf
Split reload_metadata into separate functions by mimetype.
2020-08-28 17:51:07 -07:00
45d8809971
Fix crash while trying to get size of deleted file.
...
Pathclass no longer returns None for missing files, as it did when
this was written.
2020-08-28 17:32:53 -07:00
fa8bbf92f9
Remove call to logging.basicconfig, let the frontend do it.
2020-08-12 12:23:51 -07:00
b15beb73eb
Rewrite chunk_sequence to work with generators.
2020-08-12 11:21:48 -07:00
b21e6a1206
Show data directory in DatabaseOutOfDate message, not db file.
2020-07-01 16:19:54 -07:00
363d0bac67
Move THING_CLASSES and thing-related methods to new mixin.
...
I realized there's no need to have that on the global scope when
it is only used for the thing-methods.
2020-04-15 16:33:16 -07:00
5dffe52830
Start _cached_sql_tables as None, and in the SQL mixin.
2020-04-15 16:31:47 -07:00
35895856e6
Use .clear() instead of reassigning to empty lists.
...
I cannot remember if there is a reason I chose to use empty lists.
If there is, I'll rediscover it and write a comment. Until then, it
makes sense to use clear as an explicit clearing of the list.
2020-04-15 16:31:09 -07:00
43a665fd91
Replace more %s with fstrings.
2020-04-15 16:29:56 -07:00
930960e22a
Move this config prep code into voussoirkit as configlayers.
2020-04-03 17:09:01 -07:00
9c96522cfc
Remove thing_map table, just use thing_map class.table.
2020-04-03 15:20:09 -07:00
545ea62818
Add some docstrings and comments near get_cached_instance.
2020-04-03 12:33:19 -07:00
5a16579fe3
Add a 'type' string to all etiquette jsonify outputs.
2020-04-02 22:43:20 -07:00
dd3d40de53
Experimental: Allow search results to include albums.
...
I've been thinking about this for a while but couldn't think of
the perfect way to implement it. I still haven't, so instead I'm
just starting with something and we'll see how to improve later.
At any rate, I can update the rest of the system to expect Albums
coming out of search so that if I ever have a better algorithm
everything else will already be ready for it.
For this first experiment, just any photos that are part of an album
will send that album out as a result. It doesn't even respect the
limit parameter, it's really just to see how it feels to use.
2020-04-02 22:36:40 -07:00
e94e35c98c
Add option to natural_sort filenames before digesting.
2020-04-02 21:57:54 -07:00
374763f990
Reduce log level of savepoints to 5.
...
So far I am satisfied with how they are working, and they clutter
the output so much I can't read anything else.
For reference, logging.DEBUG is 10.
2020-04-02 21:56:41 -07:00
0fdf08adf5
Fix bug where searching musts=[A, A.B] ignored B.
...
The problem was that during the expansion of A, B would get added to
the `total` set. And then because B was already in total, it would
bail early instead of expanding, but that meant it got left out of
the final query. But this only happened sometimes since random set
ordering would sometimes expand B before A and everything was ok.
I think the best solution is to do this first pass that eliminates
ancestors. Furthermore, I realized that the entirety of expand_nested
hinged on this flawed logic and was otherwise completely redundant
for a simple list comprehension.
2020-03-19 19:04:09 -07:00
13c3a1c0e9
Update docstrings for walk_children, walk_parents.
2020-03-19 19:03:47 -07:00
0a8a754cbc
Replace set([]) with {}.
2020-03-19 17:40:52 -07:00
e35efb5c61
Make this string an r-string so it gets better syntax highlighting.
2020-03-11 18:11:54 -07:00
6529aedde6
Add docstring to PDB.__init__.
2020-03-06 09:43:16 -08:00
3f2cde02e1
Use send2trash to support recycle_instead_of_delete.
2020-02-27 14:18:46 -08:00
961ece0081
digest_directory excludes extend defaults instead of overriding them.
...
With this change, there is currently no way to specify that I actually
want to include thumbs.db etc, but I think the likelikhood of wanting
to extend the defaults greatly exceeds wanting to overrid them.
2020-02-27 14:17:30 -08:00
9d620b4b97
Remove unused imports & other small things.
2020-02-20 22:44:56 -08:00
854fa4db51
Rename PDB.register_user -> new_user.
...
I was treating User a little bit special here, but I prefer to
have the more consistent terminology.
2020-02-20 00:18:40 -08:00
1fc2ed09f5
Remove commit argument from ALL methods. @transaction does it.
2020-02-19 23:56:09 -08:00
0a984117c5
Add rollback queue, like commit queue.
2020-02-19 23:46:30 -08:00
8c854f3b6a
Improve this comment about Photo rename logic.
2020-02-19 23:22:08 -08:00
f99d3d03d9
Photo.rename new_path.assert_not_exists.
2020-02-19 23:12:29 -08:00
00a443eec3
Always use the commit queue, don't bypass with commit=True.
2020-02-19 23:12:11 -08:00
7f3602d673
Remove @transaction from mixin methods, apply it to object methods.
2020-02-19 23:10:49 -08:00
953a85c998
Delete method Tag.leave_group, leftover from 1-parent days.
2020-02-19 23:05:55 -08:00
8c797024e0
Remove calls to pdb.commit(). Let @transaction do it.
2020-02-19 22:58:21 -08:00
203fb9e00f
@transaction intercept commit argument; commit / release here.
2020-02-19 22:36:00 -08:00
04f3f6f297
Remove commit=False from all method calls, it's default now.
2020-02-19 22:20:21 -08:00
3a9d7fc2dc
Set default commit=False for ALL methods.
...
I'm working on tightening up some of the transaction code. In the
past it was default commit=True because I would launch the repl, do
something, and quit, so it was nice to have auto commit. But really
it makes more sense to have it default False and be explicit when
to commit.
2020-02-19 20:08:24 -08:00
108ba8bd95
Add PDB.release_savepoint.
2020-02-19 17:00:08 -08:00
bcd13b9ae4
Make the commit queue task popping a little more clear.
2020-02-19 16:26:23 -08:00
e7c90faf79
PhotoDB.rollback without savepoint should roll all, like real sql.
...
In sqlite3, rollback without a savepoint undoes the entire pending
transaction stack, whereas I was just popping the last save.
This change makes it match real sqlite. Also the only current call
for rollback is in the @transaction decorator which is already
explicit.
2020-02-19 16:26:02 -08:00
9e0051ca9c
Photo.move_file assert new path doesn't exist yet.
2020-02-19 16:23:31 -08:00
1375d9fb26
Fix new_photo, data[extension] to use new pathclass.Extension.
2020-02-19 15:11:52 -08:00
5da8d793d6
Return this None instead of assigning then returning.
2020-02-19 14:06:53 -08:00
31517a41d2
Add missing period on exception message.
2020-02-19 13:11:57 -08:00
92f3569971
Use of extract_table_column_map has moved to sqlhelpers.
2020-02-07 15:15:49 -08:00
b88d577ddd
Use voussoirkit.imagetools for fit_into_bounds function.
2020-02-04 19:35:46 -08:00
25ed427272
Wrap DB_INIT in a transaction.
2020-02-04 18:43:30 -08:00
d6d7521bce
Assert table exists for any sql op involving argument tables.
...
At the moment, all of these functions are safe because they're
called with hardcoded tables determined by other code, not user input.
But while I was working in this area I felt it would be good to add
a safety check just in case.
2020-02-04 18:15:14 -08:00
64f9eb5f2b
Replace some % formatting with fstrings.
2020-02-04 18:12:41 -08:00
eff0efdf40
Indicate required feature in exception message.
2020-01-29 23:52:25 -08:00
2ffe3940e6
Update OutOfDate message to show actual argument.
2020-01-28 10:52:19 -08:00
93eb693bee
Separate version_pragma from other pragmas!
...
This was a dumb bug. Because the version was included in the pragmas
that get set on every load, the database was receiving the new
user_version simply by setting skip_version_check=False and letting
the regular pragmas load, so all future checks passed without
having to run the db upgrader.
2020-01-27 20:46:32 -08:00
222d63857e
Replace which with winwhich.
2020-01-21 23:50:11 -08:00
1b308d7921
Fix seconds_to_hms bug!
...
Embarrassing. If M was zero then you got HH:SS.
2020-01-06 20:21:41 -08:00
3bd8fe6392
Raise FileNotFound from read_filebytes.
2019-12-10 12:48:28 -08:00
9fa49bbddf
Add parameter only_shrink to fit_into_bounds.
2019-08-14 13:48:22 -07:00
947d05a4fa
Revert 488d793, reinstate PhotoDB.normalize_tagname.
...
In that commit, I missed three more calls in objects.py and
now I'm deciding that 5x copy-paste is not worth it.
2019-06-15 16:49:52 -07:00
bdff14ecf2
Identify a logic error without actually fixing it.
...
😎
2019-04-26 23:14:14 -07:00
cc6e7a8b16
Improve line consistency across the PhotoDB.new_* methods.
...
By clarifying why some lines are above / below the generate_id
call and putting similar code in similar order to each other.
2019-04-26 23:12:55 -07:00
a9865d8546
Replace PhotoDB.normalize_tagname with real call to Tag.norm_name.
...
I originally did this because I didn't want to accidentally call
Tag.normalize_name and forget to pass the valid parameters. However,
having this single method be on PhotoDB while the other norms are
part of their proper class has been an eyesore.
So since there are only a few calls to this I'm just inlining them
and trusting to not forget if I add more in the future.
2019-04-26 23:06:41 -07:00
8c74e42a74
Add Album.has_any_associated_directory.
2019-04-26 18:55:03 -07:00
ebde5c7ee8
Give each object class a table and centralize db_row normer.
2019-04-26 18:52:56 -07:00
fa97dd5d3c
Remove Tag._cached_synonyms. Not worthwhile.
2019-04-05 23:26:11 -07:00
d24f93809b
Add message parameter to commit instead of logging separately.
...
The upside is that we can get rid of some redundancy and reduce
the friction of adding more commit messages.
The downside of this is that the log statement always reports from
commit, instead of the function calling commit. But with unique
messages this shouldn't be too much trouble and should be worth it.
2019-04-01 23:29:01 -07:00
68a567d266
Perform is None check before detailed type checks.
2019-04-01 23:17:35 -07:00
3aa064cde3
Move log statement to top of method.
2019-04-01 23:17:01 -07:00
2f33023025
Replace singular guard continue with simple if.
2019-04-01 23:16:25 -07:00
ad140e485e
Two small docstring improvements.
2019-03-16 13:09:02 -07:00
d66dc53215
Require voussoirkit 0.0.28 for sqlhelpers.listify.
...
Instead of defining that within etiquette.
2019-01-01 18:08:47 -08:00
5d7bc1ff4b
Somewhat improve prettiness of hyphen range parse code.
2018-12-27 15:31:56 -08:00
c6c6158062
Save this assignment until it's needed.
2018-12-21 23:44:50 -08:00
7674610b88
Somewhat simplify a few conditions in photodb init.
2018-11-24 22:25:25 -08:00
1eb5a6f465
Rename DatabaseOutOfDate's parameter 'current' -> 'existing'.
2018-11-24 22:06:16 -08:00
707fdcc637
Add album cards and improve album pages.
...
- album card has placeholder for future thumbnail.
- replaced nested tree hierarchy lists with separate boxes.
- list/grid view also applies to the root listing.
- added a sticky right panel for all the tools. not pretty yet.
- mechanism for adding sticky panel changed. instead of applying
it to the #right, you apply it to #content_body so that its
grid layout can be updated properly.
2018-11-12 22:15:59 -08:00
d0208154e4
Add a function to clarify SQL_COLUMNS creation.
2018-11-11 19:08:31 -08:00
dbdd509cd2
Rearrange imports so voussoirkit is right after lib imports.
...
Added a styleguide.md file to refer back to.
Since voussoirkit is a library it feels better to have it below
the rest of the library and above the local project imports.
2018-11-04 19:27:20 -08:00
de48105e32
When thumbnailing, don't call relative_to on return.
...
The path given by make_thumbnail_filepath will already have
it in the right place, so this is probably an accident waiting
to happen.
2018-11-04 13:30:34 -08:00
25a27e6241
Move dict_to_params to flask-specific helpers.py.
...
The rest of etiquette has nothing to do with URLs so this
doesn't belong in the backend helper file.
2018-11-04 13:30:08 -08:00
20e41ad689
Extremely minor touchups.
2018-09-23 14:57:25 -07:00
95edc4d397
Add method Photo.move_file.
2018-09-23 14:54:56 -07:00
4d1575719b
Bump voussoirkit requirement to 0.0.24 for pathclass exceptions.
2018-09-23 14:54:11 -07:00
e9f567ffc9
Don't allow Groupable to add itself as a child.
...
omg what an oversight
2018-09-22 23:14:41 -07:00
670bc8b375
Allow setting searchhidden during new_photo.
2018-09-21 21:31:57 -07:00
0ccfa74709
Let helpers.generate_*_thumbnail raise FileNotFoundError.
2018-08-17 22:05:47 -07:00
bea9f905bd
Support downloading .zip of arbitrary photos, clipboard.
...
Now that creating zips of any photo set is easier, we can
let the user download whatever is on their clipboard.
2018-08-14 23:02:06 -07:00
bc6a0aa907
Improve & generalize zipfile code.
...
Moved some heavy lifting out of the flask album.zip endpoint
and into helpers.py.
Renamed some things for clarity.
2018-08-14 22:58:26 -07:00
53c86c30a1
Improve clarity of the recursive_dict_ helper functions & usage.
2018-08-11 18:19:55 -07:00
3b3c690ae3
Remove return value from load_config, so no illusion of purity.
...
This method already relies on object state anyway and writes back
to self.config, so the return value is unnecessary.
2018-08-11 18:19:10 -07:00
9eb9220ca9
Read and write the config file as UTF-8.
2018-08-11 17:57:19 -07:00
fb052a2d56
Fix Album.add_associated_directory not letting duplicates.
...
The docstring and the actual code were disagreeing.
2018-07-29 16:30:30 -07:00
30e3aa9c6f
Simplify and improve rollback logic.
2018-07-29 16:28:57 -07:00
30d96139c2
Remove commit param from PDB.sql_* methods nobody was using.
...
And is better left to the caller anyway.
2018-07-29 16:05:49 -07:00
9328600355
Add message parameter to PDB.savepoint for better logging.
...
Helps to have a visual on which methods are creating the saves.
2018-07-29 16:03:04 -07:00
56e7472c93
Revert f-strings to %s for logging calls.
...
In my excitement I forgot about that rule.
2018-07-29 16:01:26 -07:00
8447fb3343
Make deleting and unlinking tags require confirmation.
...
Added text inside the delete buttons and made them confirm.
2018-07-28 20:25:25 -07:00
1b90850818
Oops, add the required_feature decorators to remove_child.
2018-07-22 21:06:16 -07:00
2a45f4e17e
Add parameter albums to purge_empty_albums as starting set.
...
Like purge_deleted_files, you can provide a list of albums to
act as the starting point instead of letting it use the default
of all albums.
2018-07-22 20:21:00 -07:00
8a12a24e8e
Add tag_autocomplete.js.
...
Instead of embedding the entire tag list in the search.html template
every single time, this script loads the tags from the new,
cache-enabled endpoint /all_tags.json. Then we can use html5
datalists to create autocomplete forms on the search and photo pages.
2018-07-22 20:19:05 -07:00
bbf07f4401
Fix image thumbnail wrong variable bug.
...
How long has that been there?
2018-07-22 20:19:05 -07:00
d740e6d686
Oops, fix read_filebytes not stopping at the range_max properly.
2018-07-22 20:18:58 -07:00
4c65ccaf68
Big! Liberate Groupables from strict heirarchy. Multiple parents.
...
I found that the strict heirarchy was not satisfying the situation
where one tag is the intersection of two others, but we can only
pick one as the parent
For example, does red_jacket belong under clothes.red_clothes or
clothes.jackets? A search for "red_clothes AND jackets" might
give us someone wearing red pants and a black jacket, so this
definitely needs to be a separate tag, but picking only one
parent for it is not sufficient. Now, a search for red_clothes
and a search for jackets will both find our red_jacket photo.
The change also applies to Albums because why not, and I'm sure
a similar case can be made.
Unfortunately this means tags no longer have one true qualname.
The concept of qualnames has not been completely phased out but
it's in progress.
This commit is very big because I was not sure for a long time
whether to go through with it, and so much stuff had to change
that I don't want to go back and figure out what could be grouped
together.
2018-07-20 13:09:06 -07:00
4987db4bd0
Switch to f-string formatting in many places.
2018-07-18 18:36:36 -07:00
4a39873fed
Increase default tag cache to 10,000.
2018-07-18 18:27:18 -07:00
38bac41eb9
Add helpers.split_easybake_string for prelim parsing.
...
Helps to remove some distractions from the main easybake method.
2018-07-15 14:23:43 -07:00
f06b0915ab
Add new_photo_kwargs to the create_or_get call.
...
Due to the closure, it was already working just fine, but I
want the explicitness of having it there.
2018-07-15 13:52:08 -07:00
57a9e0d4dc
Move PDB.close out of the sqlmixin, into main class.
...
Doesn't really deserve to be with the sql stuff.
2018-07-15 13:27:04 -07:00
c37b54b456
Add dividers and rearrange some of the table column parsing.
2018-07-13 19:22:05 -07:00
0852630cd1
Alphabetize _extract_table_name.
2018-06-30 12:55:30 -07:00
c930228d3f
Rearrange order of Album.delete ops to not void FK contraint.
2018-06-30 12:51:09 -07:00
c736c33165
Add caching of tag synonyms.
2018-05-06 21:09:15 -07:00
c6b71f1a0d
Revert caching of qualified names. Causing too many problems.
...
The world is just not ready for it. Was having issues about the
parents being deleted / renamed and needing to propogate those
changes in a not-ugly way.
Will reassess in the future.
2018-05-06 21:09:09 -07:00
0c8a57b6aa
Make the assert methods public.
2018-05-06 21:09:09 -07:00
40c255b0d0
Pass object instantiations through a cacher.
...
I want the system to only have one instance of a particular
object at any time, so that we can effectively cache things
in them.
2018-05-06 21:09:08 -07:00
11fda94968
Make the SQL_COLUMNS code a bit easier to read.
2018-05-06 21:09:02 -07:00
db28b6819c
Replace individual cache instantiations with all at once.
2018-05-06 21:08:56 -07:00
96d79f2b25
Oops, let separate loading of pragmas for not-first-time load.
...
Since DB_INIT was only run during first time setup, all future
loads were not running the pragmas, not even the FK restriction.
2018-05-03 19:02:53 -07:00
64449569ea
Rearrange statements during tag delete to not voilate FK.
2018-05-03 18:59:50 -07:00
23cc769357
Take advantage of parent's cached_qualname when making mine.
2018-05-03 18:45:57 -07:00
943deb9bf7
Move child-lifting code to its own helper method.
2018-05-03 18:32:44 -07:00
ae46b097e4
Let get_tag_by_name return inputted Tag right away.
...
For caller's convenience most functions assume you are passing
name as a string, but if you already have the Tag we'll just use it.
2018-05-03 18:20:48 -07:00
a0e3e037c1
Bail out of join_group early if already immediate parent.
...
I'd rather make the extra select than a delete and reinsert.
2018-05-03 18:18:13 -07:00
22269af2ca
Always use False for leave commit before joining new group.
2018-05-03 18:10:12 -07:00
a8fc1206d9
Oops, move get_root_tags into alphabetical position.
2018-05-02 17:41:46 -07:00
58d450a856
Fix handling of the event that a file loses its thumbnail.
...
In which case return_filepath is None and the relative_to breaks.
2018-05-01 20:41:38 -07:00
1626a6fa11
Optimize PDB.get_root_albums and get_root_tags.
...
Achieves in a single query what used to require a ton of
individual get_parent calls.
2018-05-01 20:32:45 -07:00
48396d6ab6
Add Album.remove_photos for batch removals.
2018-05-01 18:05:07 -07:00
698981dd29
Move _uncache_sums call out of _add_photo, into callers.
2018-05-01 17:48:56 -07:00
fa97512586
Use batches of 999 for get_things_by_id.
...
SQLite has a limit on how many variables you can use per query.
2018-05-01 17:48:02 -07:00
97e1f881d0
Move video thumbnailing code to helpers.
2018-04-28 20:36:33 -07:00
5bc2bbdacb
Move image thumbnailing code to helpers.
2018-04-28 20:33:05 -07:00
41823394eb
Use PDB.get_albums_by_id for Photo.get_albums.
2018-04-28 19:17:11 -07:00
62496d183e
Use PDB.get_tags_by_id for Photo.get_tags.
2018-04-28 19:14:58 -07:00
b19682d1a5
Replace Photo.sorted_tags with jinja filter.
2018-04-28 19:05:51 -07:00
df7fbeae0a
Minor clarity improvements to required_feature logic.
2018-04-27 20:04:18 -07:00
e2cf9344c1
Copy the inputted new_photo_kwargs so as not to damage it.
...
Also I learned that pop takes a fallback.
2018-04-20 15:31:41 -07:00
fec5eaf21e
Add Tag.normalize_name to be called by PDB.normalize_tagname.
2018-04-20 15:28:27 -07:00
4434517c54
Rename config user.min_length -> min_username_length.
2018-04-15 14:36:07 -07:00
21bd211889
Give Users a display_name.
2018-04-15 14:23:24 -07:00
8562b355ce
Fix typo in debug commit message.
2018-04-15 13:49:10 -07:00
31b808bd64
Fix get_things_by_id not putting the results in cache.
2018-04-15 02:53:14 -07:00
7d8b8daeba
Rewrite Album.sum_bytes to use SQL sum in a single query.
2018-04-15 02:52:41 -07:00
f77ab51b14
Add Album.has_any_photo and has_any_subalbum_photo.
2018-04-15 02:41:24 -07:00
0ee07023a1
Fix ids_needed being modified while iterating.
2018-04-15 02:35:46 -07:00
518a45ccd8
Add method get_things_by_id for mass lookups.
2018-04-15 02:14:06 -07:00
68d6e4faf4
Add explicit method get_album_by_id.
2018-04-15 02:10:42 -07:00
0094e7c006
Fix bug where add_tag supersedence caused early commit.
2018-04-15 01:14:20 -07:00
bfc4f313a9
Switch some formats to f-strings.
2018-04-15 01:13:02 -07:00
028a8cb2ef
All of the INTERSECTs can just be WHERE clauses.
2018-04-04 22:08:08 -07:00
c0df14db62
Fix typo binding -> bindings.
2018-04-04 21:40:39 -07:00
abe82dde9e
Let get_tag_by_name use cache after finding the ID.
2018-03-31 14:01:03 -07:00
