fixed james' garbage

jameshly · jameshly · commit 7f7c78703869 · 2018-07-27T14:30:49.000-07:00
diff --git a/raffle.py b/raffle.py
@@ -19,67 +19,65 @@ def gen_list(argcsv):
     Args:
         argcsv - csv file from parse_args() to read and pull the list of possible winners from
     Returns:
-        winlist - the list of possible winners. It takes in the ticketholder's
+        inputlist - the list of possible winners. It takes in the ticketholder's
         username and ticketnumber and appends them before inserting them into
         winlist to be passed to html_writer()
 
     """
-    winlist = []
+    banned_tix = ['CORE', 'Vendor Ticket', 'SPU Dorm Room - Friday and Saturday', 'SPU Dorm Room - Saturday ONLY',
+                  'Soldering Workshop: Fourier (BYOS) 10am-11:30am', 'Soldering Workshop: Fourier 10am-11:30am',
+                  'Soldering Workshop: 4x4 Handwire 1pm-3pm']
+
+    inputlist = []
     with open(argcsv) as csvfile:
         reader = csv.DictReader(csvfile)
-        print(reader)
         for row in reader:
             username = row['What username do you go by online?']
             if row['What username do you go by online?'] == '-':
-                username = row['Ticket First Name'] + " " + row['Ticket Last Name'][0:1] + "."
+                username = "{} {}.".format(row['Ticket First Name'], row['Ticket Last Name'][0:1])
             num = row['Number']
-            winlist[num] = username
-            winlist.append({'id': row['Number', 'name': row['Ticket First Name'] + " " + row['Ticket Last Name'][0:1], 'uname': row['What username do you go by online?']})
-    return winlist
-def html_writer(winlist, total_winners):
+            if row['Ticket'] not in banned_tix:
+                inputlist.append({'number':num,'username':username})
+    return inputlist
+def html_writer(inputlist, total_winners, csvout, htmlout):
     """
     This function writes the html file to display the winners.
 
-    Args:
-        winlist - list of winners generated by gen_list()
+    Args
+    inputlist - full list of entrants
         total_winners - total number of specified winners taken from command line args
 
     Returns:
         None. Writes an html file.
 
     """
-    winreader = open('winners.csv', 'r')
-    for x in winlist:
-        for y in winreader:
-            if x in y:
-                del x[y]
-    winreader.close()
-    slide = open('winners.html', 'w')
-    slide.write("""
-    <!doctype html>
-    <html lang=en>
-    <head>
-    <meta charset=utf-8>
-    <title>SMKmeetup Giveaway Winners!</title>
-    <link rel="stylesheet" href="raffle-style.css">
-    </head>
-    <body>
-    <h2>SMKmeetup Giveaway Winners</h2>
-    <ul class="multi-12">
-    """)
-    for i in random.sample(list(winlist), total_winners):
-        winwriter = open('winners.csv', 'a')
-        winner = i + " " + winlist[i] + " " 
-        slide.write("<li>"+winner+"</li>\n")
-        winwriter.write(i + "," + winlist[i] + "\n")
-        print(winner)
-        winwriter.close()
-    slide.write("""
-    </ul>
-    </body>
-    </html>
-    """)
-    slide.close()
+    with open(htmlout, 'w') as slide:
+        slide.write(
+            '<!doctype html>\n'
+            '<html lang=en>\n'
+            '<head>\n'
+            '<meta charset=utf-8>\n'
+            '<title>SMKmeetup Giveaway Winners!</title>\n'
+            '<link rel="stylesheet" href="raffle-style.css">\n'
+            '</head>\n'
+            '<body>\n'
+            '<h2>SMKmeetunp Giveaway Winners</h2>\n'
+            '<ul class="multi-12">\n'
+        )
+        for winner in random.sample(inputlist, total_winners):
+            slide.write("<li>{} {}</li>\n".format(winner['number'], winner['username']))
+            inputlist.pop(inputlist.index(winner))
+        slide.write(
+            '</ul>\n'
+            '</body>\n'
+            '</html>\n'
+        )
+        with open(csvout, 'w') as csvfile:
+            writer = csv.DictWriter(csvfile, fieldnames=['number','username'])
+            writer.writerow({'number': 'Number', 'username': 'What username do you go by online?'})
+            for loser in inputlist:
+                writer.writerow({'number': loser['number'], 'username': loser['username']})
+
 def parse_args():
     """
     This function parses the arguments from the command line.
@@ -92,15 +90,17 @@ def parse_args():
 
     """
     parser = argparse.ArgumentParser()
-    parser.add_argument("csv", help="the location of the csv input")
-    parser.add_argument("total_winners", type=int, help="total number of selected winners")
-    parser.add_argument("rerun", type=bool, help="boolean value to determine whether or not the script will be rerun")
+    parser.add_argument('-i', "--csvin", help="the location of the csv input")
+    parser.add_argument('-w', "--total_winners", type=int, help="total number of selected winners")
+    parser.add_argument('-o', "--csvout",  help="csv output file")
+    parser.add_argument('-p', "--htmlout", help="html output file")
     return parser.parse_args()
+
 def main():
     """
     This function calls all the necessary functions needed for the program to run.
     """
     args = parse_args()
-    html_writer(gen_list(args.csv), args.total_winners)
+    html_writer(gen_list(args.csvin), args.total_winners, args.csvout, args.htmlout)
 if __name__ == "__main__":
-    main()
+    main()
