Refactor

diff --git a/phrases.py b/phrases.py
index cd9e2c3d88c4d3b5bbf998f63b0265d76134b05b..3b41b80719e32f460ac84a0b4469d1882643db4c 100755 (executable)
--- 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(
@@ -41,7 +41,10 @@ def parse_args():
                         help="set the location of the phrase database.")
     return parser.parse_args()
 
-def output(args, row, numx, version):
+def output():
+    data = c.fetchall()
+    row = list(data[randint(0, len(data) - 1)])
+
     if not (args.id
             or args.latin
             or args.english
@@ -49,7 +52,7 @@ def output(args, row, numx, version):
             or args.num
             or args.version):
         print(row[1])
-        sys.exit(0)
+        exit(0)
     else:
         if args.version:
             print(version)
@@ -62,26 +65,29 @@ def output(args, row, numx, version):
         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):
-    version = "phrases 1.0.0"
-    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,), version)
+
+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()