fix: Merge window and browser queries#203
Conversation
Improves performance as events only needs to be fetched, flooded and afk-filtered once
|
Looks like it'll break if there aren't any browser events? |
@ErikBjare It shouldn't in theory because then the browser_events array will be empty, but will extra check. |
|
This pull request fixes 2 alerts when merging f9bcaed into df5a625 - view on LGTM.com fixed alerts:
|
|
@ErikBjare Seems to work fine for me after deleting both my chrome and firefox buckets |
|
@johan-bjareholt Fixed #206, please take a look. |
|
This pull request fixes 2 alerts when merging 554d05a into 7821419 - view on LGTM.com fixed alerts:
|
a1a94cd to
2acb3cb
Compare
ErikBjare
left a comment
There was a problem hiding this comment.
This looks good enough to merge now.
However, in the future I'd like the merge to be even more complete, such that the merge results in a single list of events with data from both. I've done something similar before here: https://github.com/ActivityWatch/aw-research/blob/91d49926e571e072b9a1fb0f1ddf4dd54958615e/aw_research/classify.py#L254-L291
That would likely need some new transforms to work without issues though.
|
This pull request fixes 2 alerts when merging 2acb3cb into 7821419 - view on LGTM.com fixed alerts:
|
|
Merging this now, I'll have to test it on Android later. |
Improves performance as events only needs to be fetched, flooded and afk-filtered once
Hopefully this doesn't break anything aw-android related, I don't think it should.