create updateSettingsBasedOn... methods

Liturgical-Calendar · Jan 23, 2022 · 3b3822c · 3b3822c
1 parent 3319645
commit 3b3822c
Showing 1 changed file with 24 additions and 17 deletions.
diff --git a/includes/LitCalAPI.php b/includes/LitCalAPI.php
@@ -120,23 +120,7 @@ private function initParameterData() {
         }
     }
 
-
-    private function loadLocalCalendarData() : void {
-        if( $this->LitSettings->DiocesanCalendar !== null ){
-            //since a Diocesan calendar is being requested, we need to retrieve the JSON data
-            //first we need to discover the path, so let's retrieve our index file
-            if( file_exists( "nations/index.json" ) ){
-                $this->GeneralIndex = json_decode( file_get_contents( "nations/index.json" ) );
-                if( property_exists( $this->GeneralIndex, $this->LitSettings->DiocesanCalendar ) ){
-                    $diocesanDataFile = $this->GeneralIndex->{$this->LitSettings->DiocesanCalendar}->path;
-                    $this->LitSettings->NationalCalendar = $this->GeneralIndex->{$this->LitSettings->DiocesanCalendar}->nation;
-                    if( file_exists( $diocesanDataFile ) ){
-                        $this->DiocesanData = json_decode( file_get_contents( $diocesanDataFile ) );
-                    }
-                }
-            }
-        }
-
+    private function updateSettingsBasedOnNationalCalendar() : void {
         if( $this->LitSettings->NationalCalendar !== null ) {
             switch( $this->LitSettings->NationalCalendar ) {
                 case 'VATICAN':
@@ -159,7 +143,9 @@ private function loadLocalCalendarData() : void {
                 break;
             }
         }
+    }
 
+    private function updateSettingsBasedOnDiocesanCalendar() : void {
         if( $this->LitSettings->DiocesanCalendar !== null && $this->DiocesanData !== null ) {
             if( property_exists( $this->DiocesanData, "Overrides" ) ) {
                 foreach( $this->DiocesanData->Overrides as $key => $value ) {
@@ -185,6 +171,27 @@ private function loadLocalCalendarData() : void {
         }
     }
 
+
+    private function loadLocalCalendarData() : void {
+        if( $this->LitSettings->DiocesanCalendar !== null ){
+            //since a Diocesan calendar is being requested, we need to retrieve the JSON data
+            //first we need to discover the path, so let's retrieve our index file
+            if( file_exists( "nations/index.json" ) ){
+                $this->GeneralIndex = json_decode( file_get_contents( "nations/index.json" ) );
+                if( property_exists( $this->GeneralIndex, $this->LitSettings->DiocesanCalendar ) ){
+                    $diocesanDataFile = $this->GeneralIndex->{$this->LitSettings->DiocesanCalendar}->path;
+                    $this->LitSettings->NationalCalendar = $this->GeneralIndex->{$this->LitSettings->DiocesanCalendar}->nation;
+                    if( file_exists( $diocesanDataFile ) ){
+                        $this->DiocesanData = json_decode( file_get_contents( $diocesanDataFile ) );
+                    }
+                }
+            }
+        }
+
+        $this->updateSettingsBasedOnNationalCalendar();
+        $this->updateSettingsBasedOnDiocesanCalendar();
+    }
+
     private function cacheFileIsAvailable() : bool {
         $cacheFilePath = "engineCache/v" . str_replace( ".", "_", self::API_VERSION ) . "/";
         $cacheFileName = md5( serialize( $this->LitSettings) ) . $this->CacheDuration . "." . strtolower( $this->LitSettings->ReturnType );