rlbot hub alpha

rlbot_gui/bot_management/downloader.py

@@ -3,7 +3,10 @@
 import urllib
 import zipfile
 from pathlib import Path
-from shutil import rmtree
+import shutil
+
+from distutils.dir_util import copy_tree
+
 
 
 def download_and_extract_zip(download_url: str, local_folder_path: Path, clobber: bool = False):
@@ -17,7 +20,7 @@ def download_and_extract_zip(download_url: str, local_folder_path: Path, clobber
         urllib.request.urlretrieve(download_url, downloadedZip)
 
         if clobber and os.path.exists(local_folder_path):
-            rmtree(local_folder_path)
+            shutil.rmtree(local_folder_path)
 
         with zipfile.ZipFile(downloadedZip, 'r') as zip_ref:
             zip_ref.extractall(local_folder_path)
@@ -43,3 +46,19 @@ def download_gitlfs(repo_url: str, checkout_folder: Path, branch_name: str):
     file.close()
 
     print('Done downloading git repo.')
+
+def download_botfs(repo_url: str, checkout_folder: Path, branch_name: str, bot_path: str, bot_dir_name: str):
+    print('Starting download of a git repo... this might take a while.')
+
+    shutil.rmtree(checkout_folder, ignore_errors=True)
+
+    # Download the most of the files eg. https://github.com/RLBot/RLBotPack/archive/master.zip
+    download_and_extract_zip(
+        download_url=repo_url + '/archive/' + branch_name + '.zip',
+        local_folder_path=checkout_folder, clobber=True)
+
+    repo_extraction_name = '/' + repo_url.split('/')[-1] + '-' + branch_name + '/'
+
+    shutil.copytree(checkout_folder + repo_extraction_name + '/' + bot_dir_name, bot_path + '/' + bot_dir_name)
+
+    print('Done downloading git repo.')

rlbot_gui/gui.py

@@ -1,4 +1,5 @@
 import os
+import shutil
 
 import eel
 from PyQt5.QtCore import QSettings
@@ -15,15 +16,17 @@
 
 from rlbot_gui.bot_management.bot_creation import bootstrap_python_bot
 from rlbot_gui.bot_management.downloader import download_gitlfs
+from rlbot_gui.bot_management.downloader import download_botfs
 from rlbot_gui.match_runner.match_runner import hot_reload_bots, shut_down, start_match_helper, do_infinite_loop_content
+import getpass
 
 DEFAULT_BOT_FOLDER = 'default_bot_folder'
-BOTPACK_FOLDER = 'RLBotPackDeletable'
-OLD_BOTPACK_FOLDER = 'RLBotPack'
 CREATED_BOTS_FOLDER = 'MyBots'
+HUB_FOLDER = 'repos'
 BOT_FOLDER_SETTINGS_KEY = 'bot_folder_settings'
 settings = QSettings('rlbotgui', 'preferences')
 
+
 bot_folder_settings = settings.value(BOT_FOLDER_SETTINGS_KEY, type=dict)
 
 if not bot_folder_settings:
@@ -147,17 +150,23 @@ def scan_for_bots():
             for bot in bots:
                 bot_hash[bot['path']] = bot
 
+    bots = get_bots_from_directory("C:/Users/"+getpass.getuser()+"/AppData/Local/RLBotGUI/repos")
+    for bot in bots:
+        bot_hash[bot['path']] = bot
+
     return list(bot_hash.values())
 
 
 def get_bots_from_directory(bot_directory):
     return [
         {
             'name': bundle.name,
+            'safe': 1 if bundle.config_path.split('\\')[7] != 'unferifiedCommunity' and bundle.config_path.split('\\')[7] != 'localRepo' else 0,
             'type': 'rlbot',
             'skill': 1,
             'image': 'imgs/rlbot.png',
             'path': bundle.config_path,
+            'display_path': bundle.config_path.split('\\')[7],
             'info': read_info(bundle)
         }
         for bundle in scan_directory_for_bot_configs(bot_directory)]
@@ -208,24 +217,66 @@ def install_package(package_string):
 
 
 @eel.expose
-def download_bot_pack():
-    # The bot pack in now hosted at https://github.com/RLBot/RLBotPack
-    download_gitlfs(
-        repo_url="https://github.com/RLBot/RLBotPack",
-        checkout_folder=BOTPACK_FOLDER,
-        branch_name='master')
+def download_bot(repo_path, repo, bot_dir):
+    print(repo)
+    branch = ""
+    if "tree" in repo:
+        branch = repo.split('/')[-1]
+        repo = repo.split('/tree')[0]
+    else:
+        branch = "master"
 
-    # Configure the folder settings.
-    bot_folder_settings['folders'][os.path.abspath(BOTPACK_FOLDER)] = {'visible': True}
+    download_botfs(
+        repo_url=repo,
+        checkout_folder='download',
+        branch_name=branch,
+        bot_path=os.path.abspath(HUB_FOLDER) + '/' + repo_path,
+        bot_dir_name=bot_dir)
+    return 0;
 
-    if os.path.abspath(OLD_BOTPACK_FOLDER) in bot_folder_settings['folders']:
-        # Toggle off the old one since it's been replaced.
-        bot_folder_settings['folders'][os.path.abspath(OLD_BOTPACK_FOLDER)] = {'visible': False}
 
-    settings.setValue(BOT_FOLDER_SETTINGS_KEY, bot_folder_settings)
-    settings.sync()
+@eel.expose
+def delete_bot(repo_path, name):
+    shutil.rmtree(os.path.abspath(HUB_FOLDER + "/" + repo_path + '/' + name))
+    return 0;
+
+
+@eel.expose
+def is_bot_installed(repo_path, bot_name):
+    if os.path.exists(HUB_FOLDER + "/" + repo_path + '/' + bot_name):
+        return True
+    else:
+        return False
 
 
+@eel.expose
+def get_bot_packaging(repo_path, bot_name):
+    bot_directory = HUB_FOLDER + "/" + repo_path
+    if os.path.exists(bot_directory+'/'+bot_name):
+        file = open(bot_directory+'/'+bot_name+'/botpackage.json',"r")
+        filestr = file.read()
+        file.close()
+        return filestr
+    else:
+        return False
+
+
+@eel.expose
+def read_local_repofile():
+    if os.path.exists('localRepo.json'):
+        file = open('localRepo.json',"r")
+        filestr = file.read()
+        file.close()
+        return filestr
+    else:
+        return False
+
+@eel.expose
+def write_local_repofile(jsonstr):
+    file = open('localRepo.json',"w")
+    file.write(jsonstr)
+    file.close()
+
 @eel.expose
 def show_bot_in_explorer(bot_cfg_path):
     import subprocess
@@ -261,7 +312,7 @@ def begin_python_bot(bot_name):
 
 def on_websocket_close(page, sockets):
     global should_quit
-    eel.sleep(3.0)  # We might have just refreshed. Give the websocket a moment to reconnect.
+    eel.sleep(10.0)  # We might have just refreshed. Give the websocket a moment to reconnect.
     if not len(eel._websockets):
         # At this point we think the browser window has been closed.
         should_quit = True
@@ -296,7 +347,7 @@ def launch_eel(use_chrome):
     # installed to pip locally using this technique https://stackoverflow.com/a/49684835
     # The suppress_error=True avoids the error "'options' argument deprecated in v1.0.0", we need to keep the
     # options argument since a lot of our user base has an older version of eel.
-    eel.start('main.html', size=(1000, 800), block=False, callback=on_websocket_close, options=options,
+    eel.start('main.html', size=(1000, 830), block=False, callback=on_websocket_close, options=options,
               disable_cache=True, mode=browser_mode, port=port, suppress_error=True)
 
 
@@ -314,4 +365,4 @@ def start():
 
     while not should_quit:
         do_infinite_loop_content()
-        eel.sleep(1.0)
+        eel.sleep(1.0)

rlbot_gui/gui/botmanager.html

@@ -0,0 +1,188 @@
+<!DOCTYPE html>
+<html>
+<head>
+
+	<meta charset="utf-8">
+	<meta content="width=device-width,initial-scale=1,minimal-ui" name="viewport">
+
+	<link rel="icon" type="image/png" sizes="192x192" href="imgs/rlbot_logo.png">
+
+	<link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons"/>
+	<link rel="stylesheet" href="css/vue-material.min.css"/>
+	<link rel="stylesheet" href="css/vue-fonts.css"/>
+	<link rel="stylesheet" href="css/black-green-light.css"/>
+	<link rel="stylesheet" href="css/style.css"/>
+	<link rel="stylesheet" href="css/botmanager.css"/>
+
+	<title>Hub</title>
+
+</head>
+<body id="rlbotgui">
+	<div id="app">
+
+		<aside>
+			<md-card class="settings-card">
+				<md-card-header>
+					<div class="md-title">Filters</div>
+				</md-card-header>
+
+                <md-card-content>
+
+                	<label for="searchBotName">search</label>
+                	<input id="searchBotName" onkeyup="reloadCards()" type="text" name="" class="" placeholder="search on bot name"><br>
+
+                	<hr>
+
+					<div class="center-flex">
+
+						<div class="md-layout">
+							<div class="md-layout-item">
+								<label for="gamemodes">Gamemode</label>
+								<div id="gamemodes" class="list">
+									<p><input onclick="reloadCards()" type="checkbox" name="gamemode" value="soccar">soccar</p>
+									<p><input onclick="reloadCards()" type="checkbox" name="gamemode" value="Hoops">Hoops</p>
+									<p><input onclick="reloadCards()" type="checkbox" name="gamemode" value="Dropshot">Dropshot</p>
+									<p><input onclick="reloadCards()" type="checkbox" name="gamemode" value="Rumble">Rumble</p>
+									<p><input onclick="reloadCards()" type="checkbox" name="gamemode" value="Snowday">Snowday</p>
+								</div>
+							</div>
+							<div class="md-layout-item">
+								<label for="gamemodes">Repo</label>
+								<div id="gamemodes" class="list">
+									<p><input onclick="reloadCards()" type="radio" name="source" value="all" checked>all</p>
+									<p><input onclick="reloadCards()" type="radio" name="source" value="Trusted">Trusted</p>
+									<p><input onclick="reloadCards()" type="radio" name="source" value="UnverifiedCommunity">UnverifiedCommunity</p>
+									<p><input onclick="reloadCards()" type="radio" name="source" value="localRepo">localRepo</p>
+								</div>
+							</div>
+						</div>
+					</div>
+
+					<button @click="showNewRepoDialog = true;">Add custom repo</button>
+
+                </md-card-content>
+			</md-card>
+
+			<md-card class="settings-card">
+				<md-card-header>
+					<div class="md-title">Beta notice</div>
+				</md-card-header>
+
+                <md-card-content>
+
+					<div class="center-flex">
+
+						<div class="md-layout">
+							<p>The hub is an beta preview. bugs can occur more often then expected.</p>
+						</div>
+					</div>
+
+                </md-card-content>
+			</md-card>
+
+			<md-card class="settings-card">
+				<md-card-header>
+					<div class="md-title">News</div>
+				</md-card-header>
+
+                <md-card-content>
+
+					<div class="center-flex">
+
+						<table>
+							<tr v-for="newsItem in newsItems">
+								<td>{{newsItem.date}}</td>
+								<td>{{newsItem.content}}</td>
+							</tr>
+						</table>
+					</div>
+
+                </md-card-content>
+			</md-card>
+		</aside>
+
+		<div id="main">
+
+			<div v-for="repo in repos" class="md-card settings-card md-theme-default" :key="repo.ID" v-if="repo.display">
+				<div class="md-card-header">
+					<div class="md-title">{{repo.name}}
+						<small v-if="!repo.is_installed || repo.is_installed && repo.localVersion === repo.onlineVersion" >Version {{repo.onlineVersion}}</small>
+						<small v-if="repo.is_installed && repo.localVersion !== repo.onlineVersion" >Version {{repo.localVersion}}, an update to version Version {{repo.onlineVersion}} is available</small>
+					</div>
+				</div>
+				<div class="md-card-content">
+					<div class="center-flex">
+						<div class="md-layout md-gutter">
+							<div class="md-layout-item botinfo-short"><label for="gamemodes-0"><b>Gamemode</b></label>
+								<p id="gamemodes-0" class="managerInfo">
+									<span class="gamemode" v-for="mode in repo.gamemodes">{{mode.name}} </span>
+								</p>
+							</div>
+							<div class="md-layout-item botinfo-short"><label for="type-0"><b>Categories</b></label>
+								<p id="type-0" class="managerInfo">
+									<span class="category" v-for="category in repo.categories">{{category.name}} </span>
+								</p>
+							</div>
+							<div class="md-layout-item botinfo-long"><label for="type-0"><b>Description</b></label>
+								<p id="type-0" class="managerInfo">
+									<span>{{repo.description}} </span>
+								</p>
+							</div>
+							<div class="md-layout-item botinfo-short"><label for="type-0"><b>Source</b></label>
+								<p id="type-0" class="managerInfo">
+									<span>{{repo.repoName}} </span>
+								</p>
+							</div>
+						</div>
+						<span style="flex-grow: 1;"></span>
+						<button type="button" class="md-button md-primary md-raised md-theme-default">
+							<div class="md-ripple">
+								<div v-if="!repo.is_installed" class="md-button-content"
+									 @click="downloadBot(repo)">
+									Download
+								</div>
+								<div v-if="repo.is_installed && repo.localVersion === repo.onlineVersion"
+									 class="md-button-content"
+									 @click="deleteBot(repo)">
+									Delete
+								</div>
+								<div v-if="repo.is_installed && repo.localVersion !== repo.onlineVersion"
+									 class="md-button-content"
+									 @click="updateBot(repo)">
+									Update
+								</div>
+							</div>
+						</button>
+					</div>
+				</div>
+			</div>
+		</div>
+		<md-dialog :md-active.sync="showNewRepoDialog">
+			<md-dialog-title>Add bot to local repo</md-dialog-title>
+
+			<md-dialog-content>
+				<md-field>
+					<label>Repo url</label>
+					<md-input v-model="newRepoUrl"></md-input>
+				</md-field>
+				<md-field>
+					<label>Folder Name</label>
+					<md-input v-model="newRepoFolder"></md-input>
+				</md-field>
+			</md-dialog-content>
+
+			<md-dialog-actions>
+				<md-button class="md-raised md-primary" @click="addBotToLocalRepofile(newRepoUrl, newRepoFolder)">Begin</md-button>
+				<md-button @click="showNewRepoDialog = false">Close</md-button>
+			</md-dialog-actions>
+		</md-dialog>
+	</div>
+
+    <script type="text/javascript" src="/eel.js"></script>
+    <script type="text/javascript" src="js/vue.js"></script>
+    <script type="text/javascript" src="js/vue-material.min.js"></script>
+    <script type="text/javascript" src="js/Sortable.min.js"></script>
+    <script type="text/javascript" src="js/vuedraggable.min.js"></script>
+	<script type="text/javascript" src="js/botmanager.js"></script>
+</body>
+</html>