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

Merge pull request #54 from ActivityWatch/dev/minor-fixes

Minor fixes

86c9d7f0234f1bb59589d9ddb88f9d10e274eb28 authored almost 4 years ago by Johan Bjäreholt <[email protected]>

Make commit_interval diff use >= instead of >

fdeceb02887db6836ff9ac6dd57c302943268310 authored almost 4 years ago by Johan Bjäreholt <[email protected]>

Fix insert_event compatibility with aw-server-rust

6521df6e7dbd99468b539dad5c55983e90473024 authored almost 4 years ago by Johan Bjäreholt <[email protected]>

feat: added load_dataframe.py example

9de80950e8623450e77231ea66c5dc5df473b68a authored about 4 years ago by Erik Bjäreholt <[email protected]>

build(deps): updated dependencies

67e905287fec8d55075a26b0796ee43a66e9fca8 authored about 4 years ago by Erik Bjäreholt <[email protected]>

test: fixed integration test

c6ee497d0ae286dd2994dfaf817b11cb49f2d64f authored about 4 years ago by Erik Bjäreholt <[email protected]>

fix: improved typing

56e2f105e22c9e9a34a35e7f40d8ef70f1811ea4 authored about 4 years ago by Erik Bjäreholt <[email protected]>

fix: fixed incorrect use of Click context

e0eb2c0819ccd9cf2827c8a254f1c97886bc852e authored about 4 years ago by Erik Bjäreholt <[email protected]>

fix: fixed typechecking

74db79f7beb6a28c88850a03e5ea98c12f4b00dc authored about 4 years ago by Erik Bjäreholt <[email protected]>

feat: rewrote CLI to use click

b2e7985a7751d5a4135f79fe5228779782cce9fd authored about 4 years ago by Erik Bjäreholt <[email protected]>

docs: added new redact_sensitive.py example to README

ea6de3a614af619d693469f0eb0b72715f60470b authored about 4 years ago by Erik Bjäreholt <[email protected]>

style: formatted with black

fb54d3612c117b898f25eaa1658456c2325c99dd authored about 4 years ago by Erik Bjäreholt <[email protected]>

ci: improved typechecking

a546c76a6b6a8c45e234bcb9e5ca0dad1b16c7a5 authored about 4 years ago by Erik Bjäreholt <[email protected]>

ci: switched to GitHub Actions

ef4cd52fd40f2df9a7c31448397a93b24ab3592e authored about 4 years ago by Erik Bjäreholt <[email protected]>

feat: added redact_sensitive.py example

75efe3c20eb477c49bae83ef98be01383e35972c authored about 4 years ago by Erik Bjäreholt <[email protected]>

docs(example): added time_spent_today.py example

120b1f7a89d17ada10a19a34e12990cbbf13afee authored about 4 years ago by Erik Bjäreholt <[email protected]>

build(deps): updated dependency locks

907f5f4cef43b9bea25497525bce130aba4022be authored over 4 years ago by Erik Bjäreholt <[email protected]>

fix: fixed minor things (docs, wrongly commented out code) in examples/merge_buckets.py

839e1baf5d916f013415aa102dcb59274ea19a7d authored over 4 years ago by Erik Bjäreholt <[email protected]>

feat: added better output when overlapping events found

52937c4938d9d96d9189dbe2b1b01faeaa592eaf authored over 4 years ago by Erik Bjäreholt <[email protected]>

feat: added merge_buckets.py example

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

Merge pull request #49 from ActivityWatch/doc/readme-update

Add install instructions to README.md

bd8a953a267fe0aec3a02be82605587db32ed6f9 authored over 4 years ago by Johan Bjäreholt <[email protected]>

doc: Add install instructions to README.md

3a4367cc8563424f655e685b7a1fd9261a8103e8 authored over 4 years ago by Johan Bjäreholt <[email protected]>

changed Makefile use of python3 -> python

07bb9c2554eec5383f1b190f6f6fe3077c397806 authored almost 5 years ago by Erik Bjäreholt <[email protected]>

switched to only using poetry install in Makefile

9e4cdb563ef09c0f4983da6ef0b43bfda675a29b authored almost 5 years ago by Erik Bjäreholt <[email protected]>

changed Makefile use of pip to pip3

6846551b0c91ab37b79435a79e5b2a6bc34d3be6 authored almost 5 years ago by Erik Bjäreholt <[email protected]>

fixed version in pyproject.toml

2e11d4b50484cbe53e37a327eb487f487837f90e authored about 5 years ago by Erik Bjäreholt <[email protected]>

updated poetry.lock

f084ae281453dd0539098c1a3c680fcb217f4d04 authored about 5 years ago by Erik Bjäreholt <[email protected]>

fixed make build DEV=true

79b5a9f28d9226cafec14cda1b4f58e333af41f6 authored about 5 years ago by Erik Bjäreholt <[email protected]>

Merge pull request #48 from ActivityWatch/dev/poetry

switched to using pyproject/poetry

83db6bc8f7e4d6a7c2d147f71e555a28956e4765 authored about 5 years ago by Erik Bjäreholt <[email protected]>

switched to using pyproject/poetry

d66f31920b87c896eb456f8a9592bf3a706f2378 authored about 5 years ago by Erik Bjäreholt <[email protected]>

Merge pull request #47 from JustinDDavis/232-event-limit-default-change

Change default API limit from 100 to return all events

b7e0cd4dd2931f9d5bad5cfbc4837ca74b645e32 authored about 5 years ago by Johan Bjäreholt <[email protected]>

Change default limit from 100 to return all by default

d35449ab0b43ec7866be769b3d5a2e677dd6315d authored about 5 years ago by Justin Davis <[email protected]>

added --testing argument to awcli

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

Fix hostname:port parsing for aw-cli. (#44)

Fix hostname:port parsing for aw-cli.

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

Fix hostname:port parsing for aw-cli.

ddbcaa39c5a2096a9731ad53b4f348e6f069685a authored over 5 years ago by Jacob Steele <[email protected]>

Extended API with import/export endpoints (#42)

Extended API with import/export endpoints

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

extended API with import/export endpoints

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

Removed upgrade from pipargs

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

Merge pull request #40 from ActivityWatch/dev/change-default-host

changed default hostname to 127.0.0.1 (from localhost)

eed7581d40ffad7d38f23e80ce904a293e323e8a authored almost 6 years ago by Erik Bjäreholt <[email protected]>

changed default hostname to 127.0.0.1 (from localhost)

a6c2da254448a46aba057c1a4686bbef7672520c authored almost 6 years ago by Erik Bjäreholt <[email protected]>

removed nightly travis target

30e8642c5b8038c2aad3a580d3c9b46fc4e62cce authored almost 6 years ago by Erik Bjäreholt <[email protected]>

fixed config loading

4546c77f67972769923162f44e3df831466ed39f authored almost 6 years ago by Erik Bjäreholt <[email protected]>

made import of fcntl conditional (not available nor needed on Windows)

f34b28a286539c71325910176c80cfb1527b462a authored almost 6 years ago by Erik Bjäreholt <[email protected]>

Merge pull request #21 from ActivityWatch/dev/singleinstance

Only one instance for each (host+port, client, user)

4e270c18523a5c1039bef8eabe163c9a8622aea4 authored almost 6 years ago by Erik Bjäreholt <[email protected]>

fixed MockClient attributes

11759fa71778b898353bad62aa9be695e4eb2633 authored almost 6 years ago by Erik Bjäreholt <[email protected]>

Merge branch 'master' into dev/singleinstance

453c4d90a8848c8f29c17fdb75ab3dad08761821 authored almost 6 years ago by Erik Bjäreholt <[email protected]>

Merge pull request #39 from ActivityWatch/dev/simplification

Remove one unnecessary GET request

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

Remove one unnecessary GET request

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

cli: add support for heartbeats

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

removed direct URL requirement from setup.py

5791519bc6174d80d534979b1da7b751871cfe5f authored about 6 years ago by Erik Bjäreholt <[email protected]>

fixed error where json module was shadowed

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

Merge pull request #35 from ActivityWatch/dev/heartbeat_premerge_improvements

Improve heartbeat pre-merging

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

Added commit_interval heartbeat override and lowered default commit_interval

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

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

Fixed heartbeat merging

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

fixed issues introduced in last commit

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

fixed bug in last commit

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

fixed heartbeat merging

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

moved utility query to aw-research

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

updated dependency to correct version

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

fixed bug

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

fixed example query

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

Merge pull request #30 from ActivityWatch/dev/cli

Added CLI script

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

added arg to print query result as JSON

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

Merge pull request #33 from ActivityWatch/dev/heartbeat-pre-merge

Attempt at heartbeat pre-merging

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

fixed tests

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

fixed query subcommand in CLI, added example query, cleanup

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

made module runnable

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

Removed unecessary Optional return type

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

Removed unecessary Optional return type

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

Response is no longer optional in _get/_post/_delete

There's either a response or there's a raised exception

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

Fixed so only queued heartbeats are pre-merged

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

fixed type

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

Fixed tests

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

pre-merge attempt 2

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

Fixed so no heartbeats can be left uncommited

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

Added commit_interval to config

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

Attempt at heartbeat pre-merging

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

Merge pull request #31 from ActivityWatch/dev/queue_fix

Fixed seperate queue for testing

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

Fixed seperate queue for testing

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

Merge branch 'master' into dev/cli

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

added basic query support

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

printing usage if no positional argument given

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

added start of CLI script

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

Merge pull request #28 from ActivityWatch/dev/harden

Attempt to harden and make aw-client more resilient

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

fixed Windows-incompatibilty issue

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

removed unused parameter

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

removed unnecessary comment

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

changed suffix for persistqueue path

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

removed unused import

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

fixed bug where queued events wouldn't get returned by _get_next on first call

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

fixed typing and misc readability improvements

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

fixed issue with using persist-queue which could lead to lost events

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

bumped version of persist-queue

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

run RequestQueue tests in CI

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

started working on tests for RequestQueue

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

switched to using persist-queue instead of home-rolled variant

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

Merge pull request #25 from ActivityWatch/dev/query

Initial query support

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

fixed type annotation

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

Added get_eventcount

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

Merge pull request #26 from pylipp/fix/client-context-manager

Fix usage of ActivityWatchClient in with-statement

53e60e037fbb19bc2950e58a5588d24313b54e68 authored about 7 years ago by Johan Bjäreholt <[email protected]>