black formatting

This commit is contained in:
2018-07-21 15:41:48 +02:00
parent 5f9ea6f0b7
commit b18c4dcd18
8 changed files with 475 additions and 266 deletions

View File

@@ -16,17 +16,19 @@ from args import arg_number
from utils import get_pits_path
class Project:
def __init__(self, status = None):
def __init__(self, status=None):
self.name = None
self.status = status
def __str__(self):
return str(self.__dict__)
def handle_project(args, last_action, conn):
logging.info('> handle project')
logging.debug('args: ' + str(args))
logging.info("> handle project")
logging.debug("args: " + str(args))
if not args:
list_project(last_action.project_id, conn)
@@ -34,18 +36,18 @@ def handle_project(args, last_action, conn):
if args[0].isdigit():
view_project_set_active(int(args[0]), last_action, conn)
elif args[0] == '-c':
elif args[0] == "-c":
if len(args) == 1:
print('missing project name')
print("missing project name")
sys.exit(1)
project = Project('active')
project.name = get_string_arg(args[1:], 'project name')
project = Project("active")
project.name = get_string_arg(args[1:], "project name")
parse_project_args(project, args[2:])
create_project(project, conn)
elif args[0] == '-e':
elif args[0] == "-e":
if len(args) == 1:
print('nothing to update')
print("nothing to update")
sys.exit(1)
project = Project()
@@ -56,18 +58,19 @@ def handle_project(args, last_action, conn):
else:
project_id = last_action.project_id
parse_project_args(project, args[1:])
logging.debug('Project: ({}) {}'.format(project_id, project))
logging.debug("Project: ({}) {}".format(project_id, project))
edit_project(project, project_id, conn)
# TODO To set as active project, us a -a option?
elif args[0] == '-d':
elif args[0] == "-d":
if len(args) > 1:
delete_project(arg_number(args[1]), conn)
else:
delete_project(last_action.project_id, conn)
else:
print(f'Invalid project option: {args[0]}')
print(f"Invalid project option: {args[0]}")
def parse_project_args(project, args):
if not args:
@@ -77,20 +80,21 @@ def parse_project_args(project, args):
while i < len(args):
logging.debug(args[i])
if args[i] == '-s':
if args[i] == "-s":
i += 1
project.status = get_string_arg(args[i:i+1], 'project status')
elif args[i] == '-n':
project.status = get_string_arg(args[i : i + 1], "project status")
elif args[i] == "-n":
i += 1
project.name = get_string_arg(args[i:i+1], 'project name')
project.name = get_string_arg(args[i : i + 1], "project name")
else:
print(f'Invalid project option: {args[i]}')
print(f"Invalid project option: {args[i]}")
sys.exit(1)
i += 1
def create_project(project, conn):
# TODO Project is same name is forbidden
logging.info('>> Create project')
logging.info(">> Create project")
query = """
INSERT INTO project (username, name, status, created_at)
@@ -98,44 +102,56 @@ def create_project(project, conn):
"""
cursor = conn.cursor()
cursor.execute(query, (getpass.getuser(), project.name, project.status, datetime.datetime.now(),))
cursor.execute(
query,
(getpass.getuser(), project.name, project.status, datetime.datetime.now()),
)
project_id = cursor.lastrowid
action_message = '{} (status: {})'.format(project.name, project.status)
action_message = "{} (status: {})".format(project.name, project.status)
record_action(cursor, TypeAction.CREATE, action_message, project_id=project_id)
logging.debug(action_message)
print('created project {}: {} (status: {})'.format(project_id, project.name, project.status))
print(
"created project {}: {} (status: {})".format(
project_id, project.name, project.status
)
)
def edit_project(project, project_id, conn):
logging.info('>> Edit project')
logging.info(">> Edit project")
update_args = [item for item in project.__dict__.items() if item[1] is not None]
if not update_args:
print("nothing to update")
print("Tips: if you want to active a project, just do '{} project <project_id>'"
.format(get_pits_path()))
print(
"Tips: if you want to active a project, just do '{} project <project_id>'".format(
get_pits_path()
)
)
sys.exit(1)
logging.debug('Project update args: {}'.format(update_args))
logging.debug("Project update args: {}".format(update_args))
query = 'UPDATE project SET {} WHERE id = ?'
query = query.format(', '.join("%s = '%s'" % (k, v) for k, v in update_args))
logging.debug('update project query: ' + query)
query = "UPDATE project SET {} WHERE id = ?"
query = query.format(", ".join("%s = '%s'" % (k, v) for k, v in update_args))
logging.debug("update project query: " + query)
cursor = conn.cursor()
logging.debug('Do a project update')
logging.debug("Do a project update")
cursor.execute(query, (project_id,))
log_args = ', '.join("%s: %s" % (k, v) for k, v in update_args)
print('updated project {}: ({})'.format(project_id, log_args))
log_args = ", ".join("%s: %s" % (k, v) for k, v in update_args)
print("updated project {}: ({})".format(project_id, log_args))
# TODO Print project name ?
record_action(cursor, TypeAction.UPDATE, '({})'.format(log_args), project_id)
record_action(cursor, TypeAction.UPDATE, "({})".format(log_args), project_id)
def delete_project(project_id, conn):
logging.info('>> Remove project')
logging.info(">> Remove project")
query = """
DELETE FROM project
@@ -145,13 +161,14 @@ def delete_project(project_id, conn):
cursor = conn.cursor()
cursor.execute(query, (project_id,))
if cursor.rowcount != 1:
logging.error('DELETE FAILED')
print('could not find project {}'.format(project_id))
logging.error("DELETE FAILED")
print("could not find project {}".format(project_id))
print('deleted project {}: {}'.format(project_id, 'project_name'))
record_action(cursor, TypeAction.DELETE, '', project_id)
print("deleted project {}: {}".format(project_id, "project_name"))
record_action(cursor, TypeAction.DELETE, "", project_id)
# TODO Cascade deleting
def list_project(active_project_id, conn):
query = """
SELECT id, username, name, status,
@@ -162,11 +179,20 @@ def list_project(active_project_id, conn):
cursor = conn.cursor()
cursor.execute(query)
for row in cursor.fetchall():
logging.debug('Project row: {}'.format(row))
logging.debug("Project row: {}".format(row))
project_id, username, name, status, nb_task = row
# TODO Formatting track: https://stackoverflow.com/questions/9989334/create-nice-column-output-in-python
print('{:1} {:2d}: ({:8}) | {} | {} ({} tasks)'.format('*' if active_project_id == project_id else '',
project_id, username, status, name, nb_task))
print(
"{:1} {:2d}: ({:8}) | {} | {} ({} tasks)".format(
"*" if active_project_id == project_id else "",
project_id,
username,
status,
name,
nb_task,
)
)
def view_project_set_active(project_id, last_action, conn):
# FIXME duplicate with list_project
@@ -180,10 +206,10 @@ def view_project_set_active(project_id, last_action, conn):
cursor.execute(query, (project_id,))
row = cursor.fetchone()
if not row:
print('Could not find project {}'.format(project_id))
print("Could not find project {}".format(project_id))
sys.exit(1)
print('* {:d}: ({}) {} (status: {}, {} tasks)'.format(*row))
print("* {:d}: ({}) {} (status: {}, {} tasks)".format(*row))
# FIXME duplicate with list_task
query = """
@@ -193,12 +219,21 @@ def view_project_set_active(project_id, last_action, conn):
"""
cursor.execute(query, (project_id,))
for row in cursor.fetchall():
logging.debug('Task row: {}'.format(row))
logging.debug("Task row: {}".format(row))
task_id, username, name, status, priority, date, time, nb_note = row
message = date + time + name
print(' {} {:d}: ({}) [{}] [{}] {} ({} tasks)'.format('*' if last_action.task_id == row[0] else ' ',
task_id, username, status, priority, message, nb_note))
print(
" {} {:d}: ({}) [{}] [{}] {} ({} tasks)".format(
"*" if last_action.task_id == row[0] else " ",
task_id,
username,
status,
priority,
message,
nb_note,
)
)
set_active(cursor, project_id=project_id)
# TODO Add a -v option to see notes?
# TODO Add a -v option to see notes?