Fix prices perhaps. Also remove download via proxy button

Author: ComputerElite

OculusDB/ObjectConverter.cs

@@ -69,7 +69,7 @@ public class ObjectConverter
             return converted;
         }
 
-        public static dynamic ConvertToDBType(BsonDocument d)
+        public static dynamic? ConvertToDBType(BsonDocument? d)
         {
             if (d == null) return null;
             string type = d.GetValue("__OculusDBType").ToString();

OculusDB/ScrapingMaster/ScrapingManaging.cs

@@ -192,7 +192,7 @@ private static void ProcessScrapedResults(ScrapingNodeTaskResult taskResult, Scr
         ulong taskId = processTaskId;
         processTaskId++;
         Logger.Log("# " + taskId + "  Processing " + taskResult.scraped.applications.Count + " applications, " + taskResult.scraped.dlcs.Count + " dlcs, " + taskResult.scraped.dlcPacks.Count + " dlc packs, " + taskResult.scraped.versions.Count + " version and " + taskResult.scraped.imgs.Count + " images from scraping node " + scrapingNodeAuthenticationResult.scrapingNode);
-        ScrapingContribution scrapingContribution = new ScrapingContribution();
+        ScrapingContribution? scrapingContribution = new ScrapingContribution();
         scrapingContribution.scrapingNode = scrapingNodeAuthenticationResult.scrapingNode;
         // Process Versions
         Dictionary<string, List<DBVersion>> versionLookup = new Dictionary<string, List<DBVersion>>();
@@ -431,25 +431,21 @@ private static void ProcessScrapedResults(ScrapingNodeTaskResult taskResult, Scr
             long newestNonZeroPrice = 0;
             foreach (DBActivityPriceChanged p in priceChanges)
             {
-                if(!nodesPrice.ContainsKey(p.newPriceOffsetNumerical)) 
-                {
-                    nodesPrice.Add(p.newPriceOffsetNumerical, 0);
-                }
+                nodesPrice.TryAdd(p.newPriceOffsetNumerical, 0);
                 if (p.newPriceOffsetNumerical != 0)
                 {
                     newestNonZeroPrice = p.newPriceOffsetNumerical;
                 }
                 nodesPrice[p.newPriceOffsetNumerical]++;
             }
             // now check if one node does a limbo
-            long suggestedPrice = a.priceOffsetNumerical;
             a.priceLimboDetected = false;
             foreach (var prices in nodesPrice)
             {
                 if (prices.Value > 2 && prices.Key == 0) // price limbo if the same price occurrs more than twice
                 {
                     a.priceLimboDetected = true;
-                    suggestedPrice = newestNonZeroPrice;
+                    a.priceOffsetNumerical = newestNonZeroPrice;
                     break;
                 }
             }
@@ -462,7 +458,6 @@ private static void ProcessScrapedResults(ScrapingNodeTaskResult taskResult, Scr
             priceChange.parentApplication.displayName = a.displayName;
             priceChange.newPriceOffsetNumerical = a.priceOffsetNumerical;
             priceChange.currency = a.currency;
-            if(a.priceLimboDetected) priceChange.newPriceOffsetNumerical = suggestedPrice; // Set the price to the highest price in case of price limbo
             if (lastPriceChange != null)
             {
                 if (lastPriceChange.newPriceOffset != priceChange.newPriceOffset)
@@ -474,18 +469,14 @@ private static void ProcessScrapedResults(ScrapingNodeTaskResult taskResult, Scr
             }
             else
             {
-                if (priceChange == null)
-                {
-                    ReportErrorWithDiscordMessage("Price change is null. Responsible node is " + scrapingNodeAuthenticationResult.scrapingNode.scrapingNodeId, "nullError");
-                }
-                else if (scrapingContribution == null)
+                if (scrapingContribution == null)
                 {
                     ReportErrorWithDiscordMessage("Scraping Contribution is null. Responsible node is " + scrapingNodeAuthenticationResult.scrapingNode.scrapingNodeId, "nullError");
                 }
                 else ScrapingNodeMongoDBManager.AddBsonDocumentToActivityCollection(priceChange.ToBsonDocument(), ref scrapingContribution);
             }
 
-            DBApplication old = ObjectConverter.ConvertToDBType(MongoDBInteractor.GetByID(a.id, 1, a.currency).FirstOrDefault());
+            DBApplication? old = ObjectConverter.ConvertToDBType(MongoDBInteractor.GetByID(a.id, 1, a.currency).FirstOrDefault());
             ScrapingNodeMongoDBManager.AddApplication(a, ref scrapingContribution);
             if (old != null)
             {

OculusDB/frontend/script.js

@@ -1311,7 +1311,7 @@ function RealDownload(id, openObb) {
     if(openObb) ObbDownloadPopUp();
 }
 
-function AndroidDownload(id, parentApplicationId,parentApplicationName, version, isObb = false, obbIds = "", obbNames = "") {
+function AndroidDownload(id, parentApplicationId,parentApplicationName, version, isObb = false, obbIds = "", obbNames = "", hmd = "EUREKA") {
 
     if(!DownloadCheck()) return
 
@@ -1356,11 +1356,18 @@ function AndroidDownload(id, parentApplicationId,parentApplicationName, version,
             <div>
                 <div style="font-size: 1.2em; font-weight: bold; margin-bottom: 10px;">Why is my download not starting?</div>
                 <p>
-                    <span style="font-weight: bold">You cannot download quest games atm. You may be able to use <span style="font-weight: bolder;">QuestAppVersionSwitcher</span> to downgrade/download Quest games like Beat Saber.</span>
+                    <span style="font-weight: bold">You cannot download quest games directly via your browser atm. You may be able to use <a style="font-weight: bolder;" href="https://oculusdb.rui2015.me/guide/quest/qavs">QuestAppVersionSwitcher</a> to downgrade/download Quest games like Beat Saber.</span>
                     It's an app you install on your Quest and then use to downgrade. You can find a guide on how to set it up <a href="https://oculusdb.rui2015.me/guide/quest/qavs">here</a>.
+                    <br/>
+                    <br/>
+                    If you want to download directly on your pc, you can use Oculus Downgrader. In that case press the Oculus Downgrader button below.
                     For more info check <a href="https://computerelite.github.io/blog/2024/01/05/downgrading">here</a>.
                     <br/>
-                    <input type="button" onclick="GetHelp()" value="Receive Help">
+                    <br/>
+                    If you need further help you can join the <a href="{OculusDBDC}">OculusDB Discord server</a> and ask for help in the #support channel.
+                    <br/>
+                    <input type="button" onclick="AndroidDownloadPopUp('${parentApplicationId}','${id}', '${hmd}')" value="Oculus Downgrader">
+                    <input type="button" onclick="GetHelp()" value="Poem for help">
                 </p>
             </div>
         `);
@@ -1464,8 +1471,7 @@ function GetDownloadButtonVersion(downloadable, id, hmd, binaryType, parentAppli
         if(localStorage.isOculusDowngrader) {
             return `<input type="button" value="Download${downloadable ? '"' : ' (Developer only)" class="red"'} onmousedown="MouseDown(event)" onmouseup="if(MouseUp(event)) AndroidDownloadPopUp('${parentApplication.id}','${id}', '${hmd}')" oncontextmenu="ContextMenuEnabled(event, this)">`
         }
-        return `<input type="button" value="Download${downloadable ? '"' : ' (Developer only)" class="red"'} onmousedown="MouseDown(event)" onmouseup="if(MouseUp(event)) AndroidDownload('${id}', '${parentApplication.id}', '${parentApplication.displayName.replace("'", "\\'")}', '${version}', ${isObb}, ${obbIds == null ? "null" : `'${obbIds}'`}, ${obbNames == null ? "null" : `'${obbNames}'`})" oncontextmenu="ContextMenuEnabled(event, this)" cmon-0="Copy download url" cmov-0="Copy(GetDownloadLink('${id}'))" cmon-1="Show Oculus Downgrader code" cmov-1="AndroidDownloadPopUp('${parentApplication.id}','${id}', '${hmd}')">
-        ${localStorage.isQAVS ? `` : `<input type="button" value="Download via Proxy (will probably work${downloadable ? ')"' : '; Developer only)" class="red"'} onmousedown="MouseDown(event)" onmouseup="if(MouseUp(event)) ProxyDownload('${id}')">`}`
+        return `<input type="button" value="Download${downloadable ? '"' : ' (Developer only)" class="red"'} onmousedown="MouseDown(event)" onmouseup="if(MouseUp(event)) AndroidDownload('${id}', '${parentApplication.id}', '${parentApplication.displayName.replace("'", "\\'")}', '${version}', ${isObb}, ${obbIds == null ? "null" : `'${obbIds}'`}, ${obbNames == null ? "null" : `'${obbNames}'`}, '${hmd}')" oncontextmenu="ContextMenuEnabled(event, this)" cmon-0="Copy download url" cmov-0="Copy(GetDownloadLink('${id}'))" cmon-1="Show Oculus Downgrader code" cmov-1="AndroidDownloadPopUp('${parentApplication.id}','${id}', '${hmd}')">`
     }
     return `<input type="button" value="Download${downloadable ? '"' : ' (Developer only)" class="red"'} onmousedown="MouseDown(event)" onmouseup="if(MouseUp(event)) RiftDownloadPopUp('${parentApplication.id}','${id}')" oncontextmenu="ContextMenuEnabled(event, this)" cmon-0="Show Oculus Downgrader code" cmov-0="RiftDownloadPopUp('${parentApplication.id}','${id}')">`
 }