diff --git a/redesign/import-announcements.py b/redesign/importing/import-announcements.py similarity index 96% rename from redesign/import-announcements.py rename to redesign/importing/import-announcements.py index b465a1c22..213b44640 100755 --- a/redesign/import-announcements.py +++ b/redesign/importing/import-announcements.py @@ -2,7 +2,7 @@ import sys, os, re, datetime -basedir = os.path.abspath(os.path.join(os.path.dirname(__file__), "..")) +basedir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../..")) sys.path = [ basedir ] + sys.path from ietf import settings @@ -14,8 +14,9 @@ management.setup_environ(settings) from redesign.person.models import * from redesign.group.models import * from redesign.announcements.models import * +from redesign.name.utils import name +from redesign.importing.utils import person_email from ietf.announcements.models import Announcement, PersonOrOrgInfo, AnnouncedTo, AnnouncedFrom -from importing.utils import * # assumptions: # - nomcom groups have been imported diff --git a/redesign/import-document-state.py b/redesign/importing/import-document-state.py similarity index 99% rename from redesign/import-document-state.py rename to redesign/importing/import-document-state.py index 05c712267..b8477cdc6 100755 --- a/redesign/import-document-state.py +++ b/redesign/importing/import-document-state.py @@ -2,7 +2,7 @@ import sys, os, re, datetime -basedir = os.path.abspath(os.path.join(os.path.dirname(__file__), "..")) +basedir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../..")) sys.path = [ basedir ] + sys.path from ietf import settings @@ -14,11 +14,11 @@ management.setup_environ(settings) from redesign.doc.models import * from redesign.group.models import * from redesign.name.models import * +from redesign.importing.utils import person_email +from redesign.name.utils import name from ietf.idtracker.models import InternetDraft, IDInternal, IESGLogin, DocumentComment, PersonOrOrgInfo, Rfc, IESGComment, IESGDiscuss, BallotInfo, Position from ietf.idrfc.models import RfcIndex, DraftVersions -from importing.utils import * - import sys document_name_to_import = None diff --git a/redesign/import-groups.py b/redesign/importing/import-groups.py similarity index 96% rename from redesign/import-groups.py rename to redesign/importing/import-groups.py index 3a4dc051d..48632e966 100755 --- a/redesign/import-groups.py +++ b/redesign/importing/import-groups.py @@ -2,7 +2,7 @@ import sys, os -basedir = os.path.abspath(os.path.join(os.path.dirname(__file__), "..")) +basedir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../..")) sys.path = [ basedir ] + sys.path from ietf import settings @@ -14,21 +14,13 @@ management.setup_environ(settings) from redesign.group.models import * from redesign.name.models import * +from redesign.name.utils import name from ietf.idtracker.models import AreaGroup, IETFWG, Area, AreaGroup, Acronym, AreaWGURL, IRTF, ChairsHistory, Role # imports IETFWG, Area, AreaGroup, Acronym, IRTF # also creates nomcom groups -# make sure we got the names -def name(name_class, slug, name, desc=""): - # create if it doesn't exist, set name and desc - obj, _ = name_class.objects.get_or_create(slug=slug) - obj.name = name - obj.desc = desc - obj.save() - return obj - state_names = dict( bof=name(GroupStateName, slug="bof", name="BOF"), proposed=name(GroupStateName, slug="proposed", name="Proposed"), diff --git a/redesign/import-roles.py b/redesign/importing/import-roles.py similarity index 98% rename from redesign/import-roles.py rename to redesign/importing/import-roles.py index 2ddbca008..e1fe5b118 100755 --- a/redesign/import-roles.py +++ b/redesign/importing/import-roles.py @@ -3,7 +3,7 @@ import sys, os, re, datetime import unaccent -basedir = os.path.abspath(os.path.join(os.path.dirname(__file__), "..")) +basedir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../..")) sys.path = [ basedir ] + sys.path from ietf import settings @@ -15,9 +15,10 @@ management.setup_environ(settings) from redesign.person.models import * from redesign.group.models import * from redesign.name.models import * +from redesign.name.utils import name +from redesign.importing.utils import person_email from ietf.idtracker.models import IESGLogin, AreaDirector, IDAuthor, PersonOrOrgInfo, WGChair, WGEditor, WGSecretary, WGTechAdvisor, ChairsHistory, Role as OldRole, Acronym, IRTFChair -from importing.utils import * # assumptions: # - groups have been imported diff --git a/redesign/importing/utils.py b/redesign/importing/utils.py index 29ae77809..92d056f60 100644 --- a/redesign/importing/utils.py +++ b/redesign/importing/utils.py @@ -1,12 +1,3 @@ -def name(name_class, slug, name, desc="", order=0): - # create if it doesn't exist, set name and desc - obj, _ = name_class.objects.get_or_create(slug=slug) - obj.name = name - obj.desc = desc - obj.order = order - obj.save() - return obj - def person_email(person): hardcoded_emails = { 'Dinara Suleymanova': "dinaras@ietf.org" } diff --git a/redesign/name/utils.py b/redesign/name/utils.py new file mode 100644 index 000000000..c4c47db94 --- /dev/null +++ b/redesign/name/utils.py @@ -0,0 +1,8 @@ +def name(name_class, slug, name, desc="", order=0): + # create if it doesn't exist, set name and desc + obj, _ = name_class.objects.get_or_create(slug=slug) + obj.name = name + obj.desc = desc + obj.order = order + obj.save() + return obj