X-Git-Url: https://git.armaanb.net/?a=blobdiff_plain;f=phrases.py;h=3b41b80719e32f460ac84a0b4469d1882643db4c;hb=eb4d4c8315588ba0241ffdcd2fa91e6499cd8447;hp=4c6a749477d1e9985a9d30dd8f112ffa8f77153f;hpb=4f30da78d57eaa29c07a202afb3ad4ee2c10ef06;p=phrases.git

diff --git a/phrases.py b/phrases.py
index 4c6a749..3b41b80 100755
--- a/phrases.py
+++ b/phrases.py
@@ -1,12 +1,12 @@
 #!/usr/bin/env python3
-# Display Latin famous phrases in the terminal - python version
+# Display Latin famous phrases in the terminal
 # Armaan Bhojwani 2020
 
 import argparse
 from random import randint
 import sqlite3
-import sys
-import os.path
+from sys import exit
+from os import path
 
 def parse_args():
     parser = argparse.ArgumentParser(
@@ -23,6 +23,9 @@ def parse_args():
     parser.add_argument("-n", "--notes",
                         action='store_true',
                         help="print any notes on phrase.")
+    parser.add_argument("-v", "--version",
+                        action='store_true',
+                        help="print version.")
     parser.add_argument("-m", "--min",
                         default=0,
                         type=int,
@@ -38,15 +41,21 @@ def parse_args():
                         help="set the location of the phrase database.")
     return parser.parse_args()
 
-def output(args, row, numx):
+def output():
+    data = c.fetchall()
+    row = list(data[randint(0, len(data) - 1)])
+
     if not (args.id
             or args.latin
             or args.english
             or args.notes
-            or args.num):
+            or args.num
+            or args.version):
         print(row[1])
-        sys.exit(0)
+        exit(0)
     else:
+        if args.version:
+            print(version)
         if args.id:
             print(row[0])
         if args.latin:
@@ -56,25 +65,29 @@ def output(args, row, numx):
         if args.notes:
             print(row[3])
         if args.num:
-            print(numx)
-        sys.exit(0)
+            print(len(data))
+        exit(0)
 
-def find_file(args):
+def find_file():
     if args.file:
         return args.file
-    if os.path.isfile("phrases.db"):
+    if path.isfile("phrases.db"):
         return "phrases.db"
-    elif os.path.isfile("/usr/local/share/phrases/phrases.db"):
+    elif path.isfile("/usr/local/share/phrases/phrases.db"):
         return "/usr/local/share/phrases/phrases.db"
     else:
-        sys.exit("cannot find the phrase database!")
+        exit("cannot find the phrase database!")
 
-def main(args):
-    c = sqlite3.connect(find_file(args)).cursor()
+def get_rand():
     c.execute("SELECT * FROM phrases WHERE length <= (?) AND length >= (?)",
               (args.max, args.min))
-    data = c.fetchall()
-    output(args, list(data[randint(0, len(data))]), len(data))
+
+def main():
+    get_rand()
+    output()
 
 if __name__ == "__main__":
-    main(parse_args())
+    version = "phrases 1.0.1"
+    args = parse_args()
+    c = sqlite3.connect(find_file()).cursor()
+    main()