Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Merge window and browser queries #203

Merged
merged 3 commits into from Jun 10, 2020

Conversation

johan-bjareholt
Copy link
Member

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.

Improves performance as events only needs to be fetched, flooded and
afk-filtered once
@ErikBjare
Copy link
Member

Looks like it'll break if there aren't any browser events?

@johan-bjareholt
Copy link
Member Author

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.

@lgtm-com
Copy link
Contributor

lgtm-com bot commented May 31, 2020

This pull request fixes 2 alerts when merging f9bcaed into df5a625 - view on LGTM.com

fixed alerts:

  • 2 for Incomplete string escaping or encoding

@johan-bjareholt
Copy link
Member Author

@ErikBjare Seems to work fine for me after deleting both my chrome and firefox buckets

@ErikBjare
Copy link
Member

@johan-bjareholt Fixed #206, please take a look.

@lgtm-com
Copy link
Contributor

lgtm-com bot commented Jun 10, 2020

This pull request fixes 2 alerts when merging 554d05a into 7821419 - view on LGTM.com

fixed alerts:

  • 2 for Incomplete string escaping or encoding

@ErikBjare ErikBjare force-pushed the dev/merge-window-and-browser-queries branch from a1a94cd to 2acb3cb Compare June 10, 2020 13:47
Copy link
Member

@ErikBjare ErikBjare left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

@lgtm-com
Copy link
Contributor

lgtm-com bot commented Jun 10, 2020

This pull request fixes 2 alerts when merging 2acb3cb into 7821419 - view on LGTM.com

fixed alerts:

  • 2 for Incomplete string escaping or encoding

@ErikBjare
Copy link
Member

Merging this now, I'll have to test it on Android later.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants