fixed a few ia md --remove bugs.

jjjake · Feb 11, 2021 · 55431a5 · 55431a5
1 parent f9cbcb2
commit 55431a5
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 18 deletions.
diff --git a/HISTORY.rst b/HISTORY.rst
@@ -3,6 +3,16 @@
 Release History
 ---------------
 
+2.0.0 (?)
++++++++++
+
+**Bugfixes**
+
+- Fixed bug in ``ia metadata --remove ...`` where multiple collections would be removed
+  if the specified collection was a substring of any of the existing collections.
+- Fixed bug in ``ia metadata --remove ...`` where removing multiple collections was sometimes
+  not supported.
+
 1.9.9 (2021-01-27)
 ++++++++++++++++++
 

diff --git a/internetarchive/__init__.py b/internetarchive/__init__.py
@@ -37,7 +37,7 @@
 from __future__ import absolute_import
 
 __title__ = 'internetarchive'
-__version__ = '1.9.9'
+__version__ = '2.0.0.dev1'
 __author__ = 'Jacob M. Johnson'
 __license__ = 'AGPL 3'
 __copyright__ = 'Copyright (C) 2012-2019 Internet Archive'

diff --git a/internetarchive/cli/ia_metadata.py b/internetarchive/cli/ia_metadata.py
@@ -106,21 +106,31 @@ def remove_metadata(item, metadata, args):
             print('{0}/metadata/{1} does not exist, skipping.'.format(
                 item.identifier, key), file=sys.stderr)
             continue
-        elif key == 'collection' and metadata[key] not in src_md:
-            r = item.remove_from_simplelist(metadata[key], 'holdings')
-            j = r.json()
-            if j.get('success'):
-                print('{} - success: {} no longer in {}'.format(
-                      item.identifier, item.identifier, metadata[key]))
-                sys.exit(0)
-            elif j.get('error', '').startswith('no row to delete for'):
-                print('{} - success: {} no longer in {}'.format(
-                      item.identifier, item.identifier, metadata[key]))
-                sys.exit(0)
-            else:
-                print('{} - error: {}'.format(item.identifier, j.get('error')))
-            sys.exit()
-        elif not isinstance(src_md, list):
+
+        if key == 'collection':
+            _col = copy(metadata[key])
+            _src_md = copy(src_md)
+            if not isinstance(_col, list):
+                _col = [_col]
+            if not isinstance(_src_md, list):
+                _src_md = [_src_md]
+            for c in _col:
+                if c not in _src_md:
+                    r = item.remove_from_simplelist(c, 'holdings')
+                    j = r.json()
+                    if j.get('success'):
+                        print('{} - success: {} no longer in {}'.format(
+                              item.identifier, item.identifier, c))
+                        sys.exit(0)
+                    elif j.get('error', '').startswith('no row to delete for'):
+                        print('{} - success: {} no longer in {}'.format(
+                              item.identifier, item.identifier, c))
+                        sys.exit(0)
+                    else:
+                        print('{} - error: {}'.format(item.identifier, j.get('error')))
+                        sys.exit(1)
+
+        if not isinstance(src_md, list):
             if key == 'subject':
                 src_md = src_md.split(';')
             elif key == 'collection':
@@ -133,8 +143,12 @@ def remove_metadata(item, metadata, args):
                 continue
 
         for x in src_md:
-            if x not in metadata[key]:
-                md[key].append(x)
+            if isinstance(metadata[key], list):
+                if x not in metadata[key]:
+                    md[key].append(x)
+            else:
+                if x != metadata[key]:
+                    md[key].append(x)
 
         if len(md[key]) == len(src_md):
             del md[key]