From 302d32c9cda3200fbb3d07fc60f16ad78c6bdfec Mon Sep 17 00:00:00 2001
From: bigJIU <1572204178@qq.com>
Date: Tue, 8 Nov 2022 17:22:21 +0800
Subject: [PATCH] Updata .rep output

---
 .gitignore                      |   5 +++++
 .idea/workspace.xml             |  17 ++++++-----------
 __pycache__/main.cpython-39.pyc | Bin 3078 -> 3202 bytes
 data/annotation.csv             |   2 ++
 data/questionare.csv            |   3 +++
 main.py                         |  29 ++++++++++++++---------------
 6 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/.gitignore b/.gitignore
index c4bd352..bb965aa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,7 @@
+#self design
+/reps
+/data
+
 # Compiled class file
 *.class
 
@@ -22,4 +26,5 @@
 hs_err_pid*
 replay_pid*
 *.xml
+*.pyc
 .idea/workspace.xml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 7088592..1ed72fb 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,17 +2,11 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="c32bfd4e-6189-47f3-9d6c-c1825d3d7e5f" name="Changes" comment="">
+      <change beforePath="$PROJECT_DIR$/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/data/annotation.csv" beforeDir="false" afterPath="$PROJECT_DIR$/data/annotation.csv" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/data/questionare.csv" beforeDir="false" afterPath="$PROJECT_DIR$/data/questionare.csv" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/main.py" beforeDir="false" afterPath="$PROJECT_DIR$/main.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/reps/127.0.0.1lvl3066.txt" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/reps/127.0.0.1lvl6866.txt" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/reps/127.0.0.1lvl6966.txt" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/reps/127.0.0.1lvl7966.txt" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/reps/127.0.0.1lvl8366.txt" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/templates/GameAnnotation.html" beforeDir="false" afterPath="$PROJECT_DIR$/templates/GameAnnotation.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/templates/GameQuestion.html" beforeDir="false" afterPath="$PROJECT_DIR$/templates/GameQuestion.html" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -122,7 +116,8 @@
       <workItem from="1666752468427" duration="1563000" />
       <workItem from="1667205217155" duration="3357000" />
       <workItem from="1667357110859" duration="5735000" />
-      <workItem from="1667456828218" duration="23547000" />
+      <workItem from="1667456828218" duration="24361000" />
+      <workItem from="1667898094682" duration="1203000" />
     </task>
     <servers />
   </component>
@@ -145,18 +140,18 @@
       <breakpoints>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
           <url>file://$PROJECT_DIR$/main.py</url>
-          <line>73</line>
+          <line>76</line>
           <option name="timeStamp" value="1" />
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
           <url>file://$PROJECT_DIR$/main.py</url>
-          <line>82</line>
+          <line>81</line>
           <option name="timeStamp" value="3" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
   </component>
   <component name="com.intellij.coverage.CoverageDataManagerImpl">
-    <SUITE FILE_PATH="coverage/MarioWeb$Flask__main_py_.coverage" NAME="Flask (main.py) Coverage Results" MODIFIED="1667490705213" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="" />
+    <SUITE FILE_PATH="coverage/MarioWeb$Flask__main_py_.coverage" NAME="Flask (main.py) Coverage Results" MODIFIED="1667898938796" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="" />
   </component>
 </project>
\ No newline at end of file
diff --git a/__pycache__/main.cpython-39.pyc b/__pycache__/main.cpython-39.pyc
index 481a2701488a91c10673c06bf008e6e0ac9b7c69..05a277607817673ee4224f0bd22de8b291dcb758 100644
GIT binary patch
delta 1134
zcmZ9LUvC>l5Wsi#{`h=8JFb(|b{vPc{Ao>9C!s0=6!K7_2oOpuRcggb2)Q>`W9RIc
zy={x4i;QsKt%B+vdBA?<H9~@~z(+Xoz&qlJFTm`k>O*%mvwOdpo4uKx`=Rk&v)n6}
zeMaMhjbZrD^KyIoE-;1+A!g!y1p(%n3r;JKt&uHk&^9Y}My_y21yLAz!W$JuapVgh
zSmZ_}w9$FSMG)CDCd%lF3Kql?dZLO&aUlxkHS`yNB@9m448(F23~N}%X$6=19IMYb
zUcj0$tr+KJa$dnzLskvBNTiMpLoOQ9B(jDrL+XaC6KUgyAq{iHYgp-niGK+%8{Rbh
z$~oVngI~utjA0Gm#J5hFXi+v-5BX0Z-@$89@Z~y%ZZ8<+84TNJccBlkeD*sZ12nR$
z_H*cFf7nmqX14A83h$l$<x~N7vwz+9?{F%#OY#v(vQJ8}As`%bd0TPhGXSP6V)hKs
zYO=Y5_5w~oxvG$|)Udi<9c170Cd+;+Y+muCLxE&nt2U|Jjt7a74ZU@eNjy+l*<0J|
za2XI1zKoK`vHDE=Ea`WQs%r02KT@CGyK}JDQ@u|JB&IRA51zGRt%KY=`_{V!)BD<_
zUtrn<t`Q$DS#q0LXlcufQJ~c$G5H?TMll77r+h}ao><Bn+H*%)b9cc~w%{lBIZ18G
z5$c*al(|Ed;Xl58;->E0!>Ogqg3c*Rtv%|T1x;WNs2^>bGYi<by3LY!i|$9y&q<Ko
zV;%S4*zU?`lJlnz|I;5BQm4Nh`f79`6D@0`QualSO3&uh{V6Q?eTwrnN0?G5p2O_}
z(k>P8aj0^8(hCpinRmBx2w$yhai<@Rqi-g1cR+FFO;X3Lr1vD+AH-32Cq4>$akATe
z>D4L9>*SMLquwO924j`;qeP#fzRK-k_Q-E+bPDoA?czP65aZq`$_wGqSVdzccsR*^
z@vk*+kR3_RZxJd`qZxp_k^SvADjO6jIU36y@{qSOD1F@Q(w2VLC%srVz+E~`wzPFC
wdsymJH}zIuu+)L&e)e<ey1PqT53)Z?t;?$(`1T8NX!R@L2P9?B^G%QZ4|k9AtN;K2

delta 998
zcmX|=-*3}M5XX1cyS8g5B@JoQv?;XQ6&k2o#1DxA4<~_89}q&ilRzs@Q7&UbQak0G
z?G@cQszeKKl|cRn5{V~X`w!gx11H_9#T)zqyzl}qH(si)G@jYdjAwVgvR~F-&lX$7
zqQ_{x``B)OeOp}ETLZ?BA%skQ_n?6GJmit3EXbJ^ibyIM*~*R_<wUM>qX{(uERcbR
z0_7oBeqil0RX|%6(NUA=s#7?jN`XI`LT?P{W8r}9gDMApZwiYziKjXoONV<Lr?6~N
zr%mx`Dz4zPAr(Vrh*WXbkZD6|MCNebkQqbjL>BOjAysq4S)A+u9l&uBmkggZ{M-ru
z0e?JTD|DwCF5~$Frsimx3tRjR#20ZT@SF40x;|z!r{Aj|J%$cI`RH%n2dJj&;w`ME
z|A<|<oNmbXaQ*0$ECJj~zt|glf&_NR?vM>$(?hc!AZ+pYrRK=@0hs2*tm8<0kIn8l
zMytj~62%yXkY`8snB8T+&OYHoKD0DXj=LnL$M2ik(Qd*L$lohfnVz6fB74Paq<T7Z
z*3-}KbR`pEcc3#lcpi4ib#)L8(tn+~GjW4%*${DoobuveuoLS0c`0-==%wGB`q_K=
zFco?*?tu#)OhN_9c_bDgzH+qcUWdI$c~R-4$fmSSrHfX4jbPi#Gsnv&FUgEZn-t_C
zjYyV}HD(DL=VKa@STqY%b0V}z1ah=c99lz}$dOF=nB=601cGJyTz_T_`QT5nreDzQ
zcQdi0pWbLd<_7)tHg@}+hLis1EiYxV9c~YTh8=Iv*_r#a8wUMW6l6|&yRU=3PAmS(
z%{9seWCQcl(70t9+k-ggncHket!}^B{Dt~U41U|`G!`<^8*KOE8|h#EW^J9yR3Z4I
z72a*>*29*57S9ukucjaTM(Ii(=DL`6@tt(KaOtPpw0FVf1zzU`u(<${o0aQa0<S{e
T#N;KJN7pHl6<yaOsa^OVlq%Q|

diff --git a/data/annotation.csv b/data/annotation.csv
index 7e75df0..6e4caf4 100644
--- a/data/annotation.csv
+++ b/data/annotation.csv
@@ -8,3 +8,5 @@
 127.0.0.1,14,26,B

 10.16.33.201,85,88,E

 10.16.33.201,28,73,A

+10.27.169.251,160,10,N

+10.27.169.251,143,173,N

diff --git a/data/questionare.csv b/data/questionare.csv
index 07905e1..3dd4daf 100644
--- a/data/questionare.csv
+++ b/data/questionare.csv
@@ -29,3 +29,6 @@ IP,Style,Frequency,Age,Gender
 10.16.33.201,B,C,B,A,

 10.16.33.201,A,A,A,,

 10.16.33.201,A,A,A,,

+10.27.169.251,D,E,G,C,

+127.0.0.1,,A,,,

+127.0.0.1,A,A,A,B,

diff --git a/main.py b/main.py
index 09ccdc7..8fbda2a 100644
--- a/main.py
+++ b/main.py
@@ -1,5 +1,6 @@
 import json
 import os
+import struct
 
 from IDManager import idManager
 
@@ -41,10 +42,12 @@ def gamepreplay():
         print(result.get("gamestyle"))
         return redirect(url_for('gameplay', id=ip))
 
+
 @app.route('/again')
 def gamepreplayAgain():
     return redirect(url_for('gameplay', id=request.remote_addr))
 
+
 @app.route('/')
 def gamequestion():
     return render_template('GameQuestion.html')
@@ -61,8 +64,8 @@ def gameanno(id):
     print("anno " + id)
 
     gamelevels = idm.getRecent(id)
-    level1 = "lvl"+str(gamelevels[0])
-    level2 = "lvl"+str(gamelevels[1])
+    level1 = "lvl" + str(gamelevels[0])
+    level2 = "lvl" + str(gamelevels[1])
     return render_template('GameAnnotation.html', level1=level1, level2=level2)
 
 
@@ -71,16 +74,12 @@ def gameanno(id):
 def getJSONData(id):
     if request.method == 'POST':
         print("POST Game")
-        print(request.form)
-        print(list(request.form))
+        # print(request.form)
+        # print(list(request.form))
         resultList = list(request.form)[0].split(",")
-        for i,j in request.form.items():
-            print(i)
-            print(j)
 
-
-        # FIXME: NOT SAVING!
-        saveFile(replayDataPath, id+resultList[0] , str(resultList[1:]))
+        # FIXME: SAVING IN TXT
+        saveFile(replayDataPath, id + resultList[0], resultList[1:])
     return "get!"
 
 
@@ -92,18 +91,18 @@ def getRadioData():
         print(result)
         ip = request.remote_addr
         ipRecent = idm.getRecent(ip)
-        idm.write_csv(annotationPath, [ip, ipRecent[0],ipRecent[1] , result["fun"]])
+        idm.write_csv(annotationPath, [ip, ipRecent[0], ipRecent[1], result["fun"]])
 
         # saveFile(evalDataPath,"gameanno",request.json[0]+request.json[1]+request.json[2])
     return render_template("GameOver.html")
 
 
 def saveFile(path, filename, content):
+    cp = list(map(int, content))
     file_dir = os.path.join(os.getcwd(), path)
-    file_path = os.path.join(file_dir, filename + ".txt")
-    f = open(file_path, "w", encoding="utf8")
-    f.write(content)
-    f.close()
+    file_path = os.path.join(file_dir, filename + ".rep")
+    with open(file_path, 'wb') as f:
+        f.write(b''.join(struct.pack('B', c) for c in cp))
 
 
 if __name__ == '__main__':