opex-manifest-generator 1.2.0__py3-none-any.whl → 1.2.1__py3-none-any.whl

opex_manifest_generator/opex_manifest.py

@@ -19,6 +19,9 @@ from opex_manifest_generator.common import *
 import configparser
 
 class OpexManifestGenerator():
+    """
+    A Tool for Generating Opexes 
+    """
     def __init__(self,
                  root: str,
                  output_path: str = os.getcwd(),
@@ -80,6 +83,7 @@ class OpexManifestGenerator():
         self.keywords_retain_order = keywords_retain_order
         self.sort_key = sort_key
         self.keywords_abbreviation_number = keywords_abbreviation_number
+        self.delimiter = delimiter
 
         self.title_flag = False
         self.description_flag = False
@@ -218,7 +222,7 @@ class OpexManifestGenerator():
                 return False
             else:
                 remove = check_nan(self.df[REMOVAL_FIELD].loc[idx].item())
-                if remove is True:                  
+                if remove is not None:
                     removed_list.append(path)
                     print(f"Removing: {path}")
                     if os.path.isdir(path):
@@ -451,6 +455,7 @@ class OpexDir(OpexManifestGenerator):
             self.folder_path = folder_path.replace(u'\\\\?\\', "")
         else:
             self.folder_path = folder_path
+        print(self.folder_path)
         if any([self.OMG.input,
                 self.OMG.autoclass_flag in {"c","catalog","a","accession","b","both","cg","catalog-generic","ag","accession-generic","bg","both-generic"},
                 self.OMG.ignore_flag,
@@ -464,22 +469,17 @@ class OpexDir(OpexManifestGenerator):
             index = None
         else:
             index = None
-        if self.OMG.ignore_flag or self.OMG.remove_flag:
-            if self.OMG.ignore_flag:
-                self.ignore = self.OMG.ignore_df_lookup(index)
-                if self.ignore:
-                    return
-            else:
-                self.ignore = False
-            if self.OMG.remove_flag:
-                self.removal = self.OMG.remove_df_lookup(self.folder_path, self.OMG.remove_list, index)
-                if self.removal:
-                    return
-            else: 
-                self.removal = False
-        else:
-            self.ignore = False
-            self.removal = False
+        self.ignore = False
+        self.removal = False
+        if self.OMG.ignore_flag:
+            self.ignore = self.OMG.ignore_df_lookup(index)
+            if self.ignore:
+                return
+        if self.OMG.remove_flag:
+            self.removal = self.OMG.remove_df_lookup(self.folder_path, self.OMG.remove_list, index)
+            if self.removal:
+                return
+        print(self.removal)
         self.xmlroot = ET.Element(f"{{{self.opexns}}}OPEXMetadata", nsmap={"opex":self.opexns})
         self.transfer = ET.SubElement(self.xmlroot, f"{{{self.opexns}}}Transfer")
         self.manifest = ET.SubElement(self.transfer, f"{{{self.opexns}}}Manifest")
@@ -584,22 +584,16 @@ class OpexFile(OpexManifestGenerator):
                 index = None
             else:
                 index = None
-            if self.OMG.ignore_flag or self.OMG.remove_flag:
-                if self.OMG.ignore_flag:
-                    self.ignore = self.OMG.ignore_df_lookup(index)
-                    if self.ignore:
-                        return
-                else:
-                    self.ignore = False
-                if self.OMG.remove_flag:
-                    self.removal = self.OMG.remove_df_lookup(self.file_path, self.OMG.remove_list, index)
-                    if self.removal:
-                        return
-                else: 
-                    self.removal = False
-            else:
-                self.ignore = False
-                self.removal = False
+            self.ignore = False
+            self.removal = False
+            if self.OMG.ignore_flag:
+                self.ignore = self.OMG.ignore_df_lookup(index)
+                if self.ignore:
+                    return                    
+            if self.OMG.remove_flag:
+                self.removal = self.OMG.remove_df_lookup(self.file_path, self.OMG.remove_list, index)
+                if self.removal:
+                    return
             self.algorithm = algorithm
             if self.OMG.title_flag or self.OMG.description_flag or self.OMG.security_flag:
                 self.title, self.description, self.security = self.OMG.xip_df_lookup(index) 

{opex_manifest_generator-1.2.0.dist-info → opex_manifest_generator-1.2.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: opex_manifest_generator
-Version: 1.2.0
+Version: 1.2.1
 Summary: Opex Manifest Generator Tool for use with Opex / Preservica
 Author-email: Christopher Prince <c.pj.prince@gmail.com>
 Project-URL: Homepage, https://github.com/CPJPRINCE/opex_manifest_generator

{opex_manifest_generator-1.2.0.dist-info → opex_manifest_generator-1.2.1.dist-info}/RECORD

@@ -2,7 +2,7 @@ opex_manifest_generator/__init__.py,sha256=fsN-dLjNMn-AfjeG2jkryzIa69bY09B5xLTqW
 opex_manifest_generator/cli.py,sha256=Y8oo1CZzx_AXfXmjtBbhGgn3j53t2KgeBlB-5Pc_ZZI,12030
 opex_manifest_generator/common.py,sha256=vVDNlERDoI2WxEhpDYqnJC7oC9N1xQC2yxHjwuNus4Y,1895
 opex_manifest_generator/hash.py,sha256=mpLP-BqqDC7BuQQ5TEc4jaIBGabW-qVr128JaZq54mY,992
-opex_manifest_generator/opex_manifest.py,sha256=VBbArkAfDRmTuf59RDS5MZtPfrW2gcMetrLNxXwnCcs,32055
+opex_manifest_generator/opex_manifest.py,sha256=LcNp_4nqBBC-xiG6otDHufodCwTYmfxwhREa3WoBmVI,31734
 opex_manifest_generator/options.properties,sha256=UKERpUH6M6SWXbXN2XitbPd1FvT4LlCbLfoHbdWuDAQ,286
 opex_manifest_generator/metadata/DublinCore Template.xml,sha256=csNGXzSH27Whs4BQNuwMZl8nLSdDq7Y_OblTfzeBqWQ,775
 opex_manifest_generator/metadata/EAD Template.xml,sha256=OsWjUfKiLAsc1zqm56auyFSDYMuZpu6a49AFgqZNzlU,2167
@@ -14,9 +14,9 @@ opex_manifest_generator/samples/spreads/dctemplate.xlsx,sha256=R33CNcBK3s-KFYEhm
 opex_manifest_generator/samples/spreads/eadtemplate.xlsx,sha256=4lrP0LLZXwv73fl3fvqr7yqpdDJuRj2D4ZADQ4OS6Ps,19299
 opex_manifest_generator/samples/spreads/gdprtemplate.xlsx,sha256=3k6FpN6n83yF5wYd64Yy8Rxv2b1Z497icIB8UBGDW-M,18662
 opex_manifest_generator/samples/spreads/modstemplate.xlsx,sha256=5kNpp4Cju_POvnTrgFk34OJVe5yc6o3R4ZNX2TT8zAc,19509
-opex_manifest_generator-1.2.0.dist-info/LICENSE.md,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
-opex_manifest_generator-1.2.0.dist-info/METADATA,sha256=1q9TcPKrkgUQMiloGdUIBH09N2DfFAVSFkxGIJ2JGeI,685
-opex_manifest_generator-1.2.0.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-opex_manifest_generator-1.2.0.dist-info/entry_points.txt,sha256=WGMc3hWlqOsQ8DcTuy8-DyBbJKkWNImT4J1FasVDHts,70
-opex_manifest_generator-1.2.0.dist-info/top_level.txt,sha256=K48eGnaDLVO6YDJdAZLqbeoZvJHBGX25cvYT-i8gWt0,24
-opex_manifest_generator-1.2.0.dist-info/RECORD,,
+opex_manifest_generator-1.2.1.dist-info/LICENSE.md,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
+opex_manifest_generator-1.2.1.dist-info/METADATA,sha256=aF1tEDBhWzVq3MpGiOJWJdwlhRlc8sEIv0r1wv07yZA,685
+opex_manifest_generator-1.2.1.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+opex_manifest_generator-1.2.1.dist-info/entry_points.txt,sha256=WGMc3hWlqOsQ8DcTuy8-DyBbJKkWNImT4J1FasVDHts,70
+opex_manifest_generator-1.2.1.dist-info/top_level.txt,sha256=K48eGnaDLVO6YDJdAZLqbeoZvJHBGX25cvYT-i8gWt0,24
+opex_manifest_generator-1.2.1.dist-info/RECORD,,