Merge pull request #54 from darknight1050/OculusDB-current

Null check for oldEntry

Author: ComputerElite

OculusDB/ScrapingNodeCode/ScrapingNodeScraper.cs

@@ -244,19 +244,19 @@ public void Scrape(AppToScrape app)
             foreach (OculusBinary b in versions.data.node.primary_binaries.nodes)
             {
                 bool doPriorityForThisVersion = app.priority;
-                DBVersion? oldEntry = connected.FirstOrDefault(x => x.id == b.id);
-                TimeSpan timeDelta = DateTime.UtcNow - oldEntry.lastPriorityScrape;
-                TimeSpan betweenScrapes = timeBetweenScrapes;
-                // Make sure that the time between scrapes increases at a steady pace to not stress Oculus's servers too much
-                if (timeDelta.TotalDays > 20)
-                {
-                    betweenScrapes = timeDelta;
-                    if (betweenScrapes.TotalDays > 600) betweenScrapes = new TimeSpan(600, 0, 0, 0);
-                }
-                
-                if (doPriorityForThisVersion)
-                {
-                    if (oldEntry != null)
+                DBVersion? oldEntry = connected.FirstOrDefault(x => x.id == b.id);
+                if (oldEntry != null)
+                {
+                    TimeSpan timeDelta = DateTime.UtcNow - oldEntry.lastPriorityScrape;
+                    TimeSpan betweenScrapes = timeBetweenScrapes;
+                    // Make sure that the time between scrapes increases at a steady pace to not stress Oculus's servers too much
+                    if (timeDelta.TotalDays > 20)
+                    {
+                        betweenScrapes = timeDelta;
+                        if (betweenScrapes.TotalDays > 600) betweenScrapes = new TimeSpan(600, 0, 0, 0);
+                    }
+
+                    if (doPriorityForThisVersion)
                     {
                         // Only do priority scrape if last scrape is older than 2 days
                         if (timeDelta < betweenScrapes)
@@ -297,8 +297,8 @@ public void Scrape(AppToScrape app)
 
                 if (b != null && doPriorityForThisVersion)
                 {
-                    Logger.Log("Scraping v " + b.version, LoggingType.Important);
-                    
+                    Logger.Log("Scraping v " + b.version, LoggingType.Important);
+
                 }
                 OculusBinary bin = b;
                 bool wasNull = false;
@@ -311,7 +311,7 @@ public void Scrape(AppToScrape app)
                         wasNull = true;
                         bin = b;
                     }
-                    if(bin.obb_binary == null && b.obb_binary != null) bin.obb_binary = b.obb_binary;
+                    if (bin.obb_binary == null && b.obb_binary != null) bin.obb_binary = b.obb_binary;
                 }
                 catch
                 {
@@ -322,12 +322,12 @@ public void Scrape(AppToScrape app)
                         Logger.Log("Got obb binary for " + b.id + " v " + b.version, LoggingType.Debug);
                         b.obb_binary = info.data.node.obb_binary;
                     }
-                }
-               
-
-                // Preserve changelogs and obbs across scrapes by:
-                // - Don't delete versions after scrape
-                // - If not priority scrape enter changelog and obb of most recent versions
+                }
+
+
+                // Preserve changelogs and obbs across scrapes by:
+                // - Don't delete versions after scrape
+                // - If not priority scrape enter changelog and obb of most recent versions
                 if ((!doPriorityForThisVersion || wasNull) && oldEntry != null)
                 {
                     bin.changeLog = oldEntry.changeLog;