backup/pywb
1
0
Fork 0
mirror of https://github.com/webrecorder/pywb.git synced 2025-03-15 00:03:28 +01:00
Code Issues Projects Releases Activity

wb-manager: rename 'migrate' to 'cdx-convert' for clarity

Browse Source
This commit is contained in:
Ilya Kreymer 2015-03-23 11:05:02 -07:00
parent 0faa6aac3e
commit da7532a1f8
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pywb/manager/manager.py
View File

@ -302,10 +302,10 @@ directory structure expected by pywb
migrate = MigrateCDX(path) migrate = MigrateCDX(path)
count = migrate.count_cdx() count = migrate.count_cdx()
if count == 0: if count == 0:
print('Index files up-to-date, nothing to migrate') print('Index files up-to-date, nothing to convert')
return return
msg = 'Migrate {0} index files? (y/n)'.format(count) msg = 'Convert {0} index files? (y/n)'.format(count)
if not force: if not force:
res = get_input(msg) res = get_input(msg)
try: try:
@ -449,7 +449,7 @@ Create manage file based web archive collections
m.migrate_cdxj(r.path, r.force) m.migrate_cdxj(r.path, r.force)
migrate_help = 'Convert any existing archive indexes to new json format' migrate_help = 'Convert any existing archive indexes to new json format'
migrate = subparsers.add_parser('migrate', help=migrate_help) migrate = subparsers.add_parser('convert-cdx', help=migrate_help)
migrate.add_argument('path', default='./', nargs='?') migrate.add_argument('path', default='./', nargs='?')
migrate.add_argument('-f', '--force', action='store_true') migrate.add_argument('-f', '--force', action='store_true')
migrate.set_defaults(func=do_migrate) migrate.set_defaults(func=do_migrate)

8
tests/test_auto_colls.py
View File

@ -419,7 +419,7 @@ class TestManagedColls(object):
assert '- nested' in output assert '- nested' in output
assert '- test' in output assert '- test' in output
def test_migrate(self): def test_convert_cdx(self):
""" Create non-surt cdx, then convert to cdxj """ Create non-surt cdx, then convert to cdxj
""" """
migrate_dir = os.path.join(self.root_dir, '_migrate') migrate_dir = os.path.join(self.root_dir, '_migrate')
@ -436,14 +436,14 @@ class TestManagedColls(object):
@patch('pywb.manager.manager.get_input', lambda x: 'blah') @patch('pywb.manager.manager.get_input', lambda x: 'blah')
def do_migrate_no(): def do_migrate_no():
main(['migrate', migrate_dir]) main(['convert-cdx', migrate_dir])
do_migrate_no() do_migrate_no()
assert os.listdir(migrate_dir) == cdxs assert os.listdir(migrate_dir) == cdxs
@patch('pywb.manager.manager.get_input', lambda x: 'y') @patch('pywb.manager.manager.get_input', lambda x: 'y')
def do_migrate_yes(): def do_migrate_yes():
main(['migrate', migrate_dir]) main(['convert-cdx', migrate_dir])
do_migrate_yes() do_migrate_yes()
cdxjs = os.listdir(migrate_dir) cdxjs = os.listdir(migrate_dir)
@ -455,7 +455,7 @@ class TestManagedColls(object):
assert fh.readline().startswith('org,iana)/ 20140126200624 {"url": "http://www.iana.org/",') assert fh.readline().startswith('org,iana)/ 20140126200624 {"url": "http://www.iana.org/",')
# Nothing else to migrate # Nothing else to migrate
main(['migrate', migrate_dir]) main(['convert-cdx', migrate_dir])
def test_auto_index(self): def test_auto_index(self):
main(['init', 'auto']) main(['init', 'auto'])