Merge pull request #11 from MO-RISE/fix/issue-10-sqlite-queue

Changing to use a SQLite-based queue

README.md

@@ -9,6 +9,59 @@ Use cases:
 `pip install mqtt-cli`
 
 ## Usage
-`mqtt --help`
+```
+$ mqtt --help
+
+usage: mqtt [-h] [--host HOST] [--port PORT] [--transport {tcp,websockets}] [--clientid CLIENTID] [--user USER] [--password PASSWORD] [--protocol {3,4,5}] [--path PATH] [--tls] [--clean-start] [--log-level LOG_LEVEL]
+            {publish,subscribe} ...
+
+MQTT command-line client application
+
+positional arguments:
+  {publish,subscribe}
+
+options:
+  -h, --help            show this help message and exit
+  --host HOST
+  --port PORT
+  --transport {tcp,websockets}
+  --clientid CLIENTID
+  --user USER
+  --password PASSWORD
+  --protocol {3,4,5}
+  --path PATH
+  --tls
+  --clean-start
+  --log-level LOG_LEVEL
+```
+
+```
+$ mqtt publish --help
+
+usage: mqtt publish [-h] [--qos {0,1,2}] [-t TOPIC] [-m MESSAGE] [--line LINE] [--retain] [--queue QUEUE]
+
+options:
+  -h, --help            show this help message and exit
+  --qos {0,1,2}
+  -t TOPIC, --topic TOPIC
+  -m MESSAGE, --message MESSAGE
+  --line LINE
+  --retain
+  --queue QUEUE
+```
+
+```
+$ mqtt subscribe --help
+
+usage: mqtt subscribe [-h] [--qos {0,1,2}] -t TOPIC [--line LINE] [--json]
+
+options:
+  -h, --help            show this help message and exit
+  --qos {0,1,2}
+  -t TOPIC, --topic TOPIC
+  --line LINE
+  --json
+```
+
 
 TBC

mqtt_cli.py

@@ -10,7 +10,7 @@
 from threading import Thread
 
 from parse import compile
-from persistqueue import Queue
+from persistqueue import SQLiteQueue
 from paho.mqtt.client import Client, MQTTv31, MQTTv311, MQTTv5
 
 logger = logging.getLogger("mqtt")
@@ -59,7 +59,7 @@ def publish(mq: Client, parser: argparse.ArgumentParser, args: argparse.Namespac
         parser.error("--queue is only suitable for use together with qos=0")
 
     @mq.connect_callback()
-    def _(client, userdata, flags, reason_code, properties):
+    def _(client, userdata, flags, reason_code, *args):
         if reason_code != 0:
             logger.error(
                 "Connection failed to %s with reason code: %s", client, reason_code
@@ -80,7 +80,7 @@ def _(client, userdata, flags, reason_code, properties):
         parser = compile(pattern)
 
         if args.queue:
-            queue = Queue(args.queue)
+            queue = SQLiteQueue(args.queue, multithreading=True, auto_commit=False)
 
             def _putter():
                 for line in sys.stdin:

setup.py

@@ -13,7 +13,7 @@ def read(fname):
 
 setup(
     name="mqtt-cli",
-    version="0.4.0",
+    version="0.4.1",
     license="Apache License 2.0",
     description="CLI for Paho MQTT",
     long_description=read("README.md"),