Madiator2011/lbry-sdk
1
0
Fork 0
forked from LBRYCommunity/lbry-sdk
Code Pull requests Activity

add --branch arg to lbrynet-daemon to specify ui branch

Browse source
This commit is contained in:
Jack 2016-04-11 16:15:12 -04:00
parent e48cc40610
commit aa8c362cb8
1 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
lbrynet/lbrynet_daemon/LBRYDaemonControl.py
View file

@ -61,6 +61,9 @@ def start():
parser.add_argument("--ui", parser.add_argument("--ui",
help="path to custom UI folder", help="path to custom UI folder",
default="") default="")
parser.add_argument("--branch",
help="Branch of lbry-web-ui repo to use, defaults on HEAD",
default="HEAD")
try: try:
JSONRPCProxy.from_url(API_CONNECTION_STRING).is_running() JSONRPCProxy.from_url(API_CONNECTION_STRING).is_running()
@ -73,6 +76,14 @@ def start():
args = parser.parse_args() args = parser.parse_args()
if args.branch == "HEAD":
GIT_CMD_STRING = "git ls-remote https://github.com/lbryio/lbry-web-ui.git | grep %s | cut -f 1" % args.branch
DIST_URL = "https://rawgit.com/lbryio/lbry-web-ui/master/dist.zip"
else:
log.info("Using UI branch: " + args.branch)
GIT_CMD_STRING = "git ls-remote https://github.com/lbryio/lbry-web-ui.git | grep refs/heads/%s | cut -f 1" % args.branch
DIST_URL = "https://rawgit.com/lbryio/lbry-web-ui/%s/dist.zip" % args.branch
def getui(ui_dir=None): def getui(ui_dir=None):
if ui_dir: if ui_dir:
if os.path.isdir(ui_dir): if os.path.isdir(ui_dir):
@ -82,16 +93,16 @@ def start():
log.info("User specified UI directory doesn't exist: " + str(ui_dir)) log.info("User specified UI directory doesn't exist: " + str(ui_dir))
def download_ui(dest_dir): def download_ui(dest_dir):
url = urlopen("https://rawgit.com/lbryio/lbry-web-ui/master/dist.zip") url = urlopen(DIST_URL)
z = ZipFile(StringIO(url.read())) z = ZipFile(StringIO(url.read()))
z.extractall(dest_dir) names = [i for i in z.namelist() if '.DS_Store' not in i and '__MACOSX' not in i]
z.extractall(dest_dir, members=names)
return defer.succeed(dest_dir) return defer.succeed(dest_dir)
data_dir = user_data_dir("LBRY") data_dir = user_data_dir("LBRY")
version_dir = os.path.join(data_dir, "ui_version_history") version_dir = os.path.join(data_dir, "ui_version_history")
git_version = subprocess.check_output( git_version = subprocess.check_output(GIT_CMD_STRING, shell=True)
"git ls-remote https://github.com/lbryio/lbry-web-ui.git | grep HEAD | cut -f 1", shell=True)
if not os.path.isdir(data_dir): if not os.path.isdir(data_dir):
os.mkdir(data_dir) os.mkdir(data_dir)