get presets json from data manager

Author: Razzmatazzz

generate.js

@@ -14,7 +14,7 @@ const getJson = require('./get-json');
 
 let bsgData = false;
 let presets = false;
-let sptPresets = false;
+let bsgPresets = false;
 const itemsByHash = {};
 const itemsById = {};
 
@@ -322,11 +322,11 @@ const loadBsgData = async () => {
 };
 
 const loadPresets = async () => {
-    presets = await getJson.tt_presets();
+    presets = await getJson.td_presets();
 };
 
-const loadSptPresets = async () => {
-    sptPresets = await getJson.presets();
+const loadBsgPresets = async () => {
+    bsgPresets = await getJson.presets();
 };
 
 const setBackgroundColor = (item) => {
@@ -379,14 +379,19 @@ const hashItems = async (options) => {
                             id
                         }
                     }
+                    ...on ItemPropertiesWeapon {
+                        slots {
+                            name
+                        }
+                    }
                   }
                 }
               }`
             }),
             responseType: 'json',
             resolveBodyOnly: true
         });
-        hashCalc.init(bsgData, sptPresets, presets);
+        hashCalc.init(bsgData, bsgPresets, presets);
         let missingGridImage = 0;
         let missingIcon = 0;
         let missingBaseImage = 0;
@@ -420,7 +425,7 @@ const hashItems = async (options) => {
                 console.log(`Error hashing ${itemData.id}: ${error}`);
             }
             itemsById[itemData.id] = itemData;
-            if (itemData.id == options.targetItemId) {
+            if (itemData.id == options.targetItemId && itemData.hash) {
                 console.log(itemData.hash);
                 break;
             }
@@ -445,7 +450,7 @@ const initialize = async (options) => {
     if (options.SCANNER_NAME) process.env.SCANNER_NAME = options.SCANNER_NAME;
     await loadBsgData();
     await loadPresets();
-    await loadSptPresets();
+    await loadBsgPresets();
     if (!options.skipHashing) {
         await hashItems(opts);
     }
@@ -486,8 +491,8 @@ const generate = async (options, forceImageIndex) => {
     if (!presets) {
         await loadPresets();
     }
-    if (!sptPresets) {
-        await loadSptPresets();
+    if (!bsgPresets) {
+        await loadBsgPresets();
     }
     if (!cacheIsLoaded()) {
         refreshCache();
@@ -531,7 +536,7 @@ const generate = async (options, forceImageIndex) => {
                 setBackgroundColor(item);
             }
             try {
-                hashCalc.init(bsgData, sptPresets, presets);
+                hashCalc.init(bsgData, bsgPresets, presets);
                 item.hash = hashCalc.getItemHash(item.id);
                 if (!itemsByHash[item.hash.toString()]) {
                     itemsByHash[item.hash.toString()] = item;

get-json.js

@@ -58,7 +58,7 @@ module.exports = {
         }
         return presets;
     },
-    tt_presets: async () => {
+    td_presets: async () => {
         let presets = false;
         try {
             presets = JSON.parse(fs.readFileSync('./item_presets.json', 'utf8'));
@@ -68,7 +68,11 @@ module.exports = {
             }
         } catch (error) {
             try {
-                presets = JSON.parse((await got('https://raw.githubusercontent.com/Razzmatazzz/tarkovdata/master/item_presets.json')).body);
+                if (process.env.API_USERNAME && process.env.API_PASSWORD && process.env.SCANNER_NAME) {
+                    downloadedPresets = await api.getJson('presets.json').catch(() => { return false; });
+                    if (downloadedPresets) presets = downloadedPresets;
+                } 
+                if (!presets) throw new Error('Error downloading Tarkov.dev presets');
                 fs.writeFileSync('./item_presets.json', JSON.stringify(presets, null, 4));
             } catch (downloadError) {
                 if (error.message != 'stale') {

hash-calculator.js

@@ -3,6 +3,7 @@ let presets = false;
 let ttPresets = false;
 
 const isWeapon = (item) => {
+    if (item._props?.Slots?.length < 1) return false;
     let category = item._parent;
     while (category) {
         if (category === '5422acb9af1c889c16000029') return true;