Update scripts to use new API endpoints, reverse time direction

Author: omundy

Assets/_Project/Scripts/Data/DataManager.cs

@@ -36,6 +36,7 @@ void OnDisable()
 
 
     // http://127.0.0.1:5000/api/feed/recent
+    // http://127.0.0.1:5000/api/feed/range/plusStream/5/day/
 
     private void Start()
     {
@@ -49,10 +50,10 @@ private void Start()
 
         // ENDPOINTS
 
-        //endpoint = "feed/range/1/week"; // a whole week
+        endpoint = "feed/range/1/week"; // a whole week
         endpoint = "feed/recent"; // 20 recent
 
-
+        endpoint = "feed/range/plusStream/5/day/"; // last 5 days
 
     }
 
@@ -96,6 +97,8 @@ public static IEnumerator GetRequest(string uri)
                     string _avatarPath = item.GetValue("avatarPath").ToString();
                     string _eventType = item.GetValue("eventType").ToString();
                     string _createdAtStr = item.GetValue("createdAt").ToString();
+                    string _monsters = item.GetValue("monsters").ToString();
+                    string _trackers = item.GetValue("trackers").ToString();
 
                     // parse string to ISO 8601 format
                     DateTime _createdAt = DateTime.Parse(_createdAtStr, null, System.Globalization.DateTimeStyles.RoundtripKind);
@@ -111,6 +114,8 @@ public static IEnumerator GetRequest(string uri)
                             avatarPath = _avatarPath,
                             eventType = _eventType,
                             createdAt = _createdAt,
+                            monsters = _monsters,
+                            trackers = _trackers,
 
                             name = (string)d["name"],
                             type = (string)d["level"],
@@ -125,6 +130,8 @@ public static IEnumerator GetRequest(string uri)
                             avatarPath = _avatarPath,
                             eventType = _eventType,
                             createdAt = _createdAt,
+                            monsters = _monsters,
+                            trackers = _trackers,
 
                             name = (string)d["name"],
                             level = (int)d["level"]
@@ -138,6 +145,8 @@ public static IEnumerator GetRequest(string uri)
                             avatarPath = _avatarPath,
                             eventType = _eventType,
                             createdAt = _createdAt,
+                            monsters = _monsters,
+                            trackers = _trackers,
 
                             name = (string)d["name"],
                             slug = (string)d["slug"],
@@ -154,6 +163,8 @@ public static IEnumerator GetRequest(string uri)
                             avatarPath = _avatarPath,
                             eventType = _eventType,
                             createdAt = _createdAt,
+                            monsters = _monsters,
+                            trackers = _trackers,
 
                             name = (string)d["name"],
                             type = (string)d["type"]
@@ -167,12 +178,45 @@ public static IEnumerator GetRequest(string uri)
                             avatarPath = _avatarPath,
                             eventType = _eventType,
                             createdAt = _createdAt,
+                            monsters = _monsters,
+                            trackers = _trackers,
 
                             mid = (int)d["mid"],
                             level = (int)d["level"],
                             captured = (int)d["captured"],
                         });
                     }
+                    else if (_eventType == "tracker")
+                    {
+                        feeds.Add(new TrackerData
+                        {
+                            username = _username,
+                            avatarPath = _avatarPath,
+                            eventType = _eventType,
+                            createdAt = _createdAt,
+                            monsters = _monsters,
+                            trackers = _trackers,
+
+                            tracker = (string)d["tracker"],
+                            captured = (int)d["captured"],
+                        });
+                    }
+                    else if (_eventType == "stream")
+                    {
+                        feeds.Add(new StreamData
+                        {
+                            username = _username,
+                            avatarPath = _avatarPath,
+                            eventType = _eventType,
+                            createdAt = _createdAt,
+                            monsters = _monsters,
+                            trackers = _trackers,
+
+                            score = (int)d["score"],
+                            clicks = (int)d["clicks"],
+                            likes = (int)d["likes"],
+                        });
+                    }
 
 
 
@@ -208,15 +252,18 @@ public static IEnumerator GetRequest(string uri)
                 foreach (var feed in feeds)
                 {
 
-
-
                     var line =
+
                         feed.createdAt + "\t" +
-                        feed.username + ", " + feed.eventType + ", " +
+                        feed.username + ", " +
+                        feed.eventType + ", " +
+
                         //feed.type + ", " + feed.name + ", " + feed.level +
                         //", " + feed.type
+
                         ""
                         ;
+
                     current += line + "<br>";
 
                     //Debug.Log(line);

Assets/_Project/Scripts/Data/FeedData.cs

@@ -7,6 +7,8 @@ public class FeedData
     public string avatarPath { get; set; }
     public string eventType { get; set; }
     public string eventData { get; set; }
+    public string monsters { get; set; }
+    public string trackers { get; set; }
     public DateTime createdAt { get; set; }
 }
 

Assets/_Project/Scripts/UI/Timeline.cs

@@ -11,11 +11,9 @@ public class Timeline : MonoBehaviour
     public bool playbackActive = false;
     // the feed item we are currently displaying
     public int feedIndex;
-    // current time to display
-    public DateTime currentTime;
     // previous time displayed
     public DateTime previousTime;
-    // difference between currentTime and previousTime
+    // difference between current time (feed.createdAt) and previousTime
     public int diffInSeconds;
     // difference - adjusted for playback
     public float diffInSecondsAdj;
@@ -69,32 +67,40 @@ IEnumerator Play()
 
         foreach (var feed in DataManager.feeds)
         {
-            // current time
-            currentTime = feed.createdAt;
-            // on first run 
+            // on first run only
             if (previousTime == null)
-            {
-                // use current time
-                previousTime = currentTime;
-            }
-            // difference in seconds
-            diffInSeconds = (int)(previousTime - currentTime).TotalSeconds;
-            // difference adjusted
-            diffInSecondsAdj = diffInSeconds * 0.0001f;
+                // use current time as previous time
+                previousTime = feed.createdAt;
+
+
+            // find difference in seconds between createdAt and previousTime 
+            diffInSeconds = (int)(feed.createdAt - previousTime).TotalSeconds;
+
+            // adjust difference (speed it up)
+            diffInSecondsAdj = diffInSeconds * 0.0015f;
 
             // log feed item
-            var log = feedIndex + ". " +
+            var log =
+
+                feedIndex + ". " +
                 diffInSeconds + " (" + diffInSecondsAdj + ") " +
-                " (" + currentTime + ") " +
-               //" = (" + previousTime + " - " + currentTime + ") " +
-               feed.username + ", " + feed.eventType;
+
+                " (" + feed.createdAt + ") " +
+               //" = (" + previousTime + " - " + feed.createdAt + ") " +
+               feed.username + ", " + feed.eventType +
+
+               "";
+
+
             TmText.text += log + "<br>";
+
             UpdateScroll();
+
             //Debug.Log(log);
 
 
             // set previous time for next loop
-            previousTime = currentTime;
+            previousTime = feed.createdAt;
             // display in feed console
 
             // if there are more feed items