Skip to content

Feat/current alternative formating #616

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.

Sign up for GitHub

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

Open
rafaltrojniak wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Feat/current alternative formating #616

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
#!/usr/bin/env python2
import distutils
import os
from distutils.core import setup
from distutils import sysconfig
try:
from setuptools import setup
except ImportError:
from distutils.core import setup

data_dir = os.path.join(sysconfig.get_python_lib(), "hamster", "data")

Expand Down
26 changes: 22 additions & 4 deletions src/hamster-cli.py
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,10 @@ def __init__(self):
self.storage = client.Storage()


def setFormat(self, format:str):
self.format = format


def assist(self, *args):
assist_command = args[0] if args else ""

Expand Down Expand Up @@ -318,11 +322,19 @@ def list(self, *times):
def current(self, *args):
"""prints current activity. kinda minimal right now"""
facts = self.storage.get_todays_facts()
if facts and not facts[-1].end_time:
print("{} {}".format(str(facts[-1]).strip(),
facts[-1].delta.format(fmt="HH:MM")))

if not self.format or self.format == 'text':
if facts and not facts[-1].end_time:
print("{} {}".format(str(facts[-1]).strip(),
facts[-1].delta.format(fmt="HH:MM")))
else:
print((_("No activity")))
else:
print((_("No activity")))
fact=[]
if facts:
fact = [facts[-1]]
now = dt.datetime.now()
reports.simple(fact, now, now, self.format)


def search(self, *args):
Expand Down Expand Up @@ -467,6 +479,10 @@ def version(self):
choices=('DEBUG', 'INFO', 'WARNING', 'ERROR', 'CRITICAL'),
default='WARNING',
help="Set the logging level (default: %(default)s)")
parser.add_argument("-f", "--format",
choices=('text', 'html', 'tsv', 'xml', 'ical'),
default='',
help="Set output format (default: %(default)s)")
parser.add_argument("action", nargs="?", default="overview")
parser.add_argument('action_args', nargs=argparse.REMAINDER, default=[])

Expand All @@ -488,6 +504,8 @@ def version(self):
else:
action = args.action

hamster_client.setFormat(args.format)

if action in ("about", "add", "edit", "overview", "preferences"):
if action == "add" and args.action_args:
assert not unknown_args, "unknown options: {}".format(unknown_args)
Expand Down