From a5bbb06655fb34fbfaaeaafb31ac8388f4b8fd3a Mon Sep 17 00:00:00 2001 From: James Inkster Date: Mon, 14 Oct 2019 17:18:49 -0400 Subject: [PATCH 01/14] added ability to type grab and grab a list of your messages --- tmessage/cli.py | 7 ++++++- tmessage/db.py | 10 +++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/tmessage/cli.py b/tmessage/cli.py index f4337f5..360e8ea 100644 --- a/tmessage/cli.py +++ b/tmessage/cli.py @@ -4,7 +4,8 @@ import paho.mqtt.client as mqtt from colorama import init, deinit, Fore, Back, Style import tmessage.auth as auth # auth.py -from tmessage.db import store_messages # db.py +from db import * +"""from tmessage.db import grab_messages, store_messages # db.py""" # Initialize colorama @@ -80,8 +81,12 @@ def main(): pub_msg = f'[{user_name}] {displayed_name}: {raw_msg}' if raw_msg != '': MQTT_CLIENT.publish(MQTT_TOPIC, pub_msg) + if raw_msg == "grab": + grab_messages(CURRENT_USER) if IS_STORE: store_messages(CURRENT_USER, raw_msg) + + else: print(Back.WHITE + Fore.RED + "Can't send empty message", end='\n') diff --git a/tmessage/db.py b/tmessage/db.py index f89901e..716fd35 100644 --- a/tmessage/db.py +++ b/tmessage/db.py @@ -17,11 +17,19 @@ class Meta: # pylint: disable=missing-class-docstring,too-few-public-methods database = MESSAGES_DB + +@MESSAGES_DB +def grab_messages(user): + """Grab messages from the user""" + cursor = MESSAGES_DB.execute_sql("SELECT sender, message FROM message where sender LIKE \'" + user +'\'') + for row in cursor.fetchall(): + print(row[0] + " : " + row[1]) + + @MESSAGES_DB def store_messages(user, raw_msg): """Store a message sent by the indicated user in the database""" time = datetime.now() - Message.create(sender=user, message=raw_msg, timestamp=time) From b4117dad3f94b04fed354a1b4ce0edcc45a173b0 Mon Sep 17 00:00:00 2001 From: James Inkster Date: Mon, 14 Oct 2019 17:22:13 -0400 Subject: [PATCH 02/14] fix 36 --- tmessage/cli.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tmessage/cli.py b/tmessage/cli.py index 360e8ea..6c98613 100644 --- a/tmessage/cli.py +++ b/tmessage/cli.py @@ -4,8 +4,7 @@ import paho.mqtt.client as mqtt from colorama import init, deinit, Fore, Back, Style import tmessage.auth as auth # auth.py -from db import * -"""from tmessage.db import grab_messages, store_messages # db.py""" +from tmessage.db import grab_messages, store_messages # db.py""" # Initialize colorama From 15ca1098f7ba552a52476b7c1a54549d17d2a486 Mon Sep 17 00:00:00 2001 From: James Inkster Date: Mon, 14 Oct 2019 17:23:02 -0400 Subject: [PATCH 03/14] fix 36 --- tmessage/cli.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/tmessage/cli.py b/tmessage/cli.py index 6c98613..27d93f6 100644 --- a/tmessage/cli.py +++ b/tmessage/cli.py @@ -84,8 +84,6 @@ def main(): grab_messages(CURRENT_USER) if IS_STORE: store_messages(CURRENT_USER, raw_msg) - - else: print(Back.WHITE + Fore.RED + "Can't send empty message", end='\n') From d2a0d9b9ecd190b05d709d777417e82597ada29d Mon Sep 17 00:00:00 2001 From: James Inkster Date: Mon, 14 Oct 2019 17:29:46 -0400 Subject: [PATCH 04/14] fix 36 updated --- tmessage/db.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/tmessage/db.py b/tmessage/db.py index 716fd35..300b19a 100644 --- a/tmessage/db.py +++ b/tmessage/db.py @@ -16,8 +16,6 @@ class Message(Model): class Meta: # pylint: disable=missing-class-docstring,too-few-public-methods database = MESSAGES_DB - - @MESSAGES_DB def grab_messages(user): """Grab messages from the user""" @@ -25,7 +23,6 @@ def grab_messages(user): for row in cursor.fetchall(): print(row[0] + " : " + row[1]) - @MESSAGES_DB def store_messages(user, raw_msg): """Store a message sent by the indicated user in the database""" From e0ebc7d38ca64e63f54fa0943de0485a6b050e5e Mon Sep 17 00:00:00 2001 From: James Inkster Date: Tue, 15 Oct 2019 08:06:14 -0400 Subject: [PATCH 05/14] fix 36 --- tmessage/cli.py | 6 ++++-- tmessage/db.py | 3 +-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/tmessage/cli.py b/tmessage/cli.py index 27d93f6..025bf57 100644 --- a/tmessage/cli.py +++ b/tmessage/cli.py @@ -4,7 +4,7 @@ import paho.mqtt.client as mqtt from colorama import init, deinit, Fore, Back, Style import tmessage.auth as auth # auth.py -from tmessage.db import grab_messages, store_messages # db.py""" +from db import * # db.py""" # Initialize colorama @@ -81,7 +81,9 @@ def main(): if raw_msg != '': MQTT_CLIENT.publish(MQTT_TOPIC, pub_msg) if raw_msg == "grab": - grab_messages(CURRENT_USER) + query = grab_messages(CURRENT_USER) + for a in query: + print(a) if IS_STORE: store_messages(CURRENT_USER, raw_msg) else: diff --git a/tmessage/db.py b/tmessage/db.py index 300b19a..4d8e8d3 100644 --- a/tmessage/db.py +++ b/tmessage/db.py @@ -20,8 +20,7 @@ class Meta: # pylint: disable=missing-class-docstring,too-few-public-methods def grab_messages(user): """Grab messages from the user""" cursor = MESSAGES_DB.execute_sql("SELECT sender, message FROM message where sender LIKE \'" + user +'\'') - for row in cursor.fetchall(): - print(row[0] + " : " + row[1]) + return [r for r in cursor.fetchall()] @MESSAGES_DB def store_messages(user, raw_msg): From 8793564362a467a83779e681641819f61789f50c Mon Sep 17 00:00:00 2001 From: James Inkster Date: Tue, 15 Oct 2019 08:07:47 -0400 Subject: [PATCH 06/14] fix 36 --- tmessage/cli.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tmessage/cli.py b/tmessage/cli.py index 025bf57..0b77dc2 100644 --- a/tmessage/cli.py +++ b/tmessage/cli.py @@ -4,7 +4,7 @@ import paho.mqtt.client as mqtt from colorama import init, deinit, Fore, Back, Style import tmessage.auth as auth # auth.py -from db import * # db.py""" +from db import grab_messages, store_messages # db.py""" # Initialize colorama From b8215e6681dc172e9e7b8f5a292d6a841b1f443d Mon Sep 17 00:00:00 2001 From: James Inkster Date: Tue, 15 Oct 2019 08:18:42 -0400 Subject: [PATCH 07/14] fix-36 --- tmessage/cli.py | 4 ++-- tmessage/db.py | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tmessage/cli.py b/tmessage/cli.py index 0b77dc2..1bf58db 100644 --- a/tmessage/cli.py +++ b/tmessage/cli.py @@ -82,8 +82,8 @@ def main(): MQTT_CLIENT.publish(MQTT_TOPIC, pub_msg) if raw_msg == "grab": query = grab_messages(CURRENT_USER) - for a in query: - print(a) + for rows in query: + print(rows) if IS_STORE: store_messages(CURRENT_USER, raw_msg) else: diff --git a/tmessage/db.py b/tmessage/db.py index 4d8e8d3..dbd6589 100644 --- a/tmessage/db.py +++ b/tmessage/db.py @@ -19,7 +19,8 @@ class Meta: # pylint: disable=missing-class-docstring,too-few-public-methods @MESSAGES_DB def grab_messages(user): """Grab messages from the user""" - cursor = MESSAGES_DB.execute_sql("SELECT sender, message FROM message where sender LIKE \'" + user +'\'') + cursor = MESSAGES_DB.execute_sql( + "SELECT sender, message FROM message where sender LIKE \'"+ user +'\'') return [r for r in cursor.fetchall()] @MESSAGES_DB From cb6df55116960fdf82c73b8ec904af65dda2c1e9 Mon Sep 17 00:00:00 2001 From: James Inkster Date: Tue, 15 Oct 2019 08:22:26 -0400 Subject: [PATCH 08/14] fix-36 --- tmessage/db.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tmessage/db.py b/tmessage/db.py index dbd6589..6048ef3 100644 --- a/tmessage/db.py +++ b/tmessage/db.py @@ -20,7 +20,7 @@ class Meta: # pylint: disable=missing-class-docstring,too-few-public-methods def grab_messages(user): """Grab messages from the user""" cursor = MESSAGES_DB.execute_sql( - "SELECT sender, message FROM message where sender LIKE \'"+ user +'\'') + "SELECT sender, message FROM message where sender LIKE \'" + user + '\'') return [r for r in cursor.fetchall()] @MESSAGES_DB From 42fb8b1346a9f97859560d687f2642f2272d44c0 Mon Sep 17 00:00:00 2001 From: James Inkster Date: Tue, 15 Oct 2019 08:24:14 -0400 Subject: [PATCH 09/14] fix-36 --- tmessage/db.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tmessage/db.py b/tmessage/db.py index 6048ef3..754f2ed 100644 --- a/tmessage/db.py +++ b/tmessage/db.py @@ -20,7 +20,7 @@ class Meta: # pylint: disable=missing-class-docstring,too-few-public-methods def grab_messages(user): """Grab messages from the user""" cursor = MESSAGES_DB.execute_sql( - "SELECT sender, message FROM message where sender LIKE \'" + user + '\'') + "SELECT sender, message FROM message where sender LIKE \'" + user + '\'') return [r for r in cursor.fetchall()] @MESSAGES_DB From 793cbb57548472410b59911531ddb197d29f63e7 Mon Sep 17 00:00:00 2001 From: James Inkster Date: Tue, 15 Oct 2019 08:27:13 -0400 Subject: [PATCH 10/14] fix-36 --- tmessage/db.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tmessage/db.py b/tmessage/db.py index 754f2ed..98fe678 100644 --- a/tmessage/db.py +++ b/tmessage/db.py @@ -21,8 +21,7 @@ def grab_messages(user): """Grab messages from the user""" cursor = MESSAGES_DB.execute_sql( "SELECT sender, message FROM message where sender LIKE \'" + user + '\'') - return [r for r in cursor.fetchall()] - + return [r for r in cursor.fetchall()] @MESSAGES_DB def store_messages(user, raw_msg): """Store a message sent by the indicated user in the database""" From 24c65ae6e60aa1cd6eeef04a1f20e5c34e07ee7b Mon Sep 17 00:00:00 2001 From: James Inkster Date: Tue, 15 Oct 2019 08:30:06 -0400 Subject: [PATCH 11/14] fix-36 --- tmessage/db.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tmessage/db.py b/tmessage/db.py index 98fe678..432a5d1 100644 --- a/tmessage/db.py +++ b/tmessage/db.py @@ -21,7 +21,7 @@ def grab_messages(user): """Grab messages from the user""" cursor = MESSAGES_DB.execute_sql( "SELECT sender, message FROM message where sender LIKE \'" + user + '\'') - return [r for r in cursor.fetchall()] + return [row for row in cursor.fetchall()] @MESSAGES_DB def store_messages(user, raw_msg): """Store a message sent by the indicated user in the database""" From 6a6fb5a3ac075656ceee3969ee5584839a928d8c Mon Sep 17 00:00:00 2001 From: James Inkster Date: Tue, 15 Oct 2019 08:34:42 -0400 Subject: [PATCH 12/14] fix-36 --- tmessage/db.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tmessage/db.py b/tmessage/db.py index 432a5d1..6612567 100644 --- a/tmessage/db.py +++ b/tmessage/db.py @@ -21,7 +21,7 @@ def grab_messages(user): """Grab messages from the user""" cursor = MESSAGES_DB.execute_sql( "SELECT sender, message FROM message where sender LIKE \'" + user + '\'') - return [row for row in cursor.fetchall()] + return [list(cursor.fetchall())] @MESSAGES_DB def store_messages(user, raw_msg): """Store a message sent by the indicated user in the database""" From 1596277f40b7a231341db0f751e3301a786aee21 Mon Sep 17 00:00:00 2001 From: James Inkster Date: Tue, 15 Oct 2019 08:37:57 -0400 Subject: [PATCH 13/14] fix-36 --- tmessage/db.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tmessage/db.py b/tmessage/db.py index 6612567..2224ed5 100644 --- a/tmessage/db.py +++ b/tmessage/db.py @@ -21,7 +21,7 @@ def grab_messages(user): """Grab messages from the user""" cursor = MESSAGES_DB.execute_sql( "SELECT sender, message FROM message where sender LIKE \'" + user + '\'') - return [list(cursor.fetchall())] + return list(cursor.fetchall()) @MESSAGES_DB def store_messages(user, raw_msg): """Store a message sent by the indicated user in the database""" From a0e4154c659d2dcf8be336d63481d8b5f0e8e776 Mon Sep 17 00:00:00 2001 From: James Inkster <42331013+Grommers00@users.noreply.github.com> Date: Tue, 15 Oct 2019 09:43:15 -0400 Subject: [PATCH 14/14] Update tmessage/cli.py Co-Authored-By: Haider Ali --- tmessage/cli.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tmessage/cli.py b/tmessage/cli.py index 1bf58db..82d6d9a 100644 --- a/tmessage/cli.py +++ b/tmessage/cli.py @@ -4,7 +4,7 @@ import paho.mqtt.client as mqtt from colorama import init, deinit, Fore, Back, Style import tmessage.auth as auth # auth.py -from db import grab_messages, store_messages # db.py""" +from tmessage.db import grab_messages, store_messages # db.py""" # Initialize colorama