Quellcode durchsuchen

added --use argument to set current site, so that it is not required in every webnotes statement

version-14
Rushabh Mehta vor 11 Jahren
Ursprung
Commit
bdf77ce134
1 geänderte Dateien mit 21 neuen und 7 gelöschten Zeilen
  1. +21
    -7
      webnotes/cli.py

+ 21
- 7
webnotes/cli.py Datei anzeigen

@@ -17,12 +17,6 @@ def main():
parsed_args["sites_path"] = "." parsed_args["sites_path"] = "."
if not parsed_args.get("make_app"): if not parsed_args.get("make_app"):
if not parsed_args.get("site") and not fn in site_arg_optional:
print "Site argument required"
exit(1)
if fn not in site_arg_optional and (fn != 'install' and not os.path.exists(parsed_args.get("site"))):
print "Did not find folder '{}'. Are you in sites folder?".format(parsed_args.get("site"))
exit(1)
if parsed_args.get("site")=="all": if parsed_args.get("site")=="all":
for site in get_sites(parsed_args["sites_path"]): for site in get_sites(parsed_args["sites_path"]):
@@ -32,7 +26,21 @@ def main():
run(fn, args) run(fn, args)
else: else:
if not fn in site_arg_optional: if not fn in site_arg_optional:
webnotes.init(parsed_args.get("site"))
if not parsed_args.get("site") and os.path.exists("currentsite.txt"):
with open("currentsite.txt", "r") as sitefile:
site = sitefile.read()
else:
site = parsed_args.get("site")

if not site:
print "Site argument required"
exit(1)

if fn != 'install' and not os.path.exists(site):
print "Did not find folder '{}'. Are you in sites folder?".format(parsed_args.get("site"))
exit(1)
webnotes.init(site)
run(fn, parsed_args) run(fn, parsed_args)
else: else:
run(fn, parsed_args) run(fn, parsed_args)
@@ -173,6 +181,7 @@ def setup_utilities(parser):
metavar="site-CONFIG-JSON", metavar="site-CONFIG-JSON",
help="Update site_config.json for a given site") help="Update site_config.json for a given site")
parser.add_argument("--port", default=8000, type=int, help="port for development server") parser.add_argument("--port", default=8000, type=int, help="port for development server")
parser.add_argument("--use", action="store_true", help="Set current site for development.")
# clear # clear
parser.add_argument("--clear_web", default=False, action="store_true", parser.add_argument("--clear_web", default=False, action="store_true",
@@ -220,6 +229,11 @@ def make_app():
from webnotes.utils.boilerplate import make_boilerplate from webnotes.utils.boilerplate import make_boilerplate
make_boilerplate() make_boilerplate()


@cmd
def use():
with open("currentsite.txt", "w") as sitefile:
sitefile.write(webnotes.local.site)

# install # install
@cmd @cmd
def install(db_name, root_login="root", root_password=None, source_sql=None, def install(db_name, root_login="root", root_password=None, source_sql=None,


Laden…
Abbrechen
Speichern