Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

slack importer: Refactor checking for availability of realm subdomain.

This commit is contained in:
Rhea Parekh 2018-01-09 16:16:56 +05:30 committed by showell
parent a0526206f9
commit c1d336f5d1
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/test-slack-importer
View File

@ -10,5 +10,5 @@ EOF
./manage.py migrate --noinput
wget https://github.com/houstondatavis/slack-export/archive/master.zip -O /tmp/slack-export-master.zip
./manage.py convert_slack_data /tmp/slack-export-master.zip "slack_importer_test_realm" --output /tmp/slack_importer_test_data
./manage.py convert_slack_data /tmp/slack-export-master.zip "slack-importer-test-realm" --output /tmp/slack_importer_test_data
./manage.py import --destroy-rebuild-database /tmp/slack_importer_test_data

11
zerver/lib/slack_data_to_zulip_data.py
View File

@ -11,6 +11,7 @@ from django.utils.timezone import now as timezone_now
from typing import Any, Dict, List, Tuple
from zerver.models import UserProfile, Realm, Stream, UserMessage, \
Subscription, Message, Recipient, DefaultStream
from zerver.forms import check_subdomain_available
# stubs
ZerverFieldsT = Dict[str, Any]
@ -440,7 +441,8 @@ def channel_message_to_zerver_message(constants: List[Any], channel: str,
message_id += 1
return zerver_message, zerver_usermessage
def do_convert_data(slack_zip_file: str, realm_name: str, output_dir: str) -> None:
def do_convert_data(slack_zip_file: str, realm_subdomain: str, output_dir: str) -> None:
check_subdomain_available(realm_subdomain)
slack_data_dir = slack_zip_file.replace('.zip', '')
zip_file_dir = os.path.dirname(slack_data_dir)
subprocess.check_call(['unzip', '-q', slack_zip_file, '-d', zip_file_dir])
@ -458,11 +460,8 @@ def do_convert_data(slack_zip_file: str, realm_name: str, output_dir: str) -> No
zerver_realm_skeleton = json.load(open(fixtures_path + 'zerver_realm_skeleton.json'))
zerver_realm_skeleton[0]['id'] = REALM_ID
if Realm.objects.filter(string_id = realm_name):
raise Exception('Realm with the name %s already exists. Enter a new name.'
% (realm_name))
zerver_realm_skeleton[0]['string_id'] = realm_name # subdomain / short_name of realm
zerver_realm_skeleton[0]['name'] = realm_name
zerver_realm_skeleton[0]['string_id'] = realm_subdomain # subdomain / short_name of realm
zerver_realm_skeleton[0]['name'] = realm_subdomain
zerver_realm_skeleton[0]['date_created'] = NOW
realm = dict(zerver_client=[{"name": "populate_db", "id": 1},