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

python3 port + usability fixes #363

Merged
merged 48 commits into from
Nov 24, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
80f97fb
Fix division by zero (#245).
michaelkuhn Feb 19, 2016
bcf7814
Fix TargetFlags
sanjayankur31 Mar 12, 2016
e37b5a9
Work around to add time spend per tag to the overview, #277
helmo May 24, 2016
65dcdd5
updated German translation
auge Apr 15, 2017
50f4ee9
explicitly require GConf version 2.0
ederag Aug 3, 2018
810bef7
explicitly require PangoCairo version 1.0
ederag Aug 3, 2018
ff2d4c7
new .editorconfig [https://editorconfig.org]
ederag Aug 12, 2018
61a4e25
cleanup unused regular expressions
ederag Aug 12, 2018
88c0bf4
simplify: gather all templates
ederag Aug 12, 2018
8b1b0a5
strip once and for all
ederag Aug 12, 2018
00405ba
separate serialized_time function
ederag Aug 13, 2018
523ebfa
remove spaces for time range string output (consistency with input)
ederag Aug 13, 2018
05f2906
prepend date is optional now (default on)
ederag Aug 13, 2018
d8c421a
Provide template to stop the current activity.
ederag Aug 14, 2018
ac62549
centralize day_start (less code duplication)
ederag Aug 14, 2018
4ba335c
fix tests: point path to ../src instead of ..
ederag Aug 15, 2018
bb3ddd5
test hamster day / datetime conversions
ederag Aug 15, 2018
c744c8c
take hamster day into account (fix activities past midnight)
ederag Aug 15, 2018
94ec812
fix remaining space after category
ederag Aug 16, 2018
1a1b7b1
rework tags and description parsing (restore backward compatibility)
ederag Aug 16, 2018
1656756
fix too many commas in the serialized string
ederag Aug 16, 2018
17675be
why the fork
ederag Aug 17, 2018
c4289f9
start with today in Overview
ederag Aug 17, 2018
30e25ea
fix suggestions
ederag Aug 18, 2018
0545280
Merge remote-tracking branch 'upstream/pr/296' into gathering_fixes
ederag Aug 18, 2018
d1bbdfb
Merge remote-tracking branch 'upstream/pr/307' into gathering_fixes
ederag Aug 18, 2018
e826433
Remove forgotten pygtk import
jtojnar Apr 20, 2017
6ead571
Ensure self._max in HorizontalBarChart is always a timedelta instance
FelixSchwarz Mar 20, 2016
60da24b
Merge remote-tracking branch 'upstream/pr/345' into gathering_fixes
ederag Aug 19, 2018
2dc9bd3
Merge remote-tracking branch 'upstream/pr/321' into gathering_fixes
ederag Aug 19, 2018
3d5aab2
display only HH:MM, not seconds (save space)
ederag Aug 19, 2018
d2061d5
reduce bar size => more space for labels
ederag Aug 19, 2018
78c2867
migrate to python3
ederag Aug 19, 2018
27913f7
test with utf-8 characters
ederag Aug 20, 2018
c8ccac3
test initial_fact
ederag Aug 20, 2018
f0b9f6e
separate end_time=None setting (fix 'keep up' variant)
ederag Aug 20, 2018
768721e
- => [ ] for variant description
ederag Aug 20, 2018
4cc6643
display grand total in stats
ederag Aug 20, 2018
75373ad
update Overview every minute (necessary if an activity is running)
ederag Aug 22, 2018
84abb4e
lazy formatting of time (easy enter from numpad)
ederag Aug 23, 2018
f6da061
start with current hamster day (fix startup after midnight)
ederag Aug 24, 2018
30ba489
fix preferences day_start initialization
ederag Aug 24, 2018
dfceecb
avoid division by zero
ederag Aug 25, 2018
5251485
return "NEGATIVE" instead of wrong value
ederag Aug 25, 2018
83ffe9d
fix README: hamster.db should be readable in the new hamster-lib.
ederag Aug 26, 2018
aa6f3d7
replace file with IOBase [python3 migration]
ederag Sep 2, 2018
2382740
__iter__ => as_dict
ederag Sep 3, 2018
95c98a7
remove encode("utf-8")
ederag Sep 3, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# EditorConfig is awesome: https://EditorConfig.org

# top-most EditorConfig file
root = true

# Unix-style newlines with a newline ending every file
[*]
end_of_line = lf
insert_final_newline = true

# Matches multiple files with brace expansion notation
# Set default charset
[*.{js,py}]
charset = utf-8

# 4 space indentation
[*.py]
indent_style = space
indent_size = 4
trim_trailing_whitespace = true
insert_final_newline = true
45 changes: 45 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,51 @@
Hamster is time tracking for individuals. It helps you to keep track of how
much time you have spent during the day on activities you choose to track.



hamster-time-tracker v1.04 was not usable under openSUSE Leap-15,
where python2-gconf is not available any longer.
The [rewrite of hamster](https://github.com/projecthamster/hamster-gtk)
is progressing well, but it is still listed as alpha.

This repo is a fork from
[hamster](https://github.com/projecthamster/hamster) project,
that still used hamster.db, already migrated to Gtk3 and did not
depend on python-gconf.

Lots of the gui ease of use has been lost, especially for tags handling,
start/restart of activities, and the stats display is minimal now.
But at least backward compatibility seems good.
Seems enough to wait for the rewrite.

The fork base commit is [the latest one from master branch](https://github.com/projecthamster/hamster/commit/c3e5fb761c88fdecfd1566cac8b6836228a27cce).

After a little tweaking, it works now,
but has not been thouroughly tested.
Backup `hamster.db` first,
and keep track of activities on a text file too for some days !

To use the development version:
```
pkill -f hamster-service
pkill -f hamster-windows-service
src/hamster-service &
src/hamster-windows-service &
src/hamster-cli
```

To install, python2 is still necessary (for waf).
Adapt the paths below to your system,
`sudo rm/mv` commands, beware !
```
./waf configure build --prefix=/usr && sudo ./waf install
sudo rm -rf /usr/lib/python3.6/site-packages/hamster
sudo mv /usr/lib/python2.7/site-packages/hamster /usr/lib/python3.6/site-packages/
```


*[README from the original repo below]*

**IMPORTANT**
Project Hamster is undergoing a period of major transition. Unless someone
steps up to the task, this repository will remain unmaintained as the
Expand Down
Loading