From 4e190f553e9ff930a5d69babdcb71cd6728d010d Mon Sep 17 00:00:00 2001
From: Alastair Holland <hollan84@coventry.ac.uk>
Date: Sun, 3 May 2020 01:45:42 +0100
Subject: [PATCH] Added automatic library installation

---
 __pycache__/bot.cpython-36.pyc          | Bin 2986 -> 2986 bytes
 __pycache__/librarySetup.cpython-36.pyc | Bin 0 -> 715 bytes
 __pycache__/setup.cpython-36.pyc        | Bin 1065 -> 1101 bytes
 configure.py                            |   5 +++++
 librarySetup.py                         |  23 +++++++++++++++++++++++
 run.py                                  |   5 +++++
 setup.py                                |  13 +++++++------
 7 files changed, 40 insertions(+), 6 deletions(-)
 create mode 100755 __pycache__/librarySetup.cpython-36.pyc
 create mode 100755 configure.py
 create mode 100755 librarySetup.py

diff --git a/__pycache__/bot.cpython-36.pyc b/__pycache__/bot.cpython-36.pyc
index 4a028b771d421aee52978b4e4cf4840f213490d1..ef09e22000d288c643232e243f7272b81a99ef20 100755
GIT binary patch
delta 15
WcmZ1_zDk_Un3tEUk7Fa-5^ew>1q0jw

delta 15
WcmZ1_zDk_Un3tF963a%mCENfZi3A(~

diff --git a/__pycache__/librarySetup.cpython-36.pyc b/__pycache__/librarySetup.cpython-36.pyc
new file mode 100755
index 0000000000000000000000000000000000000000..53f027b997044f025f1f16ec06bef49f01763215
GIT binary patch
literal 715
zcmaJ<J#X7E5WS;pO9>LAXb>;WpdpKas&wluXo><^i!4FYkD-MuGO=2HfusURh^ORl
zWKWj<Ag!IccI=cB<uo=>l)$~yJ-&BGN}6tOZ{F<u`0^V8e!|LP^!%1WKP3<#@ESgY
zgeyQ0>;%S6M7&)+!e<mm6#AAxpnwDxUB(4g!%O_e1iM0n50H(JdLUTNX}M33v5!z~
zS)a3Dq<Ph8md@Tkoc%}Vn!mSj$nUSr7_>?|&3*I;pgVZSzv#G7yG2|~{ou6T)1}D$
zurPj{X%i-iUsPtEXVZWb_5QN(gVd+`uO@i!i&#gw5-*CXCJXiYpJLaJdzg?$G|7~@
z-dUqNa@=p+b7_iD>xSjJ8R$wInKtfnVB<a5$34}4GUc?;Z(%@i2g;@Nr{Jp0c&Vl0
zFDH`;KfgHBT&J@@&qE~-h`*5Pu$+|{ox~Q;?ams-=Xol5n1pn;Sn)K@WTe6~^L3UR
zp2Ra1s_I0VvY^+{45PV>zQ40<EH(XJp!W%YdFU~QLmc1}WVl7St47Oe6V(Rkj>lcL
X7gzz0_8RYXnu{`#Z*1T8;@;>Um=Cac

literal 0
HcmV?d00001

diff --git a/__pycache__/setup.cpython-36.pyc b/__pycache__/setup.cpython-36.pyc
index 2a1320341a7bc860fad9d15c84111b17c817627b..fe7043bc138cbd190b78b9d5ed8085549b0cfd2e 100755
GIT binary patch
delta 184
zcmZ3<ah8M2n3tE!o^M^;OV){8#(Z213=Awl><q-kA0~P)v1iZXYG$bAsA13IY-V6&
zs9~+)$Yv@!Qo@?T-^|F!kirnmkRnjaS;Lvd0#pa2Q&_T@iXQ-JR-n2Uo23{ZGcs~b
z{>Nm?QIwjP;*waBIN6f9&D;WL0|O%mGY=yN5DGAIF|ja%SRly4%*V{d$OV*ziGW3!
MSQt4be_*x*03!1v#sB~S

delta 132
zcmX@hv66$!n3tF92kW}HE|!U0#(bO%3=Awl><q-kcP4r-(Pph-&*Exk$Yv_qQNo(S
z-^|F!kirnmkRnjaQNxkKlFd|n21v64<*#hkV|>iW$T?Yv*>-XybBl-(&=3Yj4kjK(
b4j>d@<YHoBn*5Pjj2$Gv!o)IJgvAm70`(hr

diff --git a/configure.py b/configure.py
new file mode 100755
index 0000000..2e3b8e0
--- /dev/null
+++ b/configure.py
@@ -0,0 +1,5 @@
+def configure():
+    
+
+
+configure()
\ No newline at end of file
diff --git a/librarySetup.py b/librarySetup.py
new file mode 100755
index 0000000..adf3737
--- /dev/null
+++ b/librarySetup.py
@@ -0,0 +1,23 @@
+def checkLibraries():
+
+    import getpass
+    import os
+
+    try:
+        os.system("pip3 -V")
+    except:
+        os.system("sudo apt install python3-pip")
+    try:
+        import discord
+    except: 
+        try:
+            os.system("python3 -m pip install -U discord.py")
+        except:
+            os.system("py3 -m pip install -U discord.py")
+    try:
+        import mcstatus
+    except: 
+        os.system("pip3 install mcstatus")
+        os.system("pip3 install status")
+
+checkLibraries()
\ No newline at end of file
diff --git a/run.py b/run.py
index 0f5147e..b832d99 100755
--- a/run.py
+++ b/run.py
@@ -1,11 +1,16 @@
 def run():
 
+    import librarySetup
+    librarySetup.checkLibraries()
+
     import setup
     import bot
     import online
     import os
+    
 
     if not os.path.isfile('.env'):
         setup.environment()
+    
     os.system("python3 bot.py")
 run()
\ No newline at end of file
diff --git a/setup.py b/setup.py
index 81c4b4f..710379d 100755
--- a/setup.py
+++ b/setup.py
@@ -1,24 +1,24 @@
 def environment():
     import os.path
     
-    '''Checks to see if there is an environment file'''
-    if os.path.isfile('.env'):
+    '''Prevents overwriting of the environment file'''
+    if os.path.isfile('.env'): #Checks to see if there is an environment file
         overwrite = input("Would you like to overwrite your current credentials? (y/n)")
-        overwrite = overwrite.lower()
+        overwrite = overwrite.lower() #Makes the input string lowercase
         if overwrite == "y" or overwrite == "yes":
             print("Creating new credientials... \n")
         else:
-            return
+            return #Exit function
 
     '''Gets information'''
     token = input("Input your bot token here > ")
     serverIP = input("Input your server URL/IP here > ")
     port = input("Input your bot port here (If you don't know it, leave blank) > ")
     if port == "":
-        port = "25565"
+        port = "25565" #Default Minecraft server port
 
     '''Concantinate into a string'''
-    data = "TOKEN={}\nSERVER={}\nPORT={}".format(token,serverIP,port)
+    data = "TOKEN={}\nSERVER={}\nPORT={}".format(token,serverIP,port) #Sets the format of the data
 
     '''Write data to the .env file'''
     creds = open(".env", "w")
@@ -35,6 +35,7 @@ def environment():
         return
     else:
         tryAgain = ("Error writing data. \n Try again? (y/n) > ")
+        tryAgain = tryAgain.lower() #Makes the input string lowercase
         if tryAgain == "y" or tryAgain == "yes":
             environment()
         else: