From 40fa2d505094857237e361f76877f58466c3e985 Mon Sep 17 00:00:00 2001 From: Renata_Mutalova <41615@mail.ru> Date: Fri, 14 May 2021 22:00:18 +0300 Subject: [PATCH 1/2] code refactoring --- .gitignore | 5 +++- .../__pycache__/__init__.cpython-38.pyc | Bin 154 -> 154 bytes .../__pycache__/check_answer.cpython-38.pyc | Bin 756 -> 756 bytes brain_games/__pycache__/cli.cpython-38.pyc | Bin 538 -> 538 bytes .../__pycache__/congrats.cpython-38.pyc | Bin 0 -> 419 bytes .../__pycache__/main_flow.cpython-38.pyc | Bin 0 -> 664 bytes brain_games/congrats.py | 8 +++++++ brain_games/main_flow.py | 19 +++++++++++++++ .../__pycache__/__init__.cpython-38.pyc | Bin 162 -> 162 bytes .../__pycache__/brain_even.cpython-38.pyc | Bin 1402 -> 1132 bytes .../__pycache__/brain_prime.cpython-38.pyc | Bin 1448 -> 1291 bytes brain_games/scripts/brain_calc.py | 22 ++++-------------- brain_games/scripts/brain_even.py | 21 ++++------------- brain_games/scripts/brain_gcd.py | 22 ++++-------------- brain_games/scripts/brain_prime.py | 22 ++++-------------- brain_games/scripts/brain_progression.py | 22 ++++-------------- 16 files changed, 56 insertions(+), 85 deletions(-) create mode 100644 brain_games/__pycache__/congrats.cpython-38.pyc create mode 100644 brain_games/__pycache__/main_flow.cpython-38.pyc create mode 100644 brain_games/congrats.py create mode 100644 brain_games/main_flow.py diff --git a/.gitignore b/.gitignore index 26a5fe1..dc169e2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,7 @@ .venv /.venv .idea -/env \ No newline at end of file +/env +/dist +.DS_Store +/brain_games/.DS_Store \ No newline at end of file diff --git a/brain_games/__pycache__/__init__.cpython-38.pyc b/brain_games/__pycache__/__init__.cpython-38.pyc index 9344e88551bfb4cb2c44b10ae4bd68d881341f11..760cdc8ce295081c9e4abe9234d313ac9967388f 100644 GIT binary patch delta 19 ZcmbQmIE#@xl$V!_0SK4~yE~Py*p@n(Kr#w;RR@W^gr*Fpg%s1n!*=&Nq-u(FX2@`~VhTza3ht9$6OMnU$sKOOd zxF!X`fm20mRWx9s0KdU57t91>B_&Dw|8!(o72|lFYw}2-KrP)X9G*-p^eS!K*xQz zcb)~3KrK55Ks3fFX5bS%1y8X#f$ZfX^$F*d7MvF+2er3sg i|9j&u#s=dw2XG8cefp}_)mF*ZVXHO;U}OrirsNMG4Xeoj literal 0 HcmV?d00001 diff --git a/brain_games/congrats.py b/brain_games/congrats.py new file mode 100644 index 0000000..3d71911 --- /dev/null +++ b/brain_games/congrats.py @@ -0,0 +1,8 @@ +"Print congrats" + + +def congrats_or_fail(counter, name): + if counter == 3: + print('Congratulations, {}!'.format(name)) + if counter == -1: + print("Let\'s try again, {}!".format(name)) \ No newline at end of file diff --git a/brain_games/main_flow.py b/brain_games/main_flow.py new file mode 100644 index 0000000..f0b213a --- /dev/null +++ b/brain_games/main_flow.py @@ -0,0 +1,19 @@ +"""Main flow.""" + +from brain_games.cli import welcome_user +from brain_games.check_answer import check_answer +from brain_games.congrats import congrats_or_fail + + +def flow(open_phrase, game): + """Main flow of each game + """ + name = welcome_user() + print(open_phrase) + counter = 0 + while counter < 3: + user_answer, correct_answer = game() + counter = check_answer(user_answer, correct_answer, counter) + congrats_or_fail(counter, name) + if counter == -1: + break diff --git a/brain_games/scripts/__pycache__/__init__.cpython-38.pyc b/brain_games/scripts/__pycache__/__init__.cpython-38.pyc index 75c849ec5d269f73e6200572e4786a18a7860197..0f6ecb998c6bc0f83a6c5ec3da1d86bbae6b8b96 100644 GIT binary patch delta 19 ZcmZ3)xQLNEl$V!_0SK?QupGR(}*H{bkx6+T6HUMdwFlC#On)vh}VH{f`*vt8jT_w2+u zzoWvgcDAxtJpp7rREIOxmWWF%D}fqONroG0vF?hTiyttykB` zHQDqmfC7XN04~vAjr3O-c`oT8sj(Fb22RHrKnMCxABJqPhdX|C%~LgE83o$1h{eV9 zUbp4_Eha|C{DwCCKLuf?yp=TCo0dFVjC0_C%QhpVv^goG{M46Hr8OzBL>aU*$E(+9 zvzF78Ghn@Wk@m9AXm2tfQ?cJlRkx`RfFffHI1?Zsa78Hc^xzvJ C@MN9< delta 783 zcmYjP&2G~`5Z<-d_BwG5g{nk|Ll8*F0`-K%0mP*TE~r8vkO)Y|c$YMaf9QBa)sQHM z@B&d@pd8^H-~=z>H;BX&aDf>ol&&@7*>7e)&wT4&@^>qIzO~h2xbAm8y!kE`;WhqZ zar@?sE0H<5+jBWnj&eV-o~Jw|@hz3FTKM*LOSOj6bRQ+T z-dhpzLB#9eSZ8UO>v&XYpnZC%(_x$x)v<<@Q`u%wY%#X@`o(oH1ZVk@zuNXOtXwLQ z0T&j?m^XxVn3e!KHJd%GnXnAJY&Zf+8#pj&nopLm5VkvvbAT!pSy|$+IR2X|=PsD`J?J38sxW}-H zV-;$Jr=8PCOxWj!1YsB9U4*^UGxR7s+Eo(e^p`j6Y6hgq%0>sI!+2-EEc%d`QI?oN zSyXqrAE(z>e{hX=9&2-}>KZudCjDekG^vBg0hE+MK#t}FBCFkZCFF^ToLUrkTRkr= zM}^VQ^NQFEa$Uhis-10##}47AbpF1!WG_OXd-FU-v9sr diff --git a/brain_games/scripts/__pycache__/brain_prime.cpython-38.pyc b/brain_games/scripts/__pycache__/brain_prime.cpython-38.pyc index ada39dd86ba29c9b25e8bbe249646c2c3a853c70..07d4fa12a02fafecbe03ebc664a31ccb2d10e119 100644 GIT binary patch delta 674 zcmZ8eL2J}N6waH(&1{keU0Xp^2;wDJ+KYH7B9tBk!Btjz3Fw$+#%^gdS>I$SEUi7% zo2Mmr@z`JD*`w?~@Z`yhC*LHi7AL$nFY~_n-ka}Tgdc-=cV#7TXnp?j>CI1f9^Z!1 z{QmkgPhR=pWIfrFKJC8bvQIl#eHk1w94db9fFs#UCkX2s4}6^F^>5;jO^ZR5V#Y9ssCk!&UPSS6TiS(VG97BN!w6!j&z zsWHj5Iab)_o98gPX`l1!>E^CcXf{#lyv{q{e1q*feaf1FZO`Z6!7AARu0jMHFlrvM zci=S_?A2LBh}1<3&%!BjiLOo-7Zsu^>g7M$a-9n)T3n|G>RNQYi|#qMC}CQaSp+cz zR1H_@tRVZl7)37G4w<=em%M~ir*=-Eh7;!m&e>9MclMway!qkkvti0wDzw*AmW9o#7F-CM6Cw>3z7Vo1gurW*!Pq*VT(-7{ z7GjCbMw!2+*iN`Dk5;p;n?HP-a76M?qc&=V;*ZKoPLI@Mpj+)kJjQ7X93qzwc%MG_ E4O97>fdBvi delta 838 zcmZ8fO>fgM7`C0XNz=3&Weku&8r&+jRh*_t2nh{|6Vn75hX`b{*sP_Ay}d~pj7B{a z2?{ zwFA9Oub4r$r(xw@oayx+^vrgfPs1afCN|S@kZYiI($z^{#wI_~kZ_`%e16HdCvW+K zjXJJ=bvwIA%{!n?T*Pzi+_gt0wXw=O2d|2*HERc8pX;PpOJAfnCqMa}s|`Gxx9C3Z zbC)k+Z}CMQ;tCp*9dXDjlW*e5h(LqMFJ`T9D;KQ?aI_Om}%rCc3=t( zk!NIqf#-06ILie8ndN42&s@iie6)nf-0Cb87coGid5ozv)L?M|5j$zAl0|Y Xteh%x1&Q=A*HHM5ANn Date: Fri, 14 May 2021 22:03:08 +0300 Subject: [PATCH 2/2] code refactoring --- .gitignore | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index dc169e2..196f506 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,7 @@ /env /dist .DS_Store -/brain_games/.DS_Store \ No newline at end of file +/brain_games/.DS_Store +brain_games/__pycache__ +brain_games/scripts/__pycache__/brain_even.cpython-38.pyc +brain_games/scripts/__pycache__/brain_prime.cpython-38.pyc \ No newline at end of file