vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix site arg handling

Browse source
This commit is contained in:
Pratik Vyas 2014-02-18 16:55:09 +05:30
parent 1b43b73887
commit ec1f2fbfcf
2 changed files with 18 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
frappe/__init__.py
View file

@ -402,9 +402,10 @@ def get_pymodule_path(modulename, *joins):
def get_module_list(app_name):
return get_file_items(os.path.join(os.path.dirname(get_module(app_name).__file__), "modules.txt"))
def get_all_apps(with_frappe=False):
apps = get_file_items(os.path.join(local.sites_path, "apps.txt")) \
+ get_file_items(os.path.join(local.site_path, "apps.txt"))
def get_all_apps(with_frappe=False, with_internal_apps=True):
apps = get_file_items(os.path.join(local.sites_path, "apps.txt"))
if with_internal_apps:
apps.extend(get_file_items(os.path.join(local.site_path, "apps.txt")))
if with_frappe:
apps.insert(0, 'frappe')
return apps

31
frappe/cli.py
View file

@ -8,7 +8,14 @@ import sys, os
import frappe
site_arg_optional = []
site_arg_optional = ['serve']
def get_site(parsed_args):
if not parsed_args.get("site") and os.path.exists(os.path.join(parsed_args["sites_path"], "currentsite.txt")):
with open(os.path.join(parsed_args["sites_path"], "currentsite.txt"), "r") as sitefile:
parsed_args["site"] = sitefile.read().strip()
return parsed_args["site"]
return parsed_args.get("site")
def main():
parsed_args = frappe._dict(vars(setup_parser()))
@ -28,21 +35,11 @@ def main():
frappe.init(site, sites_path=sites_path)
run(fn, args)
else:
if not fn in site_arg_optional:
if not parsed_args.get("site") and os.path.exists(os.path.join(sites_path, "currentsite.txt")):
with open(os.path.join(sites_path, "currentsite.txt"), "r") as sitefile:
parsed_args["site"] = sitefile.read().strip()
site = parsed_args.get("site")
if not site:
print "Site argument required"
exit(1)
if fn != 'install' and not os.path.exists(os.path.join(parsed_args["sites_path"], site)):
print "Did not find folder '{}'. Are you in sites folder?".format(parsed_args.get("site"))
exit(1)
site = get_site(parsed_args)
if fn not in site_arg_optional and not site:
print 'site argument required'
exit(1)
elif site:
frappe.init(site, sites_path=sites_path)
run(fn, parsed_args)
else:
@ -639,7 +636,7 @@ def run_tests(app=None, module=None, doctype=None, verbose=False):
exit(1)
@cmd
def serve(port=8000, profile=False, sites_path='.'):
def serve(port=8000, profile=False, sites_path='.', site=None):
import frappe.app
frappe.app.serve(port=port, profile=profile, site=frappe.local.site, sites_path=sites_path)