Merge branch 'contributingApp'

Finished the contributing app, need built versions

Author: r2dev2

.gitignore

@@ -6,3 +6,5 @@ stockfish/
 stockfish.zip
 __MAC*
 *cpython*
+data/
+dest/

contribute/auto.py

@@ -1,12 +1,16 @@
 import os
+import smtplib
+import stat
 import sys
 import zipfile
+from email.message import EmailMessage
+from multiprocessing import Process
 from pathlib import Path
-from subprocess import call
+from subprocess import call, check_output
 from typing import *
 
 import evalfen
-from getFile import downloadName, getAvailableNames
+from getFile import createDir, downloadName, getAvailableNames
 from send import sendFile, sendNotification
 
 STOCKFISH_DOWNLOAD = {
@@ -16,8 +20,18 @@
     "darwin": "https://stockfishchess.org/files/stockfish-11-mac.zip"
 }
 
+STOCKFISH_LOCATION = {
+    "win32": r"stockfish\stockfish-11-win\Windows\stockfish_20011801_x64_bmi2.exe",
+    "linux": "stockfish/stockfish-11-linux/Linux/stockfish_20011801_x64_bmi2",
+    "linux32": "stockfish/stockfish-11-linux/Linux/stockfish_20011801_x64_bmi2",
+    "darwin": "stockfish/stockfish-11-mac/Mac/stockfish-11-"
+}
+
+def promptName() -> str:
+    return input("What is your name or github username? ")
 
-def unzip(filepath, resultpath):
+
+def unzip(filepath: str, resultpath: str) -> None:
     with zipfile.ZipFile(filepath, 'r') as zip_ref:
         zip_ref.extractall(resultpath)
 
@@ -38,25 +52,89 @@ def downloadStockfish() -> None:
     link = STOCKFISH_DOWNLOAD[sys.platform]
     call(["curl", "-o", "stockfish.zip", link])
     unzip("stockfish.zip", "stockfish/")
-
+    stockfishexecutable = str(findStockfish())
+    if sys.platform != "win32":
+        os.chmod(stockfishexecutable, stat.S_IEXEC)
+    os.remove("stockfish.zip")
+
+def promptNameChoice() -> Tuple[str]:
+    available = os.listdir("data")
+    for i, name in enumerate(available):
+        print(i, name, sep='\t')
+    uin = input("Which would you like to start on? ")
+    try:
+        uin = available[int(uin)]
+    except ValueError:
+        pass
+    return str(Path(os.getcwd()) / "data" / uin), uin
 
 def findStockfish() -> Path:
-    pass
+    toadd = "bmi2"
+    if sys.platform == "darwin" and \
+        '-3' in check_output(["/usr/sbin/sysctl", "-n", "machdep.cpu.brand_string"]).decode():
+        toadd = "modern"
+    return Path(os.getcwd()) / (STOCKFISH_LOCATION[sys.platform] + toadd)
 
 
 def promptStockfish() -> Path:
-    uin = input("Do you have stockfish in your current directory?(y)es/(n)o ")
-    needsfish = 'y' in uin
+    needsfish = "stockfish" not in os.listdir()
     if needsfish:
+        print("Downloading stockfish")
         downloadStockfish()
-
+    return findStockfish()
+
+def getNumberThreads() -> int:
+   return os.cpu_count()
+
+def progressBar(percentage: float) -> str:
+    numpound = round(percentage*10)
+    numdash = 10-numpound
+    return '[' + numpound*'#' + numdash*'-' + ']\t' + "%.2f" % (percentage*100) + "%"
+
+def countOutput(count: int, length: int) -> None:
+    print(progressBar(count/length), end='\r', flush=True)
+
+def promptThreads() -> int:
+    numthreads = getNumberThreads()
+    userthreads = 0
+    print(f"You have {numthreads} threads available.")
+    while not 1 <= userthreads <= numthreads:
+        try:
+            userthreads = int(input("How many threads would you like to use? "))
+        except ValueError:
+            pass
+    return userthreads
 
 def main() -> None:
+    createDir("dest")
+    createDir("data")
     if promptDownload():
         names = list(getAvailableNames())
         names.sort()
         name = promptNames(names)
         downloadName(name)
+        sendNotification(promptName(), name)
+    pathToStockfish = str(promptStockfish())
+    threads = promptThreads()
+    source, name = promptNameChoice()
+    dest = str(Path(os.getcwd()) / "dest" / name)
+
+    amountlines = evalfen.lineCount(dest)
+    finallines = evalfen.lineCount(source)
+    countOut = lambda c: countOutput(c, finallines)
+
+    evalargs = (source, dest, 22, threads, amountlines, pathToStockfish, countOut)
+    evaluate = Process(target=evalfen.main, args=evalargs)
+    evaluate.start()
+
+    print("Control c to quit")
+    try:
+        evaluate.join()
+        print(dest)
+        sendFile(promptName(), dest)
+    except KeyboardInterrupt:
+        evaluate.terminate()
+
     print("Done for now")
 
 

contribute/evalfen.py

@@ -1,6 +1,7 @@
 import argparse
 import sys
 from threading import Thread
+import subprocess
 
 import chess
 import chess.engine
@@ -35,7 +36,7 @@ def evalFENThread(output, i, fen, engine, d):
     info = engine.analyse(board, chess.engine.Limit(depth=d))
     output[i] = str(info["score"].white()) + '\n'
 
-def main(filein, fileout, d, threads, linetostart, enginepath):
+def main(filein, fileout, d, threads, linetostart, enginepath, counterOutput = lambda x: print(x, end='\r', flush=True)):
     engines = [chess.engine.SimpleEngine.popen_uci(enginepath) for i in range(threads)]
 
     with open(filein, 'r') as fin:
@@ -46,35 +47,41 @@ def main(filein, fileout, d, threads, linetostart, enginepath):
 
     counter = linetostart
     with open(fileout, 'a+') as fout:
-        while counter < l:
-            ts = []
-            threadcontents = [0 for i in range(threads)]
-            for i in range(threads):
-                try:
-                    f = contents.pop(0)
-                    fen = f[:-1]
-                    t = Thread(
-                        target = evalFENThread,
-                        args = (threadcontents, i, fen, engines[i], d),
-                        daemon = True
-                    )
-                    ts.append(t)
-                except IndexError:
-                    print("Almost done")
-            for t in ts:
-                t.start()
+        try:
+            while counter < l:
+                ts = []
+                threadcontents = [0 for i in range(threads)]
+                for i in range(threads):
+                    try:
+                        f = contents.pop(0)
+                        fen = f[:-1]
+                        t = Thread(
+                            target = evalFENThread,
+                            args = (threadcontents, i, fen, engines[i], d),
+                            daemon = True
+                        )
+                        ts.append(t)
+                    except IndexError:
+                        print("Almost done")
+                for t in ts:
+                    t.start()
+                for t in ts:
+                    t.join()
+                for c in threadcontents:
+                    try:
+                        fout.write(c)
+                        fout.flush()
+                    except:
+                        if c != 0:
+                            print("Add this:", c)
+                counter += threads
+                counterOutput(counter)
+                del ts, threadcontents
+        except KeyboardInterrupt:
+            print()
+            print("Caught Signal, beginning quit process")
             for t in ts:
                 t.join()
-            for c in threadcontents:
-                try:
-                    fout.write(c)
-                    fout.flush()
-                except:
-                    if c != 0:
-                        print("Add this:", c)
-            counter += threads
-            print(counter)
-            del ts, threadcontents
 
     print("Done")
     for engine in engines: engine.quit()

contribute/getFile.py

@@ -1,4 +1,6 @@
 from typing import *
+from pathlib import Path
+import os
 
 import requests
 
@@ -27,10 +29,17 @@ def getAvailableNames() -> Set[str]:
     taken = getTakenNames()
     return {name for name in allnames if name not in taken}
 
+def createDir(name: str) -> None:
+    try:
+        os.mkdir(name)
+    except FileExistsError:
+        pass
+
 def downloadName(name: str) -> None:
+    createDir("data")
     fenurl = "https://raw.githubusercontent.com/r2dev2bb8/ChessData/master/fens/"
     r = requests.get(fenurl + name, HEADERS)
-    with open("../" + name, 'w+') as fout:
+    with open(str(Path(os.getcwd()) /  "data" / name), 'w+') as fout:
         fout.write(r.content.decode())
 
 def main():

contribute/requirements.txt

@@ -1 +1,2 @@
 dill==0.3.1.1
+requests==2.23.0

contribute/send.py

@@ -14,6 +14,7 @@ def sendFile(username: str, filename: str) -> None:
 
 def main():
     send("Test mail")
+    # sendFile("r2dev2", "dest/Berliner.txt")
 
 if __name__ == "__main__":
     main()