Merge pull request #10 from jaysgrant/develop

Merge 0.1.3 into master

Author: mshdg

.gitignore

@@ -68,5 +68,6 @@ fabric.properties
 # Android studio 3.1+ serialized cache file
 .idea/caches/build_file_checksums.serl
 venv
+macvenv
 __pycache__
 

.idea/misc.xml

@@ -1,9 +1,10 @@
 # PYDVD
 
 PyDVD is an application that was developed purely to progress skills in the usage of SQLite3 
-as a database engine used with Python 3.
+as a database engine used with Python 3. Development work has been performed using PyCharm as the selected IDE.
+
+##### Version: 0.1.3
 
-##### Version: 0.1.1
 
 ## Getting Started
 

.idea/pydvd.iml

@@ -1,4 +1,4 @@
 [main]
 appname = PyDVD
-appversion = 0.1.1
+appversion = 0.1.3
 datasource = data/pydvd.db

README.md

@@ -31,15 +31,15 @@ def main_menu():
     print('X. Exit PyDVD.')
 
     while "the answer is invalid":
-        reply = str(input('Select your desired action (1-5, or x to exit): ')).lower().strip()
+        reply = str(input('Select your desired action (1-6, or x to exit): ')).lower().strip()
         if reply[:1] == '1':
             insert_record()
             main()
         if reply[:1] == '2':
             query_all()
             main()
         if reply[:1] == '3':
-            conditional_query()
+            film_query()
             main()
         if reply[:1] == '4':
             record_update()
@@ -100,7 +100,7 @@ def record_update():
                 print(e)
         if question_answer[:1] == 'g':
             field_name = 'film_genre'
-            field_value = str(input('New film genre: '))
+            field_value = get_genre_name()
             try:
                 pydvd_utils.record_update(field_name, field_value, record_id)
                 main()
@@ -120,38 +120,37 @@ def yes_no(question):
 
 
 def insert_record():
-    name = str(input('Name of movie: '))
-    genre = str(input('Genre of movie: '))
-    date = NOW
-    table_name = 'film_inv'
-
     try:
-        pydvd_utils.record_insert(table_name, name, genre, date)
+        name = str(input('Name of movie: '))
+        date = NOW
+        film_table = 'film_inv'
+        genre_name = get_genre_name()
+        pydvd_utils.record_insert(film_table, name, genre_name, date)
     except sqlite3.Error as e:
         print(e)
     except Exception as e:
         print(e)
 
 
-def conditional_query():
+def film_query():
     question = 'Field to search, either name or genre,'
     while "the answer is invalid":
         question_answer = str(input(question + ' (n/g): ')).lower().strip()
         if question_answer[:1] == 'n':
             field_name = 'film_name'
             field_value = str(input('Film name to search for: '))
             try:
-                pydvd_utils.conditional_query(field_name, field_value)
+                pydvd_utils.film_query(field_name, field_value)
                 main()
             except sqlite3.Error as e:
                 print(e)
             except Exception as e:
                 print(e)
         if question_answer[:1] == 'g':
             field_name = 'film_genre'
-            field_value = str(input('Genre to search for: '))
+            field_value = get_genre_name()
             try:
-                pydvd_utils.conditional_query(field_name, field_value)
+                pydvd_utils.film_query(field_name, field_value)
                 main()
             except sqlite3.Error as e:
                 print(e)
@@ -177,6 +176,22 @@ def csv_export():
         print(e)
 
 
+def get_genre_name():
+    genre_table = 'genre_names'
+    print('Select the ID of the genre for your movie form the list below.')
+    all_rows = pydvd_utils.cond_query_all(genre_table)
+    for row in all_rows:
+        print(row)
+    while True:
+        try:
+            genre = int(input('Genre of movie: '))
+            break
+        except:
+            print("Please enter a numerical value.")
+    genre_name = str(pydvd_utils.get_genre_name(genre))
+    return genre_name
+
+
 def main():
     check_setup(subdir=os.path.join(os.path.dirname(__file__), 'data'))
     main_menu()

config/config.ini

@@ -5,7 +5,6 @@
 import sqlite3
 from configparser import ConfigParser
 import csv
-import fileinput
 
 CONFIG_PATH = os.path.join(os.path.dirname(__file__), 'config/config.ini')
 
@@ -32,20 +31,26 @@ def record_insert(table_name, name, genre, date):
     con.close()
 
 
+def cond_query_all(table_name):
+    con = db_connect()
+    cur = con.cursor()
+    cur.execute('''SELECT * from ''' + table_name)
+    all_rows = cur.fetchall()
+    return all_rows
+
+
 def query_all():
     con = db_connect()
     cur = con.cursor()
     print('\n')
-    # todo The line below should return the column names, but currently does not work.
-    # cur.execute('PRAGMA table_info(film_inv)')
     cur.execute('''SELECT film_id, film_name, film_genre, date_added FROM film_inv''')
     all_rows = cur.fetchall()
     for row in all_rows:
         print('{0} : {1}, {2}, {3}'.format(row[0], row[1], row[2], row[3]))
     con.close()
 
 
-def conditional_query(field_name, field_value):
+def film_query(field_name, field_value):
     con = db_connect()
     cur = con.cursor()
     cur.execute('''SELECT film_id, film_name, film_genre, date_added FROM film_inv WHERE '''
@@ -84,11 +89,14 @@ def csv_export():
     all_rows = cur.fetchall()
     with open(filename, 'w') as f:
         writer = csv.writer(f)
-        writer.writerow(['Film ID', 'Film Name', 'Film Genre', 'Date Added'])
+        columns = get_column_names()
+        writer.writerow(columns)
         writer.writerows(all_rows)
         f.close()
     con.close()
     remove_empty_lines(filename)
+    csv_path = os.path.dirname(os.path.abspath(filename))
+    print('File saved to', csv_path)
 
 
 def remove_empty_lines(filename):
@@ -97,8 +105,28 @@ def remove_empty_lines(filename):
         return
     with open(filename) as filehandle:
         lines = filehandle.readlines()
-
     with open(filename, 'w') as filehandle:
         lines = filter(lambda x: x.strip(), lines)
         filehandle.writelines(lines)
 
+
+def get_column_names():
+    column_names = []
+    con = db_connect()
+    cur = con.cursor()
+    cur.execute("PRAGMA table_info(film_inv)")
+    data_extract = cur.fetchall()
+    for column in data_extract:
+        column_names.append(column[1])
+        column_names = [s.replace('_', ' ') for s in column_names]
+        column_names = [s.title() for s in column_names]
+    return column_names
+
+
+def get_genre_name(record_id):
+    con = db_connect()
+    cur = con.cursor()
+    cur.execute('''SELECT genre_name FROM genre_names WHERE genre_id =? ''', (record_id,))
+    genre_name = cur.fetchone()
+    genre_name = ''.join(genre_name)
+    return genre_name

pydvd.py

@@ -25,7 +25,7 @@ def db_connect():
     return con
 
 
-def main():
+def db_setup():
     try:
         subdir = os.path.join(os.path.dirname(__file__), 'data')
         create_dir(subdir)
@@ -36,13 +36,28 @@ def main():
         con = db_connect()
         cur = con.cursor()
         sql_create_film_inv_table = (" CREATE TABLE IF NOT EXISTS film_inv (\n"
-                                 "film_id integer PRIMARY KEY AUTOINCREMENT UNIQUE Not NULL, \n"
-                                 "film_name varchar Not NULL,\n"
-                                 "film_genre varchar,\n"
-                                 "date_added datetime\n"
-                                 "); ")
+                                     "film_id integer PRIMARY KEY AUTOINCREMENT UNIQUE Not NULL, \n"
+                                     "film_name varchar Not NULL,\n"
+                                     "film_genre varchar,\n"
+                                     "date_added datetime\n"
+                                     "); ")
         cur.execute(sql_create_film_inv_table)
         con.commit()
+
+        sql_create_genre_table = (" CREATE TABLE IF NOT EXISTS genre_names (\n"
+                                  "genre_id integer PRIMARY KEY AUTOINCREMENT UNIQUE Not NULL, \n"
+                                  "genre_name varchar Not NULL\n"
+                                  "); ")
+        cur.execute(sql_create_genre_table)
+        con.commit()
+
+        genres = (
+            "Action", "Documentary", "Animated", "Drama", "Biography", "Family", "Comedy", "Fantasy", "Crime", "Horror",
+            "Musical", "Romance", "Romantic Comedy", "Science Fiction", "Thriller", "War", "Western", "Sports",)
+        for genre in genres:
+            cur.execute("INSERT INTO genre_names(genre_name) VALUES(?)", [genre])
+        con.commit()
+
     except sqlite3.Error as e:
         print(e)
     except Exception as e:
@@ -52,6 +67,9 @@ def main():
             con.close()
 
 
+def main():
+    db_setup()
+
+
 if __name__ == "__main__":
     main()
-