paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-04 05:53:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Import: Add subdomain in the import script.

Browse Source 
Also remove user input of subdomain in the slack data
conversion script.
This commit is contained in:
Rhea Parekh
2018-04-06 05:51:16 +05:30
committed by Tim Abbott
parent ad861c5fae
commit 2baa9bc16e
6 changed files with 25 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
zerver/management/commands/import.py
View File

@@ -9,6 +9,7 @@ from django.core.management import call_command
from django.core.management.base import BaseCommand, CommandParser
from zerver.lib.export import do_import_realm, do_import_system_bots
from zerver.forms import check_subdomain_available
from zerver.models import Client, DefaultStream, Huddle, \
Message, Realm, RealmDomain, RealmFilter, Recipient, \
Stream, Subscription, UserMessage, UserProfile
@@ -34,6 +35,9 @@ import a database dump from one or more JSON files."""
action="store_true",
help='Import into an existing nonempty database.')
parser.add_argument('subdomain', metavar='<subdomain>',
type=str, help="Subdomain")
parser.add_argument('export_files', nargs='+',
metavar='<export file>',
help="list of JSON exports to import")
@@ -57,6 +61,12 @@ import a database dump from one or more JSON files."""
Client, Message, UserMessage, Huddle, DefaultStream, RealmDomain,
RealmFilter]
subdomain = options['subdomain']
if subdomain is None:
print("Enter subdomain!")
exit(1)
check_subdomain_available(subdomain)
if options["destroy_rebuild_database"]:
print("Rebuilding the database!")
db_name = settings.DATABASES['default']['NAME']
@@ -71,7 +81,7 @@ import a database dump from one or more JSON files."""
exit(1)
print("Processing dump: %s ..." % (path,))
realm = do_import_realm(path)
realm = do_import_realm(path, subdomain)
print("Resetting auto-increment sequence for Postgres......")
subprocess.check_call([os.path.join(settings.DEPLOY_ROOT,
"scripts/setup/postgres-reset-sequences")])