From bcffb44393def59bb77cd12384e303e2c83b6cdc Mon Sep 17 00:00:00 2001
From: Nikolaj <nikolajgade@live.dk>
Date: Fri, 14 Jan 2022 10:40:45 +0100
Subject: [PATCH] nesau

---
 font_game/__init__.py                         |   2 +-
 .../__pycache__/__init__.cpython-310.pyc      | Bin 433 -> 450 bytes
 font_game/__pycache__/game.cpython-310.pyc    | Bin 2745 -> 2597 bytes
 font_game/__pycache__/images.cpython-310.pyc  | Bin 1354 -> 1300 bytes
 font_game/__pycache__/util.cpython-310.pyc    | Bin 2184 -> 2434 bytes
 font_game/__pycache__/web.cpython-310.pyc     | Bin 1909 -> 2033 bytes
 font_game/game.py                             |   7 +------
 font_game/images.py                           |   5 ++---
 font_game/util.py                             |   9 ++++++++-
 font_game/web.py                              |   4 ++++
 10 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/font_game/__init__.py b/font_game/__init__.py
index 5a1d783..107caa8 100644
--- a/font_game/__init__.py
+++ b/font_game/__init__.py
@@ -1,5 +1,5 @@
 from .util import (base64, FONT_SIZE, FONT_COLOR, IMAGE_BACKGROUND, IMAGE_SIZE,
-                   MARGINS, FONTS, read_file, write_file)
+                   MARGINS, FONTS, read_file, write_file, gen_id)
 from . import images
 from . import web
 from . import game
diff --git a/font_game/__pycache__/__init__.cpython-310.pyc b/font_game/__pycache__/__init__.cpython-310.pyc
index 1475669c71872ced93730a914519fc1e4f24a765..bc03a1a7bedf5695258f560d9e8b559e42a4ec8b 100644
GIT binary patch
delta 148
zcmdnUe2AGhpO=@50SLA`K1@6_kyn;6VxqRLc`jEJ7b8OoLkd$4cP>v9517piWb;Px
zg4rxUHeVDUkj)y*pvm@<5om-a*Tn7=j$3T$sd@34DHGpIGxAU7W;B*B;s#3IVkqJP
gQboKVf)7ZnWGE5@u>~hbFa~lMFz_((FbXgN0F+f8G5`Po

delta 130
zcmX@aypfqVpO=@50SH?4&m<n1$ScbjGErOCn2{lcA%!W2E0;Tp8_Z?~vU#F-z-$&E
zn>UIV$Yu>@&}4hb2-L30Ik7)w;%{k2zRBW@#!|N!inxKIMLZya7f7sRC=vj%1tw=Q
P26E^y@G$W(3NQiy3#=J8

diff --git a/font_game/__pycache__/game.cpython-310.pyc b/font_game/__pycache__/game.cpython-310.pyc
index 1f1ad8caad12737aa56cc246b259a5e186cc4b7d..5f3f2268e87fe22f84b7bd57ec163b722358cc19 100644
GIT binary patch
delta 679
zcmX|7!EVz)5cSyW^~SXwr*Tp@qM@`=gh@e>K#&ShK)J)AHy<b!>qHT8TI?VWl_-Z?
z;DW0C0XXmhh!aTg5u8wjgg7A%Nbm>DI0#FA`(|cm-t2o{dlR^au4`-feH(l~I6ieZ
z;KgaDd7@8@l*J4*sYzpErab1U6<eu@MOunWm}k<QYq2ePvNF`ACB>Y@j;vBF?Zh22
zxgwpp8GF*jNSB^0<Bc*!(l6>2xr!NI!k!idKWT?M5iClhWV&A-rw5}XVhc{uSib#H
z0ubsCtf^=EZ}8M3;}~k{m$3sC)nGH^FIhc2gEMOQ=Q={DMP|m3WTE=Vnow0=*||#%
zN>mUQ_R;vk!~Nmmbe6jq=N^Iw3>*l-hE?$NZ2MiuyaLcv_xT32)Kh+ypQZk)`oQmT
zQp)P8X*Em|ZmXNtp1)1WEdtshGt?`q6;zSN4(TOwshD-t7i&;k!$RId5GX7l0IutX
z>WX!Kow|GKuGodHdM-Ahhf4(NlPI|tsfnfskoDDP@%p4omy6AIh@B_6K+r}&7fd`B
z#&|kgnEBCUJj*UqkuQrq;<pHP35qe-i246v>DTCSlIO+xr1#G+2c6myXqm6$Is+_3
zkkN~xO16ndW)a*_>vq3!n`mKBp<g_)Pq~45Vz<KpsX!+LIC=;|_sqcd>UHBUTf={S

delta 894
zcmZ8fy-yTD6yG;HJNv=iaU6ReC>*E=t`H>T#27J{oS`zrh}9Nc)|&-4-rikiR~rio
zs7-J>D~a(BFvh~t%En%^ot2?Bu`vecErrC{>~DVWW8eJV+j;ALtQH5wqNAyGxcnvf
zbXc5%SBDGDJ?QDa&NWVYG&Xz#G{yBEi%s8*E#Hc5-;N#MQGUve1I-`djGJmNa4RhC
z5N>nlfchm~MVlAG(H+W*ymVmrWj?Ab!pnS2WsIT4D|vjJyUJ7Hu%%6VwPO^u=|N`i
zhW$<y2fLw1GxjJ*!qwKhuQq@!ze9bmi+N`kRYqIAiK`&hQb@^ba-?x^wSCxE#XYha
zmFG3h(}k{5GCk_28BL=&6lG<ffiVoT{Cr+g{3lW1f~cZ@WH*Szjy!>5sK{gT942I_
zFG5wm)YHug%z)^>T4F}IF_d7ThUOUp)rv_4852RD58{k<9}l8#n6Y3u4Ex-pqAnlO
z3rkJR%oRDqsQaX|Gw7!Y+6hW40fhoIz<~;sh?sx>hPD7M%5TOLc=DIA$}Zveb-BW}
zFQWu;PC;fo3wlq__KgK|nG5m*+rlwvVh#Zni>hpxvu<5czknh_ekwy;llRSb>%0mi
zvkEMw#sU`@A(Q}9yaMcZ!>o}4I44vu|Dn2A$BJw6vw0I*608|-4ITe}LEfvKhDqAN
zQLkXMhR~MxtfL1lq<K@z$QBWn5UwgvlQoc!E69vw*o#te10C!%m>+c)9k&tkGPmTq
z-Gu9M+pae^Fb%{N+{OjAB=9;36XA}0VXsf)CCKZGd`Nlqyrnh<HslX`ZnB}MrKW*T
Rfi%D(mQm7Or&O=$e*wFzs(Jtb

diff --git a/font_game/__pycache__/images.cpython-310.pyc b/font_game/__pycache__/images.cpython-310.pyc
index c4835375d8b187e8b8661b3697006e3c0b4a6908..1387ca0c3c8bae17b5b918bc3ff17fe8faeafaba 100644
GIT binary patch
delta 387
zcmZ9IJx>Bb5QcYV7jAF4Lsa5dwBSPniP6@ASXijNjadsI?tu_i^nmV2G}2n&+8Glq
zjsHUve}bKrjg7wm7wDW~=6&a#Jjw2dxEFrg_XV-Fxc6194gIxB#TrEvw1^x}Y=K6J
zno6pfWH8NQGG;T{ifczYnoF)->1rW`PRNA4VF7JY6$`u?Q*q@CnDiA_?tsYT@NPR^
z56;UCHGDsTACrTZ!yD4KX~Z9h5|6a+c2VK7<*yK{5>r*fzKEciibR(*XO(x0eTd*`
zE^?m%NW_mw(Kj1dFvnPcd2@|{`Nd1fnp1iJj(Me9$vF3L2~!}DL6|q+^a?WOjAeGR
z_RZm><*fSjE_z`-C^vMq9(0O!(;0tJ8aONfj@T&Nw6-`CuA4WuU&>oE*-Q!lSiGd$
Us@Dp3Va)Mt;}g;<rqRp(0pA!=RsaA1

delta 442
zcmZ8dJx>Bb5Z&2ZU~jqOLy@3jp(26>HpIk4DfI`~tuY3(2OMF=97lH~CQ_ML;A&+|
zp!6Tu84@dND}IdUBArvbd2i<BO)^jHi`iY<W=Plc`?LN$vNu{SEd&zKL447HgVwl%
zrNIqJIFS(^fyFM$qk3m_Vv=$yO>RoYnT+$ew78``#35}WB97f4A}V4-!V`iDbBK6y
zbiW_Hs`s3O>geMfe$+a=aX;m!$LR?YW(M7XU|Ed=D&hfsLBe`92Bwb%Uey=ZkY@IR
zHSmB1&|V6dkJ`&3@qh;qz&I0_695#@GgMA03zwLi+C|6>!w{(|F2Rbrzz#FqYkx+3
zS2}8nJt(NEaSBugMkSG>7S7=mFigNJs(0fSw$&loJTB-Td4I5@+044>drjxkmG!36
z+tZWY{G}P7kOdr)(5q-!PI>w|^787DoYabQIv+1${sqz_*%kecQv>bjB{Wb(VIG*r
I8EkF+0=05qMF0Q*

diff --git a/font_game/__pycache__/util.cpython-310.pyc b/font_game/__pycache__/util.cpython-310.pyc
index f4dd0f1f9277d304ec56d784731c522208d10a4c..3f1a3bd02b8895a6825732a24a5fbc50ea7a3b20 100644
GIT binary patch
delta 689
zcmZWlU5nFD5S_WXNwaN}er`);!G%S%uGW{bF6cvDyXg9`AQgoROR2rFMB8+|2`Jc5
z*cKFhlDv!l1X+as0slna1bx_Fp_457;tex*&S5fh&V5%psn}D?$^xDD-5-O;nUD6y
z{1YJw62~CUZxonfCK%mptWCJ!2o5~gDU3Qutqvk1xiF<J)}$e_G9z-*6nVMkSTgI_
z&$!IV{E~}8%2+95%K|Y)S#(O&V^L2@mY0{fD5sFgimXyYMXt-*5=7OhE<mhH>_M~s
zb@djp9Cg?$ES#=b9<dR9*FIo9ddRou8d=~JcPaeai60CxAngn6!jT=a0B5AS1`U{D
z9l{h{fDm39#Pb(iZ3JuqCpb%%>4!0#C69F0p`?&fQ;T&q@J3E-?cM3^@3i~fgL?;$
zdhy!+>!CA04&15N)YKNW3LZF<;~4v@ocx`p3RSW3bl^KX?Tb|VHYJXEEMgW-W*}#3
zo2Vhhzmx1ujHRYFsR$sz&-jJRRbhc41dPP9D#$rGTO`W)q1)Ljz*wj5Z>^tx5H9YU
zFixK4_x$`LCz|U8F%R5{lP+zduqN(MP5ZtxoO;s#Px#33`mVf6Q~YF9kz}hD6@TTP
zZs|`LwxTzg8<kz+o3+^R1Lb-n)g~CNGM9}jRH&QLugrszx|Y<5-*k%Fjc%FO%}v54
Pm>79x&9HMO&o=%5TWpSo

delta 444
zcmXAj%}T>S5XWaW+qi9$v`uPjMMV${MMMkItKUdHc&T{Ui&!R>`b|>s(o#@C#gpVI
zJc_R&9zDb-@Fm1)yUTy}Kfjq_=gxa7IM=qF0Y2XP=gG7A>dXwDI3pmu06l(DBj@5m
zTpHRy2;fYzQe_~c4B8~ACn%*AnL14qIzvilDIHjp3G7ozS+X9ac1FY=5r=Y2a+DA9
z++%T1fm|j9@~HTb1MLRxJ!p@x3DwE>uSdi}d?aqs`S=nR;#B-&ykIGA%cX(fWewIg
zD_R|Hj(zO$w&yY|b%C8xf(rDo3?pt#Lw`uQ9+|!22l60+5P9-<gF_V)duy|~TVFfg
zY3wx)n^h4mFxRphT;7B(+i~#NCFX4FBns+lbDTsL2Z;*vEcGX4=zmDFCD4!CYQ?E>
zwOUNfs2g^!+VPw6%|%AxYW%JCt;FbDbwhs$YH=;SJU_!$fkF%OLJEnaD_r3!SE+QS
F@(+K@Rz3g#

diff --git a/font_game/__pycache__/web.cpython-310.pyc b/font_game/__pycache__/web.cpython-310.pyc
index 8523c0a4bd3f823bd9f403bd6dcc5110bb01b860..6912b4bd385fa179a3832b7ae3e2e2d571d1fea4 100644
GIT binary patch
delta 508
zcmY*VJx>Bb5WRuB0}c*?fFdXg(I|mHqS3+-jEzPM5`z^Dx#UhX^5p;xt+p0qOAEE6
zHpa%*_#d#+KVU3uteiQG;ude;zV~K#c0T;?0llT`nnWwL^<umZ^jUZqWQI}8e;qU@
zZ@`=~qvz5YRKg~drS$Y*^cWpNDeXW9)u2o;l#nk#P29si_-;LpHh?br&K)((dPqDu
zSJo$pR$SQXHO*=hLu{}+QVv_qZU+OzKXv9cqhaNax{Z1oFedWy#p*ogWY#fammD{Y
znuSs3TH8P}x)yeRx*!$3;!QqKGfabGS1H8eOcxlwTm5BTaiv5cEAEsN2#KT`TeG7x
z97r%E8JrAr1oUsa^(7YmuJVeun$U72_T{`$uZvTN?eT0(sVt%Ae|W5njFE@(ReK2A
zbnNh0We4VIOGhw88^*<@x(ONatZo#2Bvcd{BmFqbCO>MY$J()9@RBid7aA?ISGS5l
Qr_Qn{xfWFo+#WxC0jQg2mjD0&

delta 455
zcmey!|CNt7pO=@50SKH;&m?Y{$ScdZYNGZ^wiL!-22HVvZ;nc6GWuyU6)^!-6tMt_
zl?+9kAU5aZlZ=6k+?%DD3K$uACigJAvk8O5g(lx*HZl_gGNagw@=Nnl;`54xKoTI?
zTdZmMc_qa~d_eXuUJyGyF*j8&qa-&+ld(v0vLj2cu{=l}3rM_31gs@9H!(f6NF2oG
zDo88>N|dA)6+>MC6fNSK%*YzTrUhaOOpa!?k&*&2l|cl=sc;t8<c+MNjM|frvu4+W
z9Q6|9^D16_m`m(4Q*1Taiop7%LAqo?gaU|Q1`%>V0vH%z|EPfk5axqSy2V;tl2}w?
z17sG1_&iKPj4VtXOahEWx<Ia`NRc9t0vjJSS%}@5QERdvyOkw3P%w%W7+64mX@eAi
h6eAf8wghZGhfQvNN@-529V1XhvC8CQ?5a$Bi~vj(T`~Xw

diff --git a/font_game/game.py b/font_game/game.py
index 398361a..bad5cb8 100644
--- a/font_game/game.py
+++ b/font_game/game.py
@@ -1,19 +1,15 @@
 import random
-import time
 import os
 import pathlib
 
 from font_game.images import gen_image
-from font_game import base64, FONTS, read_file, write_file
+from font_game import gen_id, FONTS, read_file, write_file
 
 def purge_games():
     for root, _, files in os.walk("current_games"):
         for file in files:
             os.remove(os.path.join(root, file))
 
-def gen_id():
-    return base64(int(time.time()*10000))
-
 def pick_fonts(game_length: int):
     weights = {key: 100 for key in FONTS}
     font_list = []
@@ -32,7 +28,6 @@ def start_game(game_length: int = 10) -> str:
 
     game_id = gen_id()
 
-
     game_dict = {
         "points": "0",
         "i": "0",
diff --git a/font_game/images.py b/font_game/images.py
index 8b2332f..1372d0e 100644
--- a/font_game/images.py
+++ b/font_game/images.py
@@ -1,9 +1,8 @@
 import os
-import time
 from PIL import Image, ImageFont, ImageDraw
 import lorem
 
-from font_game import base64, IMAGE_SIZE, IMAGE_BACKGROUND, MARGINS, FONT_COLOR
+from font_game import gen_id, IMAGE_SIZE, IMAGE_BACKGROUND, MARGINS, FONT_COLOR
 
 def gen_image(font: ImageFont.ImageFont) -> str:
     img = Image.new("RGB", IMAGE_SIZE, IMAGE_BACKGROUND)
@@ -29,7 +28,7 @@ def gen_image(font: ImageFont.ImageFont) -> str:
         spacing=30
     )
 
-    filename = base64(int(time.time() * 10000) % 0xffffff)
+    filename = gen_id()
 
     path = f"static/images/{filename}.png"
 
diff --git a/font_game/util.py b/font_game/util.py
index 28ced70..fa0f4d1 100644
--- a/font_game/util.py
+++ b/font_game/util.py
@@ -1,5 +1,6 @@
 import string
 import pathlib
+import time
 from PIL import ImageFont
 
 BASE64_DIGITS = string.digits + string.ascii_letters + "+_"
@@ -29,12 +30,18 @@ def write_file(path: str, game: dict):
 
 def base64(num: int) -> str:
     temp = ""
-    while num > 0:
+    for _ in range(10):
         temp = BASE64_DIGITS[num % 64] + temp
         num = num//64
 
+    if num > 0:
+        raise Exception()
+
     return temp
 
+def gen_id() -> str:
+    micro_seconds = int(time.time() * 1000000)
+    return base64((micro_seconds * 9876534021204356789) % 0xfffffffffffffff)
 
 def make_fonts():
     with open("font-list.txt", "r", encoding="utf-8") as file_pointer:
diff --git a/font_game/web.py b/font_game/web.py
index 86084ea..38d4ddc 100644
--- a/font_game/web.py
+++ b/font_game/web.py
@@ -66,3 +66,7 @@ def start():
 
     game_id = start_game(game_length)
     return flask.redirect(f"/fontgame?id={game_id}")
+
+@app.route("/all")
+def all_fonts():
+    pass