Changeset 3203 for trunk/sources/HeuristicLab.Hive.Client.Core

Timestamp:

03/23/10 10:50:26 (14 years ago)

Author:

kgrading

Message:

implemented the server on the client, using push & force push, added refresh buttons, added auto calender methods that traverse the tree... (#908)

Location:

trunk/sources/HeuristicLab.Hive.Client.Core/3.2

Files:

• ClientConsoleService/ClientConsoleCommunicator.cs (modified) (1 diff)
• ConfigurationManager/AppointmentContainer.cs (added)
• ConfigurationManager/UptimeManager.cs (modified) (4 diffs)
• Core.cs (modified) (4 diffs)
• Heartbeat.cs (modified) (1 diff)
• HeuristicLab.Hive.Client.Core-3.2.csproj (modified) (1 diff)

trunk/sources/HeuristicLab.Hive.Client.Core/3.2/ClientConsoleService/ClientConsoleCommunicator.cs

@@ -36 +36 @@
 
     public void SetUptimeCalendar(List<Appointment> appointments) {
-      UptimeManager.Instance.Appointments = appointments;
+      UptimeManager.Instance.SetAppointments(true, false, appointments);
     }
 
     public List<Appointment> GetUptimeCalendar() {
-      return UptimeManager.Instance.Appointments;
+      return UptimeManager.Instance.AppContainer.Appointments;
     }
 

trunk/sources/HeuristicLab.Hive.Client.Core/3.2/ConfigurationManager/UptimeManager.cs

@@ -7 +7 @@
 using System.IO;
 using HeuristicLab.Hive.Client.Common;
+using HeuristicLab.Hive.Contracts.BusinessObjects;
+using HeuristicLab.Hive.Contracts;
 
 namespace HeuristicLab.Hive.Client.Core.ConfigurationManager {
   public class UptimeManager {
 
-    private List<Appointment> appointments = null;
-    public List<Appointment> Appointments {
+    private AppointmentContainer _appContainer = null;
+    public AppointmentContainer AppContainer {
       get {
-        if (appointments == null)
+        if (_appContainer == null)
           RestoreFromHDD();
-        return appointments;
+        return _appContainer;
       }
-      set {
-        appointments = value;
-        PersistToHDD();
-      }
-    }
-    private static String path = System.IO.Directory.GetCurrentDirectory()+"\\plugins\\Hive.Client.Jobs\\";
+    }    
+    public bool CalendarAvailable { get; set; }
+
+    private static String path = System.IO.Directory.GetCurrentDirectory() + "\\plugins\\Hive.Client.Jobs\\";
 
     private static UptimeManager instance = null;
@@ -36 +36 @@
 
     private void PersistToHDD() {
-      XmlSerializer s = new XmlSerializer(typeof(List<Appointment>));
+      XmlSerializer s = new XmlSerializer(typeof(AppointmentContainer));
       if (!Directory.Exists(path))
         Directory.CreateDirectory(path);
@@ -42 +42 @@
       try {
         w = new StreamWriter(path + "calendar.xml");
-        s.Serialize(w, Appointments);  
-      } catch(Exception e) {
+        s.Serialize(w, AppContainer);
+      }
+      catch (Exception e) {
         Logging.Instance.Error(this.ToString(), "Persistance of the Calendar failed!", e);
-      } finally {
-        if(w!=null)
+      }
+      finally {
+        if (w != null)
           w.Close();
       }
@@ -52 +54 @@
 
     private void RestoreFromHDD() {
-      XmlSerializer s = new XmlSerializer(typeof(List<Appointment>));
-      if(File.Exists(Path.Combine(path, "calendar.xml"))) {
+      XmlSerializer s = new XmlSerializer(typeof(AppointmentContainer));
+      if (File.Exists(Path.Combine(path, "calendar.xml"))) {
         TextReader r = null;
-        
+
         try {
           r = new StreamReader(path + "calendar.xml");
-          Appointments = (List<Appointment>)s.Deserialize(r);        
-        } catch (Exception e) {
+          _appContainer = (AppointmentContainer)s.Deserialize(r);
+          CalendarAvailable = true;
+        }
+        catch (Exception e) {
           Logging.Instance.Error(this.ToString(), "Deserialization of Calendar failed", e);
           Logging.Instance.Info(this.ToString(), "Starting with a new one");
-          appointments = new List<Appointment>();
-        } finally {
-          if(r!=null)
-            r.Close();          
+          _appContainer = new AppointmentContainer();
+          CalendarAvailable = false;
+        }
+        finally {
+          if (r != null)
+            r.Close();
         }
       } else {
-        Appointments = new List<Appointment>();
+        _appContainer = new AppointmentContainer();
       }
     }
 
-    public bool isOnline() {
-      foreach (Appointment app in Appointments)
-        if ((DateTime.Now >= app.StartDate) &&
-            (DateTime.Now <= app.EndDate))
-          return true;
-      return false;
+    public bool IsOnline() {
+      return AppContainer.Appointments.Any(app => (DateTime.Now >= app.StartDate) && (DateTime.Now <= app.EndDate));
+    }
+
+    public bool SetAppointments(bool isLocal, bool isForced, IEnumerable<Appointment> appointments) {
+      if (!isForced && !isLocal && AppContainer.IsLocal)
+        return false;
+
+      AppContainer.Appointments = new List<Appointment>(appointments);
+      AppContainer.IsLocal = isLocal;
+      AppContainer.Updated = DateTime.Now;
+      CalendarAvailable = true;
+     
+      PersistToHDD();
+      
+      return true;
+    }
+
+    internal bool SetAppointments(bool isLocal, ResponseCalendar response) {
+      IList<Appointment> app = new List<Appointment>();
+      foreach (AppointmentDto appointmentDto in response.Appointments) {
+        app.Add(new Appointment {
+          AllDayEvent = appointmentDto.AllDayEvent,
+          EndDate = appointmentDto.EndDate,
+          StartDate = appointmentDto.StartDate,
+          Recurring = appointmentDto.Recurring,
+
+          RecurringId = appointmentDto.RecurringId,
+          Locked = true,
+          Subject = "Online",
+        });
+      }
+      return SetAppointments(isLocal, response.ForceFetch, app);
     }
   }

trunk/sources/HeuristicLab.Hive.Client.Core/3.2/Core.cs

@@ -88 +88 @@
         wcfService.SetIPAndPort(cc.IPAdress, cc.Port);
 
-      if (UptimeManager.Instance.isOnline())
+      if (!UptimeManager.Instance.CalendarAvailable || UptimeManager.Instance.IsOnline())
         wcfService.Connect();
 
@@ -191 +191 @@
           break;
 
+          //Fetch or Force Fetch Calendar!
+        case MessageContainer.MessageType.FetchOrForceFetchCalendar:
+          ResponseCalendar rescal = wcfService.GetCalendarSync(ConfigManager.Instance.GetClientInfo().Id);
+          if(rescal.Success) {
+            if(!UptimeManager.Instance.SetAppointments(false, rescal)) {
+              wcfService.SetCalendarStatus(ConfigManager.Instance.GetClientInfo().Id, CalendarState.NotAllowedToFetch);              
+            } else {
+              wcfService.SetCalendarStatus(ConfigManager.Instance.GetClientInfo().Id, CalendarState.Fetched);              
+            }
+          } else {
+            wcfService.SetCalendarStatus(ConfigManager.Instance.GetClientInfo().Id, CalendarState.NotAllowedToFetch);
+          }
+        break;
 
         //Hard shutdown of the client
@@ -263 +276 @@
       Logging.Instance.Info(this.ToString(), "END: Sended snapshot sync");
       //Uptime Limit reached, now is a good time to destroy this jobs.
-      if (!UptimeManager.Instance.isOnline()) {
+      if (!UptimeManager.Instance.IsOnline()) {
         KillAppDomain(jId);
         //Still anything running?
@@ -381 +394 @@
     /// <param name="e"></param>
     void wcfService_Connected(object sender, EventArgs e) {
-      wcfService.LoginSync(ConfigManager.Instance.GetClientInfo());
-      JobStorageManager.CheckAndSubmitJobsFromDisc();
-      currentlyFetching = false;
+      if (!UptimeManager.Instance.CalendarAvailable) {
+        ResponseCalendar calres = wcfService.GetCalendarSync(ConfigManager.Instance.GetClientInfo().Id);
+        if(calres.Success) {
+          if (UptimeManager.Instance.SetAppointments(false, calres))
+            wcfService.SetCalendarStatus(ConfigManager.Instance.GetClientInfo().Id, CalendarState.Fetched);
+          else
+            wcfService.SetCalendarStatus(ConfigManager.Instance.GetClientInfo().Id, CalendarState.NotAllowedToFetch);
+        }
+        else {
+          wcfService.SetCalendarStatus(ConfigManager.Instance.GetClientInfo().Id, CalendarState.NotAllowedToFetch);
+        }
+      }
+      //if the fetching from the server failed - still set the client online... maybe we get 
+      //a result within the next few heartbeats
+      if (!UptimeManager.Instance.CalendarAvailable || UptimeManager.Instance.IsOnline()) {
+        wcfService.LoginSync(ConfigManager.Instance.GetClientInfo());
+        JobStorageManager.CheckAndSubmitJobsFromDisc();
+        currentlyFetching = false;
+      }
     }
 

trunk/sources/HeuristicLab.Hive.Client.Core/3.2/Heartbeat.cs

@@ -89 +89 @@
       TimeSpan span = DateTime.Now - lastFullHour;
       if (span.TotalSeconds < (Interval/1000)) {
-        if (UptimeManager.Instance.isOnline()) {
+        if (UptimeManager.Instance.IsOnline() && UptimeManager.Instance.CalendarAvailable) {
           //That's quiet simple: Just reconnect and you're good for new jobs
           if (wcfService.ConnState != NetworkEnum.WcfConnState.Loggedin) {

trunk/sources/HeuristicLab.Hive.Client.Core/3.2/HeuristicLab.Hive.Client.Core-3.2.csproj

@@ -96 +96 @@
     <Compile Include="ClientConsoleService\TransferObjects\JobStatus.cs" />
     <Compile Include="ClientConsoleService\TransferObjects\StatusCommons.cs" />
+    <Compile Include="ConfigurationManager\AppointmentContainer.cs" />
     <Compile Include="ConfigurationManager\ClientStatusInfo.cs" />
     <Compile Include="ConfigurationManager\ConfigManager.cs" />