Make manconvert smarter

[phrases.git] / phrases.py

diff --git a/phrases.py b/phrases.py
index 46db7829c2abe8dabf482c6387545846978f69c4..b1a3a90dc1f14d353c8cd40a798ca9e7a40a2d64 100755 (executable)
--- a/phrases.py
+++ b/phrases.py
@@ -1,73 +1,59 @@
 #!/usr/bin/env python3
-# Display Latin famous phrases in the terminal - python version
-# Armaan Bhojwani 2020
+# Display Latin famous phrases in the terminal
+# Armaan Bhojwani 2021
 
 import argparse
 from random import randint
 import sqlite3
-import sys
-import os.path
+from sys import exit
+from os import path
 
-def main(args=sys.argv[1:]):
-    # Argument parsing
+
+def parse_args():
     parser = argparse.ArgumentParser(
-        description="Latin famous phrases in the terminal.")
+        description="Latin famous phrases in the terminal")
     parser.add_argument("-i", "--id",
                         action='store_true',
-                        help="print the id of the phrase.")
+                        help="print the id of the phrase")
     parser.add_argument("-l", "--latin",
                         action='store_true',
                         help="print the Latin phrase (default)")
     parser.add_argument("-e", "--english",
                         action='store_true',
-                        help="print the English translation.")
+                        help="print the English translation")
     parser.add_argument("-n", "--notes",
                         action='store_true',
-                        help="print any notes on phrase.")
+                        help="print any notes on phrase")
+    parser.add_argument("-v", "--version",
+                        action='version',
+                        version="phrases 1.0.3")
     parser.add_argument("-m", "--min",
                         default=0,
                         type=int,
-                        help="set the minimum length of the Latin phrase.")
+                        help="set the minimum length of the Latin phrase")
     parser.add_argument("-M", "--max",
                         default=10000000,
                         type=int,
-                        help="set the maximum length of Latin phrase.")
+                        help="set the maximum length of Latin phrase")
     parser.add_argument("-p", "--num",
                         action='store_true',
-                        help="print number of possible phrases.")
+                        help="print number of possible phrases")
     parser.add_argument("-f", "--file",
-                        help="set the location of the phrase database.")
-    parser.add_argument("-o", "--open",
-                        type=int,
-                        help="specify the id of a specific phrase to print.")
-    args = parser.parse_args()
+                        help="set the location of the phrase database")
+    return parser.parse_args()
 
-    # find phrase file
-    if args.file:
-        phrase_file = args.file
-    if os.path.isfile("phrases.db"):
-        phrase_file = "phrases.db"
-    elif os.path.isfile("/usr/local/share/phrases/phrases.db"):
-        phrase_file = "/usr/local/share/phrases/phrases.db"
-    else:
-        sys.exit("cannot find the phrase database!")
-    
-    conn = sqlite3.connect(phrase_file)
-    c = conn.cursor()
-    c.execute("SELECT * FROM phrases WHERE length <= (?) AND length >= (?)",
-              (args.max, args.min))
+
+def output():
     data = c.fetchall()
-    rown = randint(0, len(data))
-    row = list(data[rown]) 
+    row = list(data[randint(0, len(data) - 1)])
 
-    # Output as specified in flags
     if not (args.id
             or args.latin
             or args.english
             or args.notes
             or args.num):
         print(row[1])
-        sys.exit(0)
+        exit(0)
     else:
         if args.id:
             print(row[0])
@@ -79,7 +65,31 @@ def main(args=sys.argv[1:]):
             print(row[3])
         if args.num:
             print(len(data))
-        sys.exit(0)
+        exit(0)
+
+
+def find_file():
+    if args.file:
+        return args.file
+    if path.isfile("phrases.db"):
+        return "phrases.db"
+    elif path.isfile("/usr/local/share/phrases/phrases.db"):
+        return "/usr/local/share/phrases/phrases.db"
+    else:
+        exit("cannot find the phrase database!")
+
+
+def get_rand():
+    c.execute("SELECT * FROM phrases WHERE length <= (?) AND length >= (?)",
+              (args.max, args.min))
+
+
+def main():
+    get_rand()
+    output()
+
 
 if __name__ == "__main__":
+    args = parse_args()
+    c = sqlite3.connect(find_file()).cursor()
     main()