FIX: HTML output error (#1) (#7)

Fix bug

Author: soohyunme

app.py

@@ -4,9 +4,10 @@
 import tensorflow as tf
 import numpy as np
 import rps_battle
+import os
 
 model = tf.keras.models.load_model('MobileNet_Colab.h5')
-class_names = {0: 'paper', 1: 'rock', 2: 'scissor'}
+class_names = {0: 'paper', 1: 'rock', 2: 'scissors'}
 
 app = Flask(__name__)
 
@@ -24,11 +25,10 @@ def index():
         f.save(file_path)
         probability = ml.rps_predict(file_path, model)
         user_str = class_names[np.argmax(probability)]
-        com, com_path, result = rps_battle.checkWin(np.argmax(probability))
+        result, com_path, com = rps_battle.checkWin(np.argmax(probability))
         com_str = class_names[com]
-        move = 'Battle'
         return render_template("index.html", img=file_path, ret_=user_str, com=com_str, com_path=com_path,
-                               result=result, move=move)
+                               result=result)
 
 
 if __name__ == "__main__":

rps_battle.py

@@ -2,26 +2,28 @@
 import os
 
 sample_path = 'static/cpu'
-sample_list = os.listdir(sample_path)
+sample_file_list = os.listdir(sample_path)
+sample_label_list = list(map(lambda x: x.split('.')[0], sample_file_list))
+class_names = {'paper': 0, 'rock': 1, 'scissors': 2}
 
-class_names = {0: 'paper', 1: 'rock', 2: 'scissor'}
+class_map = list(map(lambda x: class_names[x], sample_label_list))
 result = {0: 'WIN', 1: 'LOSE', 2: 'DRAW'}
 
 
 def checkWin(user):
-    cpu = random.randint(0, 2)
-    cpu_path = sample_path + '/' + sample_list[cpu]
-
-    if user == cpu:
+    random_idx = random.randint(0, 2)
+    com_path = sample_path + '/' + sample_file_list[random_idx]
+    com = class_map[random_idx]
+    if user == com:
         state = 2
-    elif user == 2 and cpu == 1:
+    elif user == 2 and com == 1:
         state = 1
-    elif user == 1 and cpu == 0:
+    elif user == 1 and com == 0:
         state = 1
-    elif user == 0 and cpu == 2:
+    elif user == 0 and com == 2:
         state = 1
     else:
         state = 0
 
-    return cpu, cpu_path, result[state]
+    return result[state], com_path, com