From 60888fe3238aac4df21535f137dd520173a7dcae Mon Sep 17 00:00:00 2001
From: Graham Helton <no@email.com>
Date: Sat, 5 Mar 2022 15:28:49 -0500
Subject: [PATCH] Added new features

Now only lists files with .csv extenions and asks for book on startup
---
 README.md |  6 +++---
 index.py  | 40 +++++++++++++++++++++-------------------
 2 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/README.md b/README.md
index 6f20156..b8f2cb8 100644
--- a/README.md
+++ b/README.md
@@ -19,10 +19,10 @@ Currently the indexer has the following features
 - Add edit feature (edit previous index entries)
 - Add CSV sorting (Sort by book then alphabetical)
 - Add handling for repeat entries
-- Only show CSVs when asking which index you want to work on
+- ~~Only show CSVs when asking which index you want to work on~~
 - ~~Add "Create new" option to csv selection option~~
 ![](createCsv.gif)
 - Create a .sansindex file in home directory that stores indexes
 - Add delete option for index files
-- Add "ask for book" prompt on startup
-- Allow for input with no definition (term, pagenumber)
+- ~~Add "ask for book" prompt on startup~~
+- ~~Allow for input with no definition (term, pagenumber)~~
diff --git a/index.py b/index.py
index 97de896..dd9f5cd 100755
--- a/index.py
+++ b/index.py
@@ -8,7 +8,6 @@ from colorama import Fore, Style
 headers = ['Title', 'Description','Page','book']
 index = []
 row = []
-book = "1"
 dic = {}
 # Define formatting
 reset = Style.RESET_ALL
@@ -24,8 +23,8 @@ awaitingInput = Fore.BLUE + "-----" + Fore.GREEN + "> " + reset
 tickInfo = Fore.BLUE + "[" + yellow + "!" + Fore.BLUE + "]" + reset
 
 print(tick, "Welcome to Sans Terminal Indexer")
-print(tick, "Setting default book number to 1")
-print(tick, "Enter \"new book\" to change to the next book")
+print(tick, "Enter" , green, "\"new book\"" , reset, "to change to the next book")
+book = input("Which book are you currently working on?\n")
 
 # Handle control+c
 def handler(signum, frame):
@@ -36,16 +35,19 @@ signal.signal(signal.SIGINT, handler)
 # Kick off program, check if any .csv files are in directory, if not, prompt user to create one
 def init():
     count = 0
-    csvCheck = os.listdir('.')
+    csvCheck = os.listdir()
     for i in csvCheck:
-        if(i.endswith(".csv")):
+        if any(".csv" in c for c in csvCheck):
             print(tickInfo,"CSV Exists in current directory, which would you like to use? ")
 
-            for i in os.listdir():
-                count+=1
-                dic[count]=i
+            for x in os.listdir():
+                if x.endswith((".csv")):
+                    count+=1
+                    dic[count]=x
             print(sep)
-            # For each value, assign a key from 1-n. This will allow the user to select a number that corresponds to the csv file
+
+            # For each value, assign a key from 1-n. This will allow the user to select a number
+            # that corresponds to the csv file.
             for key, value in dic.items():
                 print(green, key, red,'-->', cyan , value, reset)
             print(sep)
@@ -57,23 +59,23 @@ def init():
                 print(tick, "You chose: ", csvName)
                 return csvName 
             # If selection is to create a new CSV, carry on with creating it
-            else:
-                csvName = input(tick + yellow + "What do you want to name your CSV file?\n" + reset)
-                if not csvName.endswith(".csv"):
-                    csvName += ".csv"
-                with open(csvName, 'a') as f:
-                    write = csv.writer(f)
-                    write.writerow(headers)
+        else:
+            csvName = input(tick + green + "Creating a new index, what do you want to name your CSV file?\n" + reset)
+            if not csvName.endswith(".csv"):
+                csvName += ".csv"
+            with open(csvName, 'a') as f:
+                write = csv.writer(f)
+                write.writerow(headers)
 
-                print(csvName)
-                return csvName
+            print(csvName)
+            return csvName
 
 def writeCsv():
     with open(csvName, 'a') as f:
         write = csv.writer(f)
         write.writerows(index)
 def readIndex(csvName):
-    print(tick, "Displaying abbreviated entries")
+    print(tick, "Displaying abbreviated entries for",cyan, csvName,reset)
     df = pd.read_csv(csvName)
     #bottom = df.tail()
     print(df)