From d55aea9ea453183b200882f235529342a2c50d00 Mon Sep 17 00:00:00 2001 From: Matt Date: Thu, 27 Sep 2018 12:31:17 +0200 Subject: [PATCH] renamed JsonPreloaders to ApiDtaPreloaders --- Assets/RothenburgAR/Scripts/AppInitializerBehaviour.cs | 4 ++-- ...itionJsonPreloader.cs => ExhibitionApiDataPreloader.cs} | 7 +++++-- ...reloader.cs.meta => ExhibitionApiDataPreloader.cs.meta} | 0 .../{PoiJsonPreloader.cs => PoiApiDataPreloader.cs} | 3 +-- ...oiJsonPreloader.cs.meta => PoiApiDataPreloader.cs.meta} | 0 5 files changed, 8 insertions(+), 6 deletions(-) rename Assets/RothenburgAR/Scripts/Exhibition/{ExhibitionJsonPreloader.cs => ExhibitionApiDataPreloader.cs} (94%) rename Assets/RothenburgAR/Scripts/Exhibition/{ExhibitionJsonPreloader.cs.meta => ExhibitionApiDataPreloader.cs.meta} (100%) rename Assets/RothenburgAR/Scripts/PointOfInterest/{PoiJsonPreloader.cs => PoiApiDataPreloader.cs} (98%) rename Assets/RothenburgAR/Scripts/PointOfInterest/{PoiJsonPreloader.cs.meta => PoiApiDataPreloader.cs.meta} (100%) diff --git a/Assets/RothenburgAR/Scripts/AppInitializerBehaviour.cs b/Assets/RothenburgAR/Scripts/AppInitializerBehaviour.cs index aa38c80..cfeb806 100644 --- a/Assets/RothenburgAR/Scripts/AppInitializerBehaviour.cs +++ b/Assets/RothenburgAR/Scripts/AppInitializerBehaviour.cs @@ -35,13 +35,13 @@ namespace RothenburgAR PoiDataManager.Instance.AddPoiPreloader(new PoiXmlPreloader()); PoiDataManager.Instance.AddPoiDataSourcePath(PathHelper.ExhibitionPath); - PoiDataManager.Instance.AddPoiPreloader(new PoiJsonPreloader()); + PoiDataManager.Instance.AddPoiPreloader(new PoiApiDataPreloader()); PoiDataManager.Instance.LoadEverySourcePath(); ExhibitionManager.Instance.AddExhibitionSourcePath(PathHelper.ExhibitionPath); ExhibitionManager.Instance.AddExhibitionPreloader(new ExhibitionXmlPreloader()); - ExhibitionManager.Instance.AddExhibitionPreloader(new ExhibitionJsonPreloader()); + ExhibitionManager.Instance.AddExhibitionPreloader(new ExhibitionApiDataPreloader()); ExhibitionManager.Instance.LoadEverySourcePath( (int maxPaths, int currentPaths, int subMaxExhibitions, int subCurrentExhibition) => diff --git a/Assets/RothenburgAR/Scripts/Exhibition/ExhibitionJsonPreloader.cs b/Assets/RothenburgAR/Scripts/Exhibition/ExhibitionApiDataPreloader.cs similarity index 94% rename from Assets/RothenburgAR/Scripts/Exhibition/ExhibitionJsonPreloader.cs rename to Assets/RothenburgAR/Scripts/Exhibition/ExhibitionApiDataPreloader.cs index 9a60105..d041a53 100644 --- a/Assets/RothenburgAR/Scripts/Exhibition/ExhibitionJsonPreloader.cs +++ b/Assets/RothenburgAR/Scripts/Exhibition/ExhibitionApiDataPreloader.cs @@ -10,12 +10,16 @@ using UnityEngine; namespace RothenburgAR.Exhibition { - public class ExhibitionJsonPreloader : IExhibitionPreloader + public class ExhibitionApiDataPreloader : IExhibitionPreloader { public bool CanLoadExhibitionDirectory(string exhibitionDirectory) { if (!Directory.Exists(exhibitionDirectory)) return false; + if (!File.Exists(Path.Combine(exhibitionDirectory, "tracker.xml"))) + return false; + if (!File.Exists(Path.Combine(exhibitionDirectory, "tracker.dat"))) + return false; var languageDirs = new DirectoryInfo(exhibitionDirectory).GetDirectories().Select(d => d.Name).ToList(); foreach (var dir in languageDirs) @@ -25,7 +29,6 @@ namespace RothenburgAR.Exhibition } // Todo: More validations - return true; } diff --git a/Assets/RothenburgAR/Scripts/Exhibition/ExhibitionJsonPreloader.cs.meta b/Assets/RothenburgAR/Scripts/Exhibition/ExhibitionApiDataPreloader.cs.meta similarity index 100% rename from Assets/RothenburgAR/Scripts/Exhibition/ExhibitionJsonPreloader.cs.meta rename to Assets/RothenburgAR/Scripts/Exhibition/ExhibitionApiDataPreloader.cs.meta diff --git a/Assets/RothenburgAR/Scripts/PointOfInterest/PoiJsonPreloader.cs b/Assets/RothenburgAR/Scripts/PointOfInterest/PoiApiDataPreloader.cs similarity index 98% rename from Assets/RothenburgAR/Scripts/PointOfInterest/PoiJsonPreloader.cs rename to Assets/RothenburgAR/Scripts/PointOfInterest/PoiApiDataPreloader.cs index fb4c392..fa6e4af 100644 --- a/Assets/RothenburgAR/Scripts/PointOfInterest/PoiJsonPreloader.cs +++ b/Assets/RothenburgAR/Scripts/PointOfInterest/PoiApiDataPreloader.cs @@ -10,7 +10,7 @@ using UnityEngine; namespace RothenburgAR.PointOfInterest { - public class PoiJsonPreloader : IPoiPreloader + public class PoiApiDataPreloader : IPoiPreloader { public bool CanLoadPoiDirectory(string poiDirectory) { @@ -25,7 +25,6 @@ namespace RothenburgAR.PointOfInterest } // Todo: More validations - return true; } diff --git a/Assets/RothenburgAR/Scripts/PointOfInterest/PoiJsonPreloader.cs.meta b/Assets/RothenburgAR/Scripts/PointOfInterest/PoiApiDataPreloader.cs.meta similarity index 100% rename from Assets/RothenburgAR/Scripts/PointOfInterest/PoiJsonPreloader.cs.meta rename to Assets/RothenburgAR/Scripts/PointOfInterest/PoiApiDataPreloader.cs.meta