Share same connection
This commit is contained in:
13
action.py
13
action.py
@@ -16,3 +16,16 @@ def create_action(cursor, project_id = '', task_id = '', note_id = '', message =
|
||||
cursor.execute(query, (project_id, task_id, note_id, getpass.getuser(), message, datetime.datetime.now(),))
|
||||
|
||||
logging.debug('created action')
|
||||
|
||||
def read_last_action(conn):
|
||||
logging.info('> last_action')
|
||||
# query = 'SELECT * FROM action WHERE id = (SELECT MAX(id) FROM action'
|
||||
# query = 'SELECT project_id, task_id, note_id FROM action'
|
||||
query = 'SELECT project_id, task_id, note_id FROM action ORDER BY created_at DESC LIMIT 1;'
|
||||
|
||||
cursor = conn.cursor()
|
||||
cursor.execute(query)
|
||||
logging.debug('DEEEEEEEEBU')
|
||||
last_action = cursor.fetchone()
|
||||
logging.debug(last_action)
|
||||
return last_action
|
||||
25
pits.py
25
pits.py
@@ -31,19 +31,14 @@ def handle_action(args, last_action):
|
||||
result = row
|
||||
logging.debug(result)
|
||||
|
||||
def read_last_action():
|
||||
logging.info('> last_action')
|
||||
# query = 'SELECT * FROM action WHERE id = (SELECT MAX(id) FROM action'
|
||||
# query = 'SELECT project_id, task_id, note_id FROM action'
|
||||
query = 'SELECT project_id, task_id, note_id FROM action ORDER BY created_at DESC LIMIT 1;'
|
||||
def create_connection(db_filename):
|
||||
try:
|
||||
conn = sqlite3.connect(db_filename)
|
||||
return conn
|
||||
except Error as e:
|
||||
print(e)
|
||||
|
||||
with sqlite3.connect(db_filename) as conn:
|
||||
cursor = conn.cursor()
|
||||
cursor.execute(query)
|
||||
logging.debug('DEEEEEEEEBU')
|
||||
last_action = cursor.fetchone()
|
||||
logging.debug(last_action)
|
||||
return last_action
|
||||
return None
|
||||
|
||||
db_filename = 'pits.db'
|
||||
schema_filename = 'pits_schema.sql'
|
||||
@@ -93,9 +88,11 @@ parser.add_argument('--version', action='version', version='%(prog)s 1.0')
|
||||
if __name__ == '__main__':
|
||||
args = parser.parse_args()
|
||||
|
||||
last_action = read_last_action()
|
||||
conn = create_connection(db_filename)
|
||||
with conn:
|
||||
last_action = action.read_last_action(conn)
|
||||
logging.debug('Last action: {}'.format(last_action))
|
||||
|
||||
args.func(args, last_action)
|
||||
args.func(args, last_action, conn)
|
||||
|
||||
print('END')
|
||||
29
project.py
29
project.py
@@ -1,16 +1,14 @@
|
||||
import sqlite3
|
||||
# import sqlite3
|
||||
import os
|
||||
import argparse
|
||||
import json
|
||||
import getpass
|
||||
import datetime
|
||||
import logging
|
||||
|
||||
import action
|
||||
|
||||
db_filename = 'pits.db'
|
||||
schema_filename = 'pits_schema.sql'
|
||||
|
||||
def handle_project(args, last_action):
|
||||
def handle_project(args, last_action, conn):
|
||||
logging.info('> handle project')
|
||||
logging.debug('args: ' + str(args))
|
||||
|
||||
@@ -18,23 +16,23 @@ def handle_project(args, last_action):
|
||||
|
||||
if args.create_name:
|
||||
do_something = True
|
||||
create_project(args)
|
||||
create_project(args, conn)
|
||||
|
||||
if args.delete_id:
|
||||
do_something = True
|
||||
delete_project(args.delete_id)
|
||||
delete_project(args.delete_id, conn)
|
||||
|
||||
if args.edit_id:
|
||||
do_something = True
|
||||
edit_project(args, args.edit_id)
|
||||
edit_project(args, args.edit_id, conn)
|
||||
|
||||
if not do_something:
|
||||
active_project_id = None
|
||||
if last_action:
|
||||
active_project_id = last_action[0]
|
||||
list_project(active_project_id)
|
||||
list_project(active_project_id, conn)
|
||||
|
||||
def create_project(args):
|
||||
def create_project(args, conn):
|
||||
# TODO Project is same name is forbidden
|
||||
logging.info('>> Create project')
|
||||
|
||||
@@ -46,7 +44,6 @@ def create_project(args):
|
||||
status = 'active'
|
||||
if args.status: status = args.status
|
||||
|
||||
with sqlite3.connect(db_filename) as conn:
|
||||
cursor = conn.cursor()
|
||||
cursor.execute(query, (getpass.getuser(), args.create_name, status, datetime.datetime.now(),))
|
||||
|
||||
@@ -56,7 +53,7 @@ def create_project(args):
|
||||
|
||||
print('created project {}: {} (status: {})'.format(project_id, args.create_name, status))
|
||||
|
||||
def edit_project(args, project_id):
|
||||
def edit_project(args, project_id, conn):
|
||||
logging.info('>> Edit project')
|
||||
|
||||
update_args = {}
|
||||
@@ -69,7 +66,6 @@ def edit_project(args, project_id):
|
||||
query = query.format(', '.join("%s = '%s'" % (k, v) for k, v in update_args.items()))
|
||||
logging.debug('update project query: ' + query)
|
||||
|
||||
with sqlite3.connect(db_filename) as conn:
|
||||
cursor = conn.cursor()
|
||||
if update_args:
|
||||
logging.debug('Do a project update')
|
||||
@@ -82,7 +78,7 @@ def edit_project(args, project_id):
|
||||
|
||||
action.create_action(cursor, project_id, message = 'update ' + str(update_args))
|
||||
|
||||
def delete_project(project_id):
|
||||
def delete_project(project_id, conn):
|
||||
logging.info('>> Remove project')
|
||||
|
||||
query = """
|
||||
@@ -90,17 +86,16 @@ def delete_project(project_id):
|
||||
WHERE id = ?;
|
||||
"""
|
||||
|
||||
with sqlite3.connect(db_filename) as conn:
|
||||
cursor = conn.cursor()
|
||||
cursor.execute(query, (project_id,))
|
||||
if cursor.rowcount != 1:
|
||||
logging.error('DELETE FAILED')
|
||||
print('deleted project {}: {}'.format(project_id, 'project_name'))
|
||||
|
||||
def list_project(active_project_id):
|
||||
def list_project(active_project_id, conn):
|
||||
logging.info('>> No arguments')
|
||||
query = "SELECT id, username, name, status, created_at FROM project;"
|
||||
with sqlite3.connect(db_filename) as conn:
|
||||
|
||||
cursor = conn.cursor()
|
||||
cursor.execute(query)
|
||||
for row in cursor.fetchall():
|
||||
|
||||
Reference in New Issue
Block a user