opex-manifest-generator 1.3.1__tar.gz → 1.3.3__tar.gz

{opex_manifest_generator-1.3.1 → opex_manifest_generator-1.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: opex_manifest_generator
-Version: 1.3.1
+Version: 1.3.3
 Summary: An Opex Manifest Generator tool for use with OPEX Files, as designed by Preservica
 Author-email: Christopher Prince <c.pj.prince@gmail.com>
 License-Expression: Apache-2.0

{opex_manifest_generator-1.3.1 → opex_manifest_generator-1.3.3}/opex_manifest_generator/opex_manifest.py

@@ -239,7 +239,7 @@ class OpexManifestGenerator():
             self.column_headers = self.df.columns.values.tolist()
             self.set_input_flags()
             if self.export_flag:
-                output_path = define_output_file(self.output_path, self.root, meta_dir_flag = self.meta_dir_flag, output_format = self.output_format)                
+                output_path = define_output_file(self.output_path, self.root, METAFOLDER, meta_dir_flag = self.meta_dir_flag, output_format = self.output_format)                
                 if self.output_format == "xlsx":
                     export_xl(self.df, output_path)
                 elif self.output_format == "csv":
@@ -277,7 +277,7 @@ class OpexManifestGenerator():
                     print(f'Cleared Opex: {file_path}')
     
     def index_df_lookup(self, path: str) -> pd.Index:
-        idx = self.df[INDEX_FIELD].index[self.df[INDEX_FIELD] == path]
+        idx = self.df.loc[self.df[INDEX_FIELD ==path], INDEX_FIELD].index
         return idx
 
     def xip_df_lookup(self, idx: pd.Index) -> tuple:
@@ -289,11 +289,11 @@ class OpexManifestGenerator():
                 pass
             else:
                 if self.title_flag:
-                    title = check_nan(self.df[TITLE_FIELD].loc[idx].item())
+                    title = check_nan(self.df.loc[idx,TITLE_FIELD].item())
                 if self.description_flag:
-                    description = check_nan(self.df[DESCRIPTION_FIELD].loc[idx].item())
+                    description = check_nan(self.df.loc[idx,DESCRIPTION_FIELD].item())
                 if self.security_flag:
-                    security = check_nan(self.df[SECURITY_FIELD].loc[idx].item())
+                    security = check_nan(self.df.loc[idx,SECURITY_FIELD].item())
             return title,description,security
         except Exception as e:
             print('Error Looking up XIP Metadata')
@@ -304,7 +304,7 @@ class OpexManifestGenerator():
             if idx.empty:
                 return False
             else:
-                remove = check_nan(self.df[REMOVAL_FIELD].loc[idx].item())
+                remove = check_nan(self.df.loc[idx,REMOVAL_FIELD].item())
                 if remove is not None:
                     return True
                 else:
@@ -318,7 +318,7 @@ class OpexManifestGenerator():
             if idx.empty:
                 return False
             else:
-                ignore = check_nan(self.df[IGNORE_FIELD].loc[idx].item())
+                ignore = check_nan(self.df.loc[idx,IGNORE_FIELD].item())
             return bool(ignore)
         except Exception as e:
             print('Error looking up Ignore')
@@ -329,7 +329,7 @@ class OpexManifestGenerator():
             if idx.empty:
                 pass
             else:
-                sourceid = check_nan(self.df[SOURCEID_FIELD].loc[idx].item())
+                sourceid = check_nan(self.df.loc[idx,SOURCEID_FIELD].item())
                 if sourceid:
                     source_xml = ET.SubElement(xml_element,f"{{{self.opexns}}}SourceID")
                     source_xml.text = str(sourceid)
@@ -344,8 +344,8 @@ class OpexManifestGenerator():
             else:
                 for algorithm_type in self.algorithm:
                     self.fixity = ET.SubElement(xml_fixities,f"{{{self.opexns}}}Fixity")  
-                    self.hash = self.df[HASH_FIELD].loc[idx].item()
-                    self.algorithm = self.df[ALGORITHM_FIELD].loc[idx].item()
+                    self.hash = self.df.loc[idx,HASH_FIELD].item()
+                    self.algorithm = self.df.loc[idx,ALGORITHM_FIELD].item()
                     self.fixity.set('type', algorithm_type)
                     self.fixity.set('value',self.hash)
         except Exception as e:
@@ -370,7 +370,7 @@ class OpexManifestGenerator():
                             key_name = ACCREF_CODE
                         else:
                             key_name = IDENTIFIER_DEFAULT
-                        ident = check_nan(self.df[header].loc[idx].item())                    
+                        ident = check_nan(self.df.loc[idx,header].item())                    
                         if ident:
                             self.identifier = ET.SubElement(self.identifiers, f"{{{self.opexns}}}Identifier") 
                             self.identifier.set("type", key_name)
@@ -431,10 +431,10 @@ class OpexManifestGenerator():
                         ns = elem_dict.get('Namespace')
                         try:
                             if self.metadata_flag in {'e', 'exact'}:
-                                val_series = self.df[path].loc[idx]
+                                val_series = self.df.loc[idx,path]
                                 val = check_nan(val_series.item())
                             elif self.metadata_flag in {'f', 'flat'}:
-                                val_series = self.df[name].loc[idx]
+                                val_series = self.df.loc[idx,name]
                                 val = check_nan(val_series.item())
                             if val is None:
                                 continue
@@ -527,11 +527,11 @@ class OpexManifestGenerator():
             self.init_generate_descriptive_metadata()
         OpexDir(self, self.root).generate_opex_dirs(self.root)
         if self.algorithm:
-            output_path = define_output_file(self.output_path, self.root, self.meta_dir_flag, output_suffix = FIXITY_SUFFIX, output_format = "txt")
+            output_path = define_output_file(self.output_path, self.root, METAFOLDER, self.meta_dir_flag, output_suffix = FIXITY_SUFFIX, output_format = "txt")
             if self.fixity_export_flag:
                 export_list_txt(self.list_fixity, output_path)
         if self.removal_flag:
-            output_path = define_output_file(self.output_path, self.root, self.meta_dir_flag, output_suffix = REMOVALS_SUFFIX, output_format = "txt")
+            output_path = define_output_file(self.output_path, self.root, METADFOLDER, self.meta_dir_flag, output_suffix = REMOVALS_SUFFIX, output_format = "txt")
             export_list_txt(self.removal_list, output_path)
         print_running_time(self.start_time)
 

{opex_manifest_generator-1.3.1 → opex_manifest_generator-1.3.3}/opex_manifest_generator.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: opex_manifest_generator
-Version: 1.3.1
+Version: 1.3.3
 Summary: An Opex Manifest Generator tool for use with OPEX Files, as designed by Preservica
 Author-email: Christopher Prince <c.pj.prince@gmail.com>
 License-Expression: Apache-2.0

{opex_manifest_generator-1.3.1 → opex_manifest_generator-1.3.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "opex_manifest_generator"
-version = "1.3.1"
+version = "1.3.3"
 authors = [
     {name="Christopher Prince", email="c.pj.prince@gmail.com"}
     ]