Improved module detection, configuration, and added support for non-standard modules #56

xylix · 2020-03-02T11:30:40Z

Will improve module detection, and aims to add config file support for _available_modules and autostart lists

Merges and closes #27 and closes #48

TODOs:

Needs testing on Windows
~~Write config as commented out toml instead of old format~~ We're skipping this.
Fix finding bundled executables (currently only system executables are found correctly

aw_qt/manager.py

ErikBjare · 2020-03-02T11:46:48Z

If you want to further improve manager.py take a look at #27 and #48.

Would be nice to finally get them merged or closed.

xylix · 2020-03-02T14:25:44Z

Yeah I'll try to get those done.

xylix · 2020-03-02T14:58:12Z

I added the #48 changes and will look at the #27 changes next. Will also need to do some testing.

#27 has some generic improvements which I'll at least integrate, but having to install all modules into path would be something I wouldn't prefer.

I think it'd be better to have a global config file with a list which just happens to include all the aw's own modules by default. This'd make it much easier to add external modules without changing the source code and would also theoretically support having a "/modules" directory somewhere which could be sourced by the user.

@ErikBjare Whats your opinion about automatic path detection vs a "possible modules" list and trying to find those modules? It's been quite a few years since #27

lgtm-com · 2020-03-02T14:59:14Z

This pull request introduces 1 alert when merging 1dc943e into 8b03043 - view on LGTM.com

new alerts:

1 for Non-callable called

ErikBjare · 2020-03-02T15:15:59Z

About the config introduced in #27, I'd like to see the config file use toml instead of the config format used by aw_core.load_config. The aw_core.load_config also incorrectly writes defaults to file. Commented out defaults can be written to file if none exists, to clarify which options exist.

An option is to simply rewrite aw_core.load_config to use toml and use the "write commented out defaults if no config exist" rule, but that might require writing some type of migration from existing configs.

ErikBjare · 2020-03-02T15:16:16Z

I'd like @johan-bjareholt's comments on that as well.

ErikBjare · 2020-03-02T16:22:00Z

Whats your opinion about automatic path detection vs a "possible modules" list and trying to find those modules?

So I guess there are two questions:

What do we look for when looking for modules?
- Config vs all executables with a aw- prefix
- We currently only look for the modules in the hard-coded list
Where do we look for module executables?
- Special folders (such as subfolders of the aw-qt executable) and/or PATH
- We currently look in the directory of the aw-qt executable (this might be redundant with how packaging now) as well as subfolders starting with aw- (I haven't verified this in the code, but that's what I remember)
- If two modules with the same name is found (for example, aw-server is found both in a subdirectory and PATH) then a module executable found in the subdirectory should take precedence. You can also have a module twice in your PATH, but there the normal PATH precedence rules should apply (i.e. always pick the first found).

It doesn't make much sense to me to be able to configure possible modules (as we will be able to figure out which are available anyway from the PATH and subdirectories) but there needs to be a way to specify which modules to run on startup (apart from the CLI flag).

…ivityWatch#47 NOTE: `ConfigParser` does not correctly store array values. Store module lists as json.

lgtm-com · 2020-03-03T19:22:13Z

This pull request introduces 1 alert when merging 94dc1df into 481ace6 - view on LGTM.com

new alerts:

1 for Unused import

…eating module menu

…improved-module-detection

xylix · 2020-03-04T15:54:56Z

@ErikBjare I have now merged #27 and #48, so they can be closed. I also generally improved typing support everywhere around aw-qt.

(TODOs moved to top comment)

lgtm-com · 2020-03-04T16:02:07Z

This pull request fixes 1 alert when merging ea9d196 into 481ace6 - view on LGTM.com

fixed alerts:

1 for Unreachable code

lgtm-com · 2020-03-04T17:43:14Z

This pull request fixes 1 alert when merging bfd13d7 into 481ace6 - view on LGTM.com

fixed alerts:

1 for Unreachable code

Update poetry lockfile to include stubs

ErikBjare · 2020-04-19T16:35:43Z

@xylix I started working on TOML support in aw-core here: ActivityWatch/aw-core#88

aw_qt/manager.py

variable and manually splitting

ErikBjare

I think it's about time we try to merge this. I'll move all the TODOs to the top comment.

aw_qt/manager.py

ErikBjare · 2020-07-25T11:39:59Z

I merged master into the branch and fixed a few things. Should be ready to merge now.

lgtm-com · 2020-07-25T12:18:55Z

This pull request introduces 6 alerts and fixes 1 when merging 01378f1 into 20261da - view on LGTM.com

new alerts:

6 for Unused import

fixed alerts:

1 for Unreachable code

lgtm-com · 2020-07-25T12:26:43Z

This pull request fixes 1 alert when merging 157a546 into 20261da - view on LGTM.com

fixed alerts:

1 for Unreachable code

ErikBjare · 2020-07-25T12:29:18Z

I'm just going to YOLO this and assume it will work fine on Windows (my only concern is the use of os.access, but I think it'll work).

Merging as soon as CI passes.

xylix · 2020-07-26T16:16:06Z

Great, nice that you got this finished!

Alwinator · 2020-07-28T07:14:47Z

I will test it for Windows. If I find a error, I will report it here.

ErikBjare added 6 commits August 30, 2017 20:44

added basic module autodetection

53f7dd0

fixed bundled modules

fbe3519

fixed crash when module couldn't be started

ba88995

fixed issue when location in PATH does not exist

4078647

categorized module menu by location of module

70cca98

fixed typechecking and enabled on Travis

6db5435

ErikBjare reviewed Mar 2, 2020

View reviewed changes

aw_qt/manager.py Outdated Show resolved Hide resolved

xylix and others added 3 commits March 3, 2020 21:11

actually check for module existence in manager

b7ed55a

Store available and autostart modules lists as configuration. See Act…

a974e2c

…ivityWatch#47 NOTE: `ConfigParser` does not correctly store array values. Store module lists as json.

rename QTSettings to AwQtSettings and add aw-server-rust

9dfea4b

xylix force-pushed the dev/improved-module-detection branch from 1dc943e to 94dc1df Compare March 3, 2020 19:15

Add type hints to new code

94dc1df

xylix added 5 commits March 4, 2020 11:41

remove 1 unused import, don't treat aw-server as a special case in cr…

7a67423

…eating module menu

Merge remote-tracking branch 'xylix/dev/autodetect-modules' into dev/…

2a05ba1

…improved-module-detection

Improve mypy typing

4403d19

Improve type safety and add some info logs / comments

d4e33cf

Fix lambda parameter amount to allow termination on sigint / sigkill

ea9d196

xylix force-pushed the dev/improved-module-detection branch from bfd13d7 to a7c098c Compare March 4, 2020 17:45

Add pyqt type stubs to dev dependencies, nicer mypy output by default

a7c098c

Update poetry lockfile to include stubs

Recursively find submodules in subdirectories

9a849ca

This comment has been minimized.

Sign in to view

Add some informative pydoc comments

2a6a8da

This comment has been minimized.

Sign in to view

ErikBjare added this to Review in progress in Road to 1.0 Apr 19, 2020

This was referenced Apr 19, 2020

Autodetect modules #27

Closed

Configurable available and autostart modules #47

Closed

RoBobik reviewed Apr 24, 2020

View reviewed changes

aw_qt/manager.py Outdated Show resolved Hide resolved

Get PATH using python's os module instead of getting environment

68314f0

variable and manually splitting

johan-bjareholt mentioned this pull request Jul 24, 2020

How to deploy a custom watcher? ActivityWatch/activitywatch#462

Closed

ErikBjare reviewed Jul 25, 2020

View reviewed changes

aw_qt/manager.py Outdated Show resolved Hide resolved

aw_qt/manager.py Show resolved Hide resolved

Merge branch 'master' into dev/improved-module-detection

0a359bd

This comment has been minimized.

Sign in to view

ErikBjare added 2 commits July 25, 2020 13:02

fix: minor cleanup

f6d26c7

feat: switched to using click for the CLI, fixed bugs

682a73f

This comment has been minimized.

Sign in to view

fix: fixed typing checks

01378f1

style: removed unused imports

157a546

ErikBjare merged commit 839c9fd into ActivityWatch:master Jul 25, 2020

Road to 1.0 automation moved this from Review in progress to Done Jul 25, 2020

xylix deleted the dev/improved-module-detection branch July 26, 2020 16:15

ErikBjare changed the title ~~actually check for module existence in manager~~ Improved module detection, configuration, and added support for non-standard modules Aug 1, 2020

ErikBjare mentioned this pull request Aug 1, 2020

Load modules from a config file or autodetect them #35

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Improved module detection, configuration, and added support for non-standard modules #56

Improved module detection, configuration, and added support for non-standard modules #56

xylix commented Mar 2, 2020 •

edited by ErikBjare

Loading

ErikBjare commented Mar 2, 2020

xylix commented Mar 2, 2020

xylix commented Mar 2, 2020 •

edited

Loading

lgtm-com bot commented Mar 2, 2020

ErikBjare commented Mar 2, 2020

ErikBjare commented Mar 2, 2020

ErikBjare commented Mar 2, 2020 •

edited

Loading

lgtm-com bot commented Mar 3, 2020

xylix commented Mar 4, 2020 •

edited by ErikBjare

Loading

lgtm-com bot commented Mar 4, 2020

lgtm-com bot commented Mar 4, 2020

This comment has been minimized.

This comment has been minimized.

ErikBjare commented Apr 19, 2020

ErikBjare left a comment

This comment has been minimized.

ErikBjare commented Jul 25, 2020

This comment has been minimized.

lgtm-com bot commented Jul 25, 2020

lgtm-com bot commented Jul 25, 2020

ErikBjare commented Jul 25, 2020

xylix commented Jul 26, 2020

Alwinator commented Jul 28, 2020

Improved module detection, configuration, and added support for non-standard modules #56

Improved module detection, configuration, and added support for non-standard modules #56

Conversation

xylix commented Mar 2, 2020 • edited by ErikBjare Loading

ErikBjare commented Mar 2, 2020

xylix commented Mar 2, 2020

xylix commented Mar 2, 2020 • edited Loading

lgtm-com bot commented Mar 2, 2020

ErikBjare commented Mar 2, 2020

ErikBjare commented Mar 2, 2020

ErikBjare commented Mar 2, 2020 • edited Loading

lgtm-com bot commented Mar 3, 2020

xylix commented Mar 4, 2020 • edited by ErikBjare Loading

lgtm-com bot commented Mar 4, 2020

lgtm-com bot commented Mar 4, 2020

This comment has been minimized.

This comment has been minimized.

ErikBjare commented Apr 19, 2020

ErikBjare left a comment

Choose a reason for hiding this comment

This comment has been minimized.

ErikBjare commented Jul 25, 2020

This comment has been minimized.

lgtm-com bot commented Jul 25, 2020

lgtm-com bot commented Jul 25, 2020

ErikBjare commented Jul 25, 2020

xylix commented Jul 26, 2020

Alwinator commented Jul 28, 2020

xylix commented Mar 2, 2020 •

edited by ErikBjare

Loading

xylix commented Mar 2, 2020 •

edited

Loading

ErikBjare commented Mar 2, 2020 •

edited

Loading

xylix commented Mar 4, 2020 •

edited by ErikBjare

Loading