Switch to unified view

a/scripts/allura_import.py b/scripts/allura_import.py
...
...
15
#       specific language governing permissions and limitations
15
#       specific language governing permissions and limitations
16
#       under the License.
16
#       under the License.
17
17
18
import json
18
import json
19
from optparse import OptionParser
19
from optparse import OptionParser
20
from datetime import datetime
21
20
22
from allura.lib.import_api import AlluraImportApiClient
21
from allura.lib.import_api import AlluraImportApiClient
23
from forgetracker.scripts.import_tracker import import_tracker
22
from forgetracker.scripts.import_tracker import import_tracker
23
from forgewiki.scripts.wiki_from_trac.loaders import import_wiki
24
24
25
25
26
def main():
26
def main():
27
    optparser, options, args = parse_options()
27
    optparser, options, args = parse_options()
28
28
...
...
59
        import_tracker(cli, options.project, options.tracker, import_options, options, doc_txt,
59
        import_tracker(cli, options.project, options.tracker, import_options, options, doc_txt,
60
                       validate=options.validate,
60
                       validate=options.validate,
61
                       verbose=options.verbose)
61
                       verbose=options.verbose)
62
    elif options.forum:
62
    elif options.forum:
63
        import_forum(cli, options.project, options.forum, user_map, doc_txt, validate=options.validate)
63
        import_forum(cli, options.project, options.forum, user_map, doc_txt, validate=options.validate)
64
    elif options.wiki:
65
        import_wiki(cli, options.project, options.wiki, options, doc_txt)
64
66
65
67
66
def import_forum(cli, project, tool, user_map, doc_txt, validate=True):
68
def import_forum(cli, project, tool, user_map, doc_txt, validate=True):
67
    url = '/rest/p/' + project + '/' + tool
69
    url = '/rest/p/' + project + '/' + tool
68
    if validate:
70
    if validate:
...
...
80
    optparser.add_option('-a', '--api-ticket', dest='api_key', help='API ticket')
82
    optparser.add_option('-a', '--api-ticket', dest='api_key', help='API ticket')
81
    optparser.add_option('-s', '--secret-key', dest='secret_key', help='Secret key')
83
    optparser.add_option('-s', '--secret-key', dest='secret_key', help='Secret key')
82
    optparser.add_option('-p', '--project', dest='project', help='Project to import to')
84
    optparser.add_option('-p', '--project', dest='project', help='Project to import to')
83
    optparser.add_option('-t', '--tracker', dest='tracker', help='Tracker to import to')
85
    optparser.add_option('-t', '--tracker', dest='tracker', help='Tracker to import to')
84
    optparser.add_option('-f', '--forum', dest='forum', help='Forum tool to import to')
86
    optparser.add_option('-f', '--forum', dest='forum', help='Forum tool to import to')
87
    optparser.add_option('-w', '--wiki', dest='wiki', help='Wiki tool to import to')
85
    optparser.add_option('-u', '--base-url', dest='base_url', default='https://sourceforge.net', help='Base Allura URL (%default)')
88
    optparser.add_option('-u', '--base-url', dest='base_url', default='https://sourceforge.net', help='Base Allura URL (%default)')
86
    optparser.add_option('-o', dest='import_opts', default=[], action='append', help='Specify import option(s)', metavar='opt=val')
89
    optparser.add_option('-o', dest='import_opts', default=[], action='append', help='Specify import option(s)', metavar='opt=val')
87
    optparser.add_option('--user-map', dest='user_map_file', help='Map original users to SF.net users', metavar='JSON_FILE')
90
    optparser.add_option('--user-map', dest='user_map_file', help='Map original users to SF.net users', metavar='JSON_FILE')
88
    optparser.add_option('--validate', dest='validate', action='store_true', help='Validate import data')
91
    optparser.add_option('--validate', dest='validate', action='store_true', help='Validate import data')
89
    optparser.add_option('-v', '--verbose', dest='verbose', action='store_true', help='Verbose operation')
92
    optparser.add_option('-v', '--verbose', dest='verbose', action='store_true', help='Verbose operation')
...
...
98
    return optparser, options, args
101
    return optparser, options, args
99
102
100
103
101
if __name__ == '__main__':
104
if __name__ == '__main__':
102
    main()
105
    main()
103