X-Git-Url: https://git.armaanb.net/?p=phrases.git;a=blobdiff_plain;f=phrases.py;h=28ae138386be41e4e3258239f4f76d505f089f59;hp=46db7829c2abe8dabf482c6387545846978f69c4;hb=58ad575e75427a13fdca64a17ced4ae2f3f986ad;hpb=ed33e3e49a82f9d9fce64e6c70863bfb8a649670

diff --git a/phrases.py b/phrases.py
index 46db782..28ae138 100755
--- a/phrases.py
+++ b/phrases.py
@@ -8,8 +8,7 @@ import sqlite3
 import sys
 import os.path
 
-def main(args=sys.argv[1:]):
-    # Argument parsing
+def parse_args():
     parser = argparse.ArgumentParser(
         description="Latin famous phrases in the terminal.")
     parser.add_argument("-i", "--id",
@@ -40,27 +39,9 @@ def main(args=sys.argv[1:]):
     parser.add_argument("-o", "--open",
                         type=int,
                         help="specify the id of a specific phrase to print.")
-    args = parser.parse_args()
+    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))
-    data = c.fetchall()
-    rown = randint(0, len(data))
-    row = list(data[rown]) 
-
-    # Output as specified in flags
+def output(args, row, numx):
     if not (args.id
             or args.latin
             or args.english
@@ -78,8 +59,25 @@ def main(args=sys.argv[1:]):
         if args.notes:
             print(row[3])
         if args.num:
-            print(len(data))
+            print(numx)
         sys.exit(0)
 
+def find_file(args):
+    if args.file:
+        return args.file
+    if os.path.isfile("phrases.db"):
+        return "phrases.db"
+    elif os.path.isfile("/usr/local/share/phrases/phrases.db"):
+        return "/usr/local/share/phrases/phrases.db"
+    else:
+        sys.exit("cannot find the phrase database!")
+
+def main(args):
+    c = sqlite3.connect(find_file(args)).cursor()
+    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))
+
 if __name__ == "__main__":
-    main()
+    main(parse_args())