Merge pull request #16 from EmmasBox/dev

Dev

Author: EmmasBox

record_definition.py

@@ -0,0 +1,28 @@
+#This module contains the classes used to define the data structure of the IRRBU00 records
+
+from dataclasses import dataclass
+from enum import Enum
+
+class Record:
+    """Defines a record type that can be parsed, i.e. Group basic data record, 0100"""
+    def __init__(self,name: str,identifier: str, fields: list):
+        self.name = name
+        self.identifier = identifier
+        self.fields = fields
+
+class DataType(Enum):
+    Char = 1
+    Int = 2
+    Date = 3
+    Time = 4
+
+@dataclass
+class Field:
+    """The field class is used when defining a record type, it specifies when a field starts and ends"""
+    name: str
+    data_type: DataType
+    start: int
+    end: int
+
+    def get_range(self):
+        return (self.start, self.end)

records.py

@@ -1,25 +1,28 @@
-import ztarfruit as zfruit
+#This module defines all of the records and fields that can exist in IRRDBU00 output
+
+import record_definition as definition
 
 #0100
 group_basic_data_record_fields = [
-    zfruit.Field(name="GPBD_NAME",data_type=zfruit.DataType.Char,start=6,end=13),
-    zfruit.Field(name="GPBD_SUPGRP_ID",data_type=zfruit.DataType.Char,start=15,end=22),
-    zfruit.Field(name="GPBD_CREATE_DATE",data_type=zfruit.DataType.Char,start=24,end=33),
-    zfruit.Field(name="GPBD_OWNER_ID",data_type=zfruit.DataType.Char,start=35,end=42),
-    zfruit.Field(name="GPBD_UACC",data_type=zfruit.DataType.Char,start=44,end=51),
-    zfruit.Field(name="GPBD_NOTERMUACC",data_type=zfruit.DataType.Char,start=53,end=56),
-    zfruit.Field(name="GPBD_INSTALL_DATA",data_type=zfruit.DataType.Char,start=58,end=312),
-    zfruit.Field(name="GPBD_MODEL",data_type=zfruit.DataType.Char,start=314,end=357),
-    zfruit.Field(name="GPBD_UNIVERSAL",data_type=zfruit.DataType.Char,start=359,end=362)
+    definition.Field(name="GPBD_NAME",data_type=DataType.Char,start=6,end=13),
+    definition.Field(name="GPBD_SUPGRP_ID",data_type=DataType.Char,start=15,end=22),
+    definition.Field(name="GPBD_CREATE_DATE",data_type=DataType.Char,start=24,end=33),
+    definition.Field(name="GPBD_OWNER_ID",data_type=DataType.Char,start=35,end=42),
+    definition.Field(name="GPBD_UACC",data_type=DataType.Char,start=44,end=51),
+    definition.Field(name="GPBD_NOTERMUACC",data_type=DataType.Char,start=53,end=56),
+    definition.Field(name="GPBD_INSTALL_DATA",data_type=DataType.Char,start=58,end=312),
+    definition.Field(name="GPBD_MODEL",data_type=DataType.Char,start=314,end=357),
+    definition.Field(name="GPBD_UNIVERSAL",data_type=DataType.Char,start=359,end=362)
 ]
 
 #0101
 group_subgroups_data_record_fields = [
-    zfruit.Field(name="GPSGRP_NAME",data_type=zfruit.DataType.Char,start=6,end=13),
-    zfruit.Field(name="GPSGRP_SUBGRP_ID",data_type=zfruit.DataType.Char,start=15,end=22),
+    definition.Field(name="GPSGRP_NAME",data_type=DataType.Char,start=6,end=13),
+    definition.Field(name="GPSGRP_SUBGRP_ID",data_type=DataType.Char,start=15,end=22),
 ]
 
-records = [
-    zfruit.Record(name="Group basic data record",identifier="0100",fields=group_basic_data_record_fields),
-    zfruit.Record(name="Group subgroups record",identifier="0101",fields=group_subgroups_data_record_fields)
+#Records
+database_records = [
+    definition.Record(name="Group basic data record",identifier="0100",fields=group_basic_data_record_fields),
+    definition.Record(name="Group subgroups record",identifier="0101",fields=group_subgroups_data_record_fields)
 ]

ztarfruit.py

@@ -1,17 +1,16 @@
-#Zstarfruit for RACF
+#Ztarfruit for RACF
 #Dependencies: Python >=3.12.x and >=ZOAU 1.3.x
 #Utility to parse output from IRRDBU00 and offer the data through an API
 
 from zoautil_py import datasets
-from dataclasses import dataclass
 from datetime import datetime
 import os
 import json
 import tomllib
 import re
 import argparse
-import sqlalchemy 
-from enum import Enum
+import sqlalchemy
+from records import database_records
 
 parser = argparse.ArgumentParser(
     prog='Ztarfruit for RACF',
@@ -22,7 +21,7 @@
 
 #Flags and arguments to specify in the command line
 parser.add_argument('-i', '--input')
-parser.add_argument('-r', '--reset')
+parser.add_argument('-r', '--reset', action='store_true')
 parser.add_argument('-o', '--obfuscate', action='store_true')
 
 args = parser.parse_args()
@@ -40,27 +39,26 @@
 
 #Input dataset to parse
 input_dataset = args.input or data_settings["input_dataset"]
+    
+#This function loads in the IRRDBU00 output, internal function please ignore
+def load_input():
+    if datasets.exists(input_dataset):
+        print("Target dataset exists")
+        output = datasets.read(input_dataset)
+        return output
+    else:
+        return ""
+        
+if input_dataset != "":
+    dataset_contents = load_input()
+    input_path = "./temp.txt"
 
-class Record:
-    """Defines a record type that can be parsed, i.e. Group basic data record, 0100"""
-    def __init__(self,name: str,identifier: str, fields: list):
-        self.name = name
-        self.identifier = identifier
-        self.fields = fields
+    #remove input data in case the utility has been ran before
+    if os.path.exists(input_path):
+        os.remove(input_path)
 
-class DataType(Enum):
-    Char = 1
-    Int = 2
-    Date = 3
-    Time = 4
-
-@dataclass
-class Field:
-    """The field class is used when defining a record type, it specifies when a field starts and ends"""
-    name: str
-    data_type: DataType
-    start: int
-    end: int
-
-    def get_range(self):
-        return (self.start, self.end)
+    rInput = open(input_path, "a")
+    rInput.write(dataset_contents)
+    rInput.close()
+    print(f"Temp file size: {os.path.getsize(input_path)} bytes")
+