Merge pull request #33 from hriks/revert-32-file

Revert "modified session and render_template"

Author: hriks

app.py

@@ -1,6 +1,5 @@
-from flask import Flask, render_template as render, request, redirect,\
-    url_for, session as s
-from flask import flash as hriks
+from flask import Flask, render_template, request, redirect, url_for,\
+    session, flash
 from logging import Formatter, FileHandler
 from forms import *
 import logging
@@ -26,21 +25,21 @@ def shutdown_server():
 @app.route('/shutdown', methods=['POST'])
 def shutdown():
     write()
-    s.clear()
+    session.clear()
     shutdown_server()
     print len(cache_records())
     try:
         if len(cache_records()) >= 1:
-            hriks(
+            flash(
                 'Notification : Records Saved !'
             )
     except Exception:
-        hriks(
+        flash(
             'Notification : New file created with name "%s" ' % (
                 sys.argv[1]
             )
         )
-    return render('layouts/shutdown.html')
+    return render_template('layouts/shutdown.html')
 
 
 # Controllers.
@@ -50,7 +49,7 @@ def write():
         for i in records:
             print i
     except Exception:
-        hriks(
+        flash(
             'New File created with name %s' % (
                 sys.argv[1]
             )
@@ -59,19 +58,14 @@ def write():
         fieldnames = [
             'ids', 'student_name', 'academics', 'sports', 'social'
         ]
-        writer = csv.DictWriter(
-            csvfile, fieldnames=fieldnames
-        )
+        writer = csv.DictWriter(csvfile, fieldnames=fieldnames)
 
         writer.writeheader()
         try:
             for record in records:
                 writer.writerow(record)
         except Exception:
-            hriks('New File created with name %s' % (
-                sys.argv[1]
-            )
-            )
+            flash('New File created with name %s' % (sys.argv[1]))
 
 
 def read():
@@ -83,22 +77,16 @@ def read():
 
 
 def read_cache():
-    data = s['data']
+    data = session['data']
     return data
 
 
 def write_cache(student_name, academics, sports, social):
-    import pdb; pdb.set_trace()
     data = cache_records()
-    if len(data) == 20:
-        if 'count' in s:
-            count = s['count']
-            print count
-            data = delete_cache(count)
-        else:
-            data = cache_records()
-            while len(data) == 20:
-                data.pop()
+    if len(data) > 20:
+        count = session['count']
+        print count
+        data = delete_cache(count)
     new_dict = {}
     new_dict['ids'] = ids_get()
     new_dict['student_name'] = student_name
@@ -122,12 +110,13 @@ def update_cache(ids, student_name, academics, sports, social):
 
 def delete_cache(ids):
     data = cache_records()
-    for delete in data:
-        if int(delete['ids']) == int(ids):
-            data.pop(data.index(delete))
-    for ids in data:
-        ids['ids'] = data.index(ids) + 1
-    return data
+    if ids:
+        for delete in data:
+            if int(delete['ids']) == int(ids):
+                data.pop(data.index(delete))
+        for ids in data:
+            ids['ids'] = data.index(ids) + 1
+        return data
 
 
 def ids_get():
@@ -146,80 +135,78 @@ def cache_records():
 
 @app.route('/', methods=['GET', 'POST'])
 def home():
-    return render('pages/placeholder.home.html')
+    return render_template('pages/placeholder.home.html')
 
 
 @app.route('/delete', methods=['GET', 'POST'])
 def delete():
     if request.method == 'POST':
-        s['ids'] = request.form['submit']
-        s['delete'] = request.form['delete']
-        ids = s['ids']
+        session['ids'] = request.form['submit']
+        session['delete'] = request.form['delete']
+        ids = session['ids']
         data = delete_cache(ids)
-        s['data'] = data
-        hriks(
+        session['data'] = data
+        flash(
             'Notification : Successfully deleted records with ID %s' % (ids)
         )
-        s['ids'] = None
-        s['student_name'] = None
+        session['ids'] = None
+        session['student_name'] = None
         return redirect(url_for('home'))
 
 
 @app.route('/edit', methods=['GET', 'POST'])
 def edit():
     form = Update_student_info(request.form)
-    s['ids'] = request.form['submit']
-    ids = s['ids']
-    s['student_name'] = request.form['name']
-    name = s['student_name']
+    session['ids'] = request.form['submit']
+    ids = session['ids']
+    session['student_name'] = request.form['name']
+    name = session['student_name']
     if request.method == 'POST':
         return redirect(url_for('update'))
-    return render(
+    return render_template(
         'forms/update.html', form=form, ids=ids, name=name
     )
 
 
 @app.route('/update', methods=['GET', 'POST'])
 def update():
     form = Update_student_info(request.form)
-    ids = s['ids']
-    name = s['student_name']
+    ids = session['ids']
+    name = session['student_name']
     if request.method == 'POST':
         academics = form.academics.data
         sports = form.sports.data
         social = form.social.data
         if academics is None or int(academics) > 100:
-            hriks(
+            flash(
                 'Notification : %s is not a valid score.\
                  Please enter valid score for Academics' % (
                     academics))
             return redirect(url_for('update'))
         elif sports is None or int(sports) > 100:
-            hriks(
+            flash(
                 'Notification : %s is not a valid score.\
                  Please enter valid score for Sports' % (
                     sports))
             return redirect(url_for('update'))
         elif social is None or int(social) > 100:
-            hriks(
+            flash(
                 'Notification : %s is not a valid score.\
                  Please enter valid score for Social' % (
                     social))
             return redirect(url_for('update'))
         else:
             data = update_cache(
-                s['ids'], s['student_name'],
+                session['ids'], session['student_name'],
                 academics, sports, social
             )
-            s['data'] = data
-            hriks(
+            session['data'] = data
+            flash(
                 'Notification : Successfully updated record for %s \
                 with ID %s' % (name, ids)
             )
-            return redirect(
-                url_for('home')
-            )
-    return render(
+            return redirect(url_for('home'))
+    return render_template(
         'forms/update.html', form=form, ids=ids, name=name
     )
 
@@ -229,7 +216,7 @@ def addinfo():
     try:
         ids = ids_get()
     except Exception:
-        hriks(
+        flash(
             'Notification : File doesnot exits. Shutdown to create a \
             file with name %s' % (sys.argv[1])
         )
@@ -241,27 +228,27 @@ def addinfo():
         sports = form.sports.data
         social = form.social.data
         if student_name is None:
-            hriks(
+            flash(
                 'Notification : %s is not vaild. Please Enter valid \
                 name' % student_name
             )
             return redirect(url_for('addinfo'))
         elif academics is None or int(academics) > 100:
-            hriks(
+            flash(
                 'Notification : %s is not a valid score.\
                  Please enter valid score for Academics' % (
                     academics)
             )
             return redirect(url_for('addinfo'))
         elif sports is None or int(sports) > 100:
-            hriks(
+            flash(
                 'Notification : %s is not a valid score.\
                  Please enter valid score for Sports' % (
                     sports)
             )
             return redirect(url_for('addinfo'))
         elif social is None or int(social) > 100:
-            hriks(
+            flash(
                 'Notification : %s is not a valid score.\
                  Please enter valid score for Social' % (
                     social)
@@ -271,28 +258,28 @@ def addinfo():
             data = write_cache(
                 student_name, academics, sports, social
             )
-            s['data'] = data
-            hriks(
+            session['data'] = data
+            flash(
                 'Notification : %s successfully added to records \
                 with ID %s' % (
                     student_name, ids
                 )
             )
             return redirect(url_for('home'))
-    return render('forms/register.html', form=form, ids=ids)
+    return render_template('forms/register.html', form=form, ids=ids)
 
 
 @app.route('/search', methods=['GET', 'POST'])
 def search():
     count = {1:0,2:0,3:0,4:0,5:0,6:0,7:0,8:0,9:0,10:0,11:0,12:0,13:0,14:0,15:0,16:0,17:0,18:0,19:0,20:0} # noqa
     inverse = [(value, key) for key, value in count.items()]
-    s['count'] = max(inverse)[0]
+    session['count'] = max(inverse)[0]
     if request.method == 'POST':
         search = request.form['search']
         try:
             records = cache_records()
         except Exception:
-            hriks(
+            flash(
                 'Notification : No such file present.\
                  Please provide a valid file or shutdown to create file'
             )
@@ -305,24 +292,24 @@ def search():
                 if i['ids'] == int(search):
                     count[int(search)] = count[int(search)] + 1
         except Exception:
-            hriks('Notification : Invalid ID provided, Please provide ID')
+            flash('Notification : Invalid ID provided, Please provide ID')
             return redirect(url_for('home'))
-        return render(
+        return render_template(
             'pages/placeholder.search.html', match=match, search=search
         )
-    return render('pages/placeholder.search.html', search=search)
+    return render_template('pages/placeholder.search.html', search=search)
 
 
 # Error handlers.
 
 @app.errorhandler(500)
 def internal_error(error):
-    return render('errors/500.html'), 500
+    return render_template('errors/500.html'), 500
 
 
 @app.errorhandler(404)
 def not_found_error(error):
-    return render('errors/404.html'), 404
+    return render_template('errors/404.html'), 404
 
 
 if not app.debug: