github.com/ActivityWatch/aw-core commits | Ecosyste.ms: OpenCollective

renamed @lundibundi's period_union to union, cleared inconsistent data in my period_union

f2ffe81cf1e64e485c53577473608a8a8ec74a30 authored over 6 years ago by Erik Bjäreholt <[email protected]>

Merge remote-tracking branch 'origin/master' into dev/union-period

b21fff9b8aee008ca418684c3197de62aa8c4718 authored over 6 years ago by Erik Bjäreholt <[email protected]>

Merge pull request #66 from lundibundi/implement-period-union-transform

Implement period_union transformation

c33ea2e9ad56009fc46d44d731b6643eefe01ddf authored over 6 years ago by Erik Bjäreholt <[email protected]>

added __lt__ to Event and TimePeriod, cleaned up tests, improved documentation, improved typing

ae4fcfbc79e8f3b7ccea07826ce73ef5f9d451f4 authored over 6 years ago by Erik Bjäreholt <[email protected]>

Implement period_union transformation

It allows to merge two event lists while removing duplicates.

93e58fedadebd7e4da9c5929ce1c241f952f33bb authored over 6 years ago by Denys Otrishko <[email protected]>

fixed logging message

7638841c29040dd00a31daf3df54c711351d54df authored over 6 years ago by Erik Bjäreholt <[email protected]>

removed unused function

6baff8de212c21ffa32e0551207aac3f53f1b841 authored over 6 years ago by Erik Bjäreholt <[email protected]>

added period_union to query functions

cede270f9be569e0b034edaa98e8469e8d0c2283 authored over 6 years ago by Erik Bjäreholt <[email protected]>

added methods (adjacent, gap, union) to TimePeriod and transform period_union

89ba4f303aac800e6051f8096d5bf30c681b1b84 authored over 6 years ago by Erik Bjäreholt <[email protected]>

Merge pull request #63 from ActivityWatch/dev/transform/more_transforms

More transforms

ed4060d03098bd9db09b1a21111bbff4630a9f88 authored over 6 years ago by Johan Bjäreholt <[email protected]>

Cleaned up sum_durations and fixed pulsetime in chunk_events_by_key

59e6912f76e1adfea6fb0711e90eb8b6b866e102 authored over 6 years ago by Johan Bjäreholt <[email protected]>

Merge pull request #64 from Otto-AA/patch-1

Simplify filter_keyvals code

fd7c5b096d5b4f8426efe0b8a320e293af166d3d authored over 6 years ago by Johan Bjäreholt <[email protected]>

Fix spacing and convert filter_keyvals_regex return to list comprehension

6050f1fcad0280f984cd3f9e00cae9ec8098ed4d authored over 6 years ago by A_A <[email protected]>

Simplify filter_keyvals code

Can be tested here: https://repl.it/repls/FragrantGrubbyStatistic

a915ef5b04b0dc23995bdb8740149f320176a21a authored over 6 years ago by A_A <[email protected]>

Fixed mypy types

9911b33bcfe63be7a35f5fe46f674555f08532ce authored over 6 years ago by Johan Bjäreholt <[email protected]>

Added sum_durations transform

f11cd940b10d795f5cf0b5e9a4e9d8cddf0095df authored over 6 years ago by Johan Bjäreholt <[email protected]>

Added chunk_events_by_key transform

7956db0a9fc76534dd44638fa4341cffbf8f1e88 authored over 6 years ago by Johan Bjäreholt <[email protected]>

Merge remote-tracking branch 'origin/master' into dev/sqlite

d73bd8233b5ed0df41d6a95e68e81ebc25131b97 authored over 6 years ago by Johan Bjäreholt <[email protected]>

updated peewee

5ed6a31761b6900670cf53dd0e16621306f3f8d2 authored over 6 years ago by Erik Bjäreholt <[email protected]>

improved coverage

179a5ba6c237b6fb9be22c8a11885d92933e1a15 authored over 6 years ago by Erik Bjäreholt <[email protected]>

Merge pull request #61 from ActivityWatch/dev/improved-timeperiod

Improved TimePeriod

5e387e901534247c907967f53855a25e65ed7ec9 authored over 6 years ago by Erik Bjäreholt <[email protected]>

fixed 100% code coverage for TimePeriod

f0f8fb2df5b838f4ce1981cf82a3841064ba9e8c authored over 6 years ago by Erik Bjäreholt <[email protected]>

improved TimePeriod

76a9d5561d98e18370fdf2cea5f2a4def8643c17 authored over 6 years ago by Erik Bjäreholt <[email protected]>

made logging less spammy

f0545840b7ac38d7f6321c3837109f46a281ac27 authored over 6 years ago by Erik Bjäreholt <[email protected]>

silenced repeated warnings

19a7c382915c17d7ecfc0de55b2a348b0b8122ce authored over 6 years ago by Erik Bjäreholt <[email protected]>

Merge pull request #59 from ActivityWatch/dev/heartbeat-mergefix

Updated heartbeat_merge with new merge condition

8d2fe949884ae56767f09fab33be1d736736dc36 authored over 6 years ago by Erik Bjäreholt <[email protected]>

Merge pull request #58 from ActivityWatch/dev/queryfuncintrospectdecorator

Fancy q2_function decorator (with inspection!) and flood function

13533e584dff12708aabe38948ac5067bf20c80e authored over 6 years ago by Erik Bjäreholt <[email protected]>

added automerging to flooding, more testing

9384927ff3d4f5bb6acfe75dbd4e476ca677376f authored over 6 years ago by Erik Bjäreholt <[email protected]>

improved flooding and added test

a57b6b4d0db37decbed38f10c348245836f73d84 authored over 6 years ago by Erik Bjäreholt <[email protected]>

simplified heartbeat logic

5f640520bd0747570d4c63298284606d2ac159b4 authored over 6 years ago by Erik Bjäreholt <[email protected]>

improved comment

96bb17b42f3bb21bad70285271bbdb001584d0fe authored over 6 years ago by Erik Bjäreholt <[email protected]>

updated heartbeat_merge with new merge condition

9f2768b01acca8088c4f6659eb553dabdbd76d95 authored over 6 years ago by Erik Bjäreholt <[email protected]>

Switched heartbeat_merge behavior in case of unordered events to refusing merge instead of zeroing duration

b49da6732e351d170aa8eb8f91ec2b1af06e28fc authored over 6 years ago by Erik Bjäreholt <[email protected]>

added check in heartbeat merging for negative duration

70ecf3fdf3f37854b7086ab9199c9a1cde94bbb2 authored over 6 years ago by Erik Bjäreholt <[email protected]>

added an improved query function decorator that makes Datastore and TNamespace arguments optional, also moved flood here from aw_research

de659a3c073871ffd2258b027a43c8bb6e06ae2e authored over 6 years ago by Erik Bjäreholt <[email protected]>

datastore: Removed WAL from sqlite

ef11c363a098703f3a567c23af88b91412d126c0 authored over 6 years ago by Johan Bjäreholt <[email protected]>

fixed limit_events test

9b6469e338b9387eb301ea3615085fee3fb73ff2 authored over 6 years ago by Johan Bjäreholt <[email protected]>

Merge remote-tracking branch 'origin/master' into dev/sqlite

ef3dd0b1568d15e68d555a34edc392ad9387839f authored over 6 years ago by Johan Bjäreholt <[email protected]>

Added coverage_html target in Makefile

b15ada249bc99e2549283671dca38f8789652017 authored over 6 years ago by Johan Bjäreholt <[email protected]>

Merge pull request #50 from ActivityWatch/dev/query2_list

Added support for lists in query2

3689827c53100c5a43cfa6e191014e7639f58d11 authored over 6 years ago by Johan Bjäreholt <[email protected]>

Improved coverage

e6ad952295710f5fe16882dd5bbed313987be4e9 authored over 6 years ago by Johan Bjäreholt <[email protected]>

Fixed spaces in query assignments

6068122e65466689d6bb990fe31c36deb9881c72 authored over 6 years ago by Johan Bjäreholt <[email protected]>

Fixed datastore limit tests

353a6e14c5dda3f6478baf4892474efcf7751c5f authored over 6 years ago by Johan Bjäreholt <[email protected]>

Fixed tests

bffa4d47d54500249cf8608a1b3d2b476da57c7b authored over 6 years ago by Johan Bjäreholt <[email protected]>

Fixed undefined behavior in tests

88d8d94e2b5510a9616333a6904cc0d45fa77a6c authored over 6 years ago by Johan Bjäreholt <[email protected]>

Fixed bad function parsing, added query_bucket_period timeparse error test, improved error handling in test_query2

b74b7bea79e5de4e8f00f354def11d9146579282 authored over 6 years ago by Johan Bjäreholt <[email protected]>

Replaced limit_events with first and last

f7b6cb4de39932876396886d8ced8f85d715c7ac authored over 6 years ago by Johan Bjäreholt <[email protected]>

Fixed mypy errors

8cfbb3433e610c7180166822019b2ed7a4524d91 authored over 6 years ago by Johan Bjäreholt <[email protected]>

Made query2 functions use QLists

b43719b5da93fc287817967e76e12c0ac08d99e9 authored over 6 years ago by Johan Bjäreholt <[email protected]>

query2: prefixed types with Q and fixed mypy errors

1879f83bd405097db854c1ac8a3807a1dd84eace authored over 6 years ago by Johan Bjäreholt <[email protected]>

Added support for lists in query2

449b86dafa9ea6a009193ea75671146bf9bedcdf authored over 6 years ago by Johan Bjäreholt <[email protected]>

sqlite optimizations such as lazy-commit

2f96b0413ddab50db2b2029100730056a977031d authored over 6 years ago by Johan Bjäreholt <[email protected]>

datastore: fixed broken bucketinfo and replace_last in sqlite

e2960e7ad83a071f4368664ddfbb7b4a7f9367a3 authored over 6 years ago by Johan Bjäreholt <[email protected]>

datastore: misc cleanups in storages

15d4c7f7c8811440b174178c2acb3158fc706d13 authored over 6 years ago by Johan Bjäreholt <[email protected]>

datastore: Fixed replace_last in sqlite not working

82256c5081e62422e335834ab2d0fb225f90e66c authored over 6 years ago by Johan Bjäreholt <[email protected]>

datastore: Added replace_last benchmark

71995f26c7748598645461f73377a10a5b2adecc authored over 6 years ago by Johan Bjäreholt <[email protected]>

Experimental sqlite support

0eab2d0138dd8e219c52203e1aa9b6fb16234b0c authored over 6 years ago by Johan Bjäreholt <[email protected]>

sqlite storage: made max timestamp value signed 8-bytes

c9cd5de4e0eea0780df79e0932fad2d3956bb2be authored over 6 years ago by Johan Bjäreholt <[email protected]>

Fixed types

c74f9571a6032c008bb24914a3629f90d0de8977 authored over 6 years ago by Johan Bjäreholt <[email protected]>

datastore: peewee->sqlite migration and sqlite optimizations

963bca67aff303a92001ada00af459fd8189abd6 authored over 6 years ago by Johan Bjäreholt <[email protected]>

datastore: replaced duration with endtime in sqlite

fa8beb19d943448b58f6172d2a7ebb1465e0919d authored over 6 years ago by Johan Bjäreholt <[email protected]>

Merge pull request #55 from ActivityWatch/dev/queryclean

Cleaned up stuff, and a new simplify_string transform

7aab2e7a08096810c9098f411a8ff622e30f7486 authored over 6 years ago by Erik Bjäreholt <[email protected]>

improved coverage

b2274077625a534373d0c90196761fcda6446e97 authored over 6 years ago by Erik Bjäreholt <[email protected]>

Merge branch 'master' into dev/queryclean

14957bcb2c840ee8ab721dabc7b20dc3dd483afc authored over 6 years ago by Erik Bjäreholt <[email protected]>

improved simplify_string

a837dac27c0eb30985358aa281529199bf4d4f4c authored over 6 years ago by Erik Bjäreholt <[email protected]>

added q2_find_bucket function

1bf3cd060821a9ca8e062472ae9f03bb13c7d362 authored over 6 years ago by Erik Bjäreholt <[email protected]>

added q2_filter_keyvals_regex function

3754341f7aad44f7dee3d099dfed8dbcb613f0d5 authored over 6 years ago by Erik Bjäreholt <[email protected]>

Fixed typing 'namespace: dict' -> 'namespace: TNamespace'

f45a58a30599d9f1397fa1cef9f9b192a13ef559 authored over 6 years ago by Erik Bjäreholt <[email protected]>

Merge pull request #56 from ActivityWatch/dev/fixed-typing

Fixed typing

69f52ca09952f950228a86b518613371706a3c76 authored over 6 years ago by Erik Bjäreholt <[email protected]>

disabled upgrade to pip 10 as a workaround

e19ce9ea10912cf105859f97b8a7836dadd0fe58 authored over 6 years ago by Erik Bjäreholt <[email protected]>

second attempt at fixing pip 10 bug on Appveyor

c399dc18d3dd70dbc5526fb20b14b85855a8f7b5 authored over 6 years ago by Erik Bjäreholt <[email protected]>

attempted fix for pip issue on Appveyor

0c448a4bbaa58e466a3fecbbdd449b3a1a831f1b authored over 6 years ago by Erik Bjäreholt <[email protected]>

fixed typing

e2a4b40d63ebaebe8c44cc5b1b05ebbe12f25683 authored over 6 years ago by Erik Bjäreholt <[email protected]>

cleaned up tests, added test for simplify_string

d642eb4a8b5c61cea3b13596c9423ca492d2f671 authored over 6 years ago by Erik Bjäreholt <[email protected]>

Merge branch 'master' of github.com:ActivityWatch/aw-core into dev/queryclean

c204fe6374afcd470128849e6f9b96f95a6a6ddc authored over 6 years ago by Erik Bjäreholt <[email protected]>

added simplify transform, added q2_function decorator, cleanup, PEP8, bumped version number

70d69e6d701fc448db51acb019579c7c5be09980 authored over 6 years ago by Erik Bjäreholt <[email protected]>

Merge pull request #54 from sacline/log-future-events

Log events that reach into the future

487abb104b034fa9f2185566aa602e01768e53d3 authored over 6 years ago by Johan Bjäreholt <[email protected]>

Log time that is being compared to Event time

67856dae5ef2a48d48ebf258b4283b83042f27cf authored almost 7 years ago by Stephen Cline <[email protected]>

Log warning when incoming events reach into future

e88538b594563c1706599e71805f590462acb444 authored almost 7 years ago by Stephen Cline <[email protected]>

Merge pull request #53 from ActivityWatch/dev/query2_better_errorhandling

query2: better error handling

e972773ce72b98f4a407d5b379fd6057a412b53a authored almost 7 years ago by Johan Bjäreholt <[email protected]>

Fixed broken import of QueryException

1135292347bf451771d0b5359f935f56ebf22e7d authored almost 7 years ago by Johan Bjäreholt <[email protected]>

query2: Added early check if variable exists

f5aac123ad884f1167984b9bcd2d48a8f6febfff authored almost 7 years ago by Johan Bjäreholt <[email protected]>

query2: better error messages

0a74bd3cdf5fbc6e4cf9ae122d6ffa80535e89af authored almost 7 years ago by Johan Bjäreholt <[email protected]>

Merge pull request #51 from ActivityWatch/dev/transform-intersection-fix

Transform intersection fix

6cff4c0d4835eb2c91b67e962b8e02e25793bb56 authored almost 7 years ago by Johan Bjäreholt <[email protected]>

Transform intersection fix

ef54b3073f3497e2b9249db68eb90bc6336055ec authored almost 7 years ago by Johan Bjäreholt <[email protected]>

fixed version specifier for peewee

bc13f183ed002b21084230314c71663e6af16072 authored almost 7 years ago by Erik Bjäreholt <[email protected]>

fixed typing and PEP8

7c853511bdfbbba539e9fdc967e56b994e03c981 authored almost 7 years ago by Erik Bjäreholt <[email protected]>

added aw_analysis to packages list in setup.py

2a346d86ea3ea3c1aefa41855766145b7184f26b authored almost 7 years ago by Erik Bjäreholt <[email protected]>

Merge pull request #46 from ActivityWatch/dev/transform-next

WIP: Dev/transform-next aka query2

21315cf941d2df80f616a7e59471dff2be059162 authored almost 7 years ago by Erik Bjäreholt <[email protected]>

removed cache dir

c05aacb6ae8ca3e42ac747b5c4b87dba213aa98e authored almost 7 years ago by Johan Bjäreholt <[email protected]>

Split transforms into multiple files

7510b034dbdb1e7d658e3120144e1f68c84b06dc authored almost 7 years ago by Johan Bjäreholt <[email protected]>

Moved query2 to aw_analysis

95e2f2ed3443786a3aeeba0669928226cb9c28fb authored almost 7 years ago by Johan Bjäreholt <[email protected]>

query2: multiline test

a7d04a9ce888eca1b14c83dffb068fbb38f9d460 authored almost 7 years ago by Johan Bjäreholt <[email protected]>

Removed cached queries, should be implemented in aw-server instead

f4e445a08424f3e8584f7b4592490023de0b8faa authored almost 7 years ago by Johan Bjäreholt <[email protected]>

query2: more coverage

bda35f751766f01f0f94f526eca2a0ba9bbfa99b authored almost 7 years ago by Johan Bjäreholt <[email protected]>

Fixed mypy issue

fe597e171fc361b38394343c52dca8763b971e05 authored almost 7 years ago by Johan Bjäreholt <[email protected]>

Merge pull request #48 from ActivityWatch/dev/delete-event

Delete event

1848e2a929cf05e58c2d565574643dc5be6367e7 authored almost 7 years ago by Erik Bjäreholt <[email protected]>

query2: added query_bucket_eventcount

537af002b336f604060282bb7cf9675256e62791 authored almost 7 years ago by Johan Bjäreholt <[email protected]>

query2: simplified Function.check

ab179845658bd78d22ed67f7adfcbf9f21af3958 authored almost 7 years ago by Johan Bjäreholt <[email protected]>

Fixed bug when strings in dicts containing } characters

50b390ccf7eb83cf672ddf655feeca496dec9172 authored almost 7 years ago by Johan Bjäreholt <[email protected]>