Bladeren bron

remove deadlock

Johann Woelper 5 jaren geleden
bovenliggende
commit
0730a35d0a
6 gewijzigde bestanden met toevoegingen van 720 en 162 verwijderingen
  1. 680 134
      accounts.json
  2. BIN
      guntrader
  3. 11 7
      src/main.rs
  4. 11 8
      src/server.rs
  5. 8 3
      webapp/app.js
  6. 10 10
      webapp/index.html

+ 680 - 134
accounts.json

@@ -1,25 +1,10 @@
 {
-  "test": {
-    "queries": {
-      "http://www.egun.de/market/list_items.php?mode=qry&plusdescr=off&query=schusssichere+weste": {
-        "auctions": {
-          "http://egun.de/market/item.php?id=7567346": {
-            "price": 96.0,
-            "desc": "Stichschutzweste-Stichschutz-schusssichere-k",
-            "gcal": "http://www.google.com/calendar/event?action=TEMPLATE&dates=20190805T165100/20190805T165100&text=Stichschutzweste-Stichschutz-schusssichere-k&location=&details=",
-            "thumb": "http://egun.de/market/cache/aucimg/100x100/5.7567346.1031537147.jpg",
-            "remaining": 863700,
-            "url": "http://egun.de/market/item.php?id=7567346",
-            "timestamp": 1565016676,
-            "is_price_final": false
-          }
-        },
-        "avg_price": 96.0
-      }
-    }
-  },
   "johann": {
     "queries": {
+      "http://www.egun.de/market/list_items.php?mode=qry&plusdescr=off&query=ssg+p4&ewb=1": {
+        "auctions": {},
+        "avg_price": null
+      },
       "http://www.egun.de/market/list_items.php?mode=qry&query=308+enfield&plusdescr=off&wheremode=and&ewb=1": {
         "auctions": {
           "http://egun.de/market/item.php?id=7545805": {
@@ -32,6 +17,46 @@
             "timestamp": 0,
             "is_price_final": true
           },
+          "http://egun.de/market/item.php?id=7547250": {
+            "price": 849.0,
+            "desc": "Original Enfield No4 Conversion auf 7.62×51mm NATO/ 308 Große Bilder",
+            "gcal": "",
+            "thumb": "http://egun.de/market/cache/aucimg/100x100/1.7547250.734856355.jpg",
+            "remaining": 0,
+            "url": "http://egun.de/market/item.php?id=7547250",
+            "timestamp": 0,
+            "is_price_final": true
+          },
+          "http://egun.de/market/item.php?id=7580644": {
+            "price": 403.89,
+            "desc": "Lee Enfield R.F.I. rifle 2A1. Cal..308 Winchester. Repetierbüchse. Super Lauf und Präzision.",
+            "gcal": "",
+            "thumb": "http://egun.de/market/images/picture.gif",
+            "remaining": 0,
+            "url": "http://egun.de/market/item.php?id=7580644",
+            "timestamp": 0,
+            "is_price_final": true
+          },
+          "http://egun.de/market/item.php?id=7647290": {
+            "price": 2.0,
+            "desc": "Enfield L8A2, Kal. 308Win., Selten",
+            "gcal": "http://www.google.com/calendar/event?action=TEMPLATE&dates=20191101T180200/20191101T180200&text=Enfield+L8A2%2C+Kal.+308Win.%2C+Selten&location=&details=",
+            "thumb": "http://egun.de/market/cache/aucimg/100x100/3.7647290.681293221.jpg",
+            "remaining": 2579160,
+            "url": "http://egun.de/market/item.php?id=7647290",
+            "timestamp": 1572624174,
+            "is_price_final": false
+          },
+          "http://egun.de/market/item.php?id=7575471": {
+            "price": 1090.0,
+            "desc": "Enfield L8A4 in 7,62 Winchester .308",
+            "gcal": "http://www.google.com/calendar/event?action=TEMPLATE&dates=20190810T124200/20190810T124200&text=Enfield+L8A4+in+7%2C62+Winchester+.308&location=&details=",
+            "thumb": "http://egun.de/market/cache/aucimg/100x100/6.7575471.1430435675.jpg",
+            "remaining": 604680,
+            "url": "http://egun.de/market/item.php?id=7575471",
+            "timestamp": 1565433756,
+            "is_price_final": true
+          },
           "http://egun.de/market/item.php?id=7550217": {
             "price": 1069.0,
             "desc": "Rep. - Büchse .308 Win.; Enfield AIA M10 No.4 Mk.IV top Präzision Sniper Einzelstück selten Rarität",
@@ -42,148 +67,460 @@
             "timestamp": 1563304315,
             "is_price_final": true
           },
-          "http://egun.de/market/item.php?id=7547250": {
-            "price": 483.0,
-            "desc": "Original Enfield No4 Conversion auf 7.62×51mm NATO/ 308 Große Bilder",
-            "gcal": "http://www.google.com/calendar/event?action=TEMPLATE&dates=20190802T221300/20190802T221300&text=Original+Enfield+No4+Conversion+auf+7.62%C3%9751mm+NATO%2F+308+Gro%C3%9Fe+Bilder&location=&details=",
-            "thumb": "http://egun.de/market/cache/aucimg/100x100/1.7547250.734856355.jpg",
-            "remaining": 284400,
-            "url": "http://egun.de/market/item.php?id=7547250",
-            "timestamp": 1564776793,
+          "http://egun.de/market/item.php?id=7216322": {
+            "price": 600.0,
+            "desc": "Karabiner Enfield Mod 2A1, Kal..308Win Einzellader!",
+            "gcal": "http://www.google.com/calendar/event?action=TEMPLATE&dates=20191028T122300/20191028T122300&text=Karabiner+Enfield+Mod+2A1%2C+Kal..308Win+Einzellader%21&location=&details=",
+            "thumb": "http://egun.de/market/cache/aucimg/100x100/4.7216322.1511970536.jpg",
+            "remaining": 2213220,
+            "url": "http://egun.de/market/item.php?id=7216322",
+            "timestamp": 1572258234,
             "is_price_final": false
           }
         },
-        "avg_price": 654.3333
+        "avg_price": 632.1986
       },
-      "http://www.egun.de/market/list_items.php?mode=qry&plusdescr=off&query=m14+luxdef&ewb=1&minprice=200": {
-        "auctions": {},
-        "avg_price": null
-      },
-      "http://www.egun.de/market/list_items.php?mode=qry&query=m305&plusdescr=off&wheremode=and&ewb=1": {
-        "auctions": {},
-        "avg_price": null
-      },
-      "http://www.egun.de/market/list_items.php?mode=qry&plusdescr=off&query=Steyr+scout&ewb=1": {
+      "http://www.egun.de/market/list_items.php?mode=qry&plusdescr=off&query=aics+-magazin&minprice=350": {
         "auctions": {
-          "http://egun.de/market/item.php?id=7038461": {
-            "price": 595.0,
-            "desc": "Rep.Büchse .22lr Steyr Mannlicher SCOUT RFR 510mm Lauf/ Mündungsgewinde (1/2-20) Geradezug (.22lfB)",
-            "gcal": "http://www.google.com/calendar/event?action=TEMPLATE&dates=20190812T185300/20190812T185300&text=Rep.B%C3%BCchse+.22lr+Steyr+Mannlicher+SCOUT+RFR+510mm+Lauf%2F+M%C3%BCndungsgewinde+%281%2F2-20%29+Geradezug+%28.22lfB%29&location=&details=",
-            "thumb": "http://egun.de/market/cache/aucimg/100x100/2.7038461.546939400.jpg",
-            "remaining": 1136400,
-            "url": "http://egun.de/market/item.php?id=7038461",
-            "timestamp": 1565628792,
+          "http://egun.de/market/item.php?id=7020521": {
+            "price": 1385.0,
+            "desc": "Accuracy International Chassis System (AICS-AX 2.0) FDE Remington 700 SA .308 Repetierbüchsen",
+            "gcal": "http://www.google.com/calendar/event?action=TEMPLATE&dates=20191007T011100/20191007T011100&text=Accuracy+International+Chassis+System+%28AICS-AX+2.0%29+FDE+Remington+700+SA+.308+Repetierb%C3%BCchsen&location=&details=",
+            "thumb": "http://egun.de/market/cache/aucimg/100x100/0.7020521.1109967068.jpg",
+            "remaining": 358500,
+            "url": "http://egun.de/market/item.php?id=7020521",
+            "timestamp": 1570403516,
             "is_price_final": false
+          },
+          "http://egun.de/market/item.php?id=7607599": {
+            "price": 1449.0,
+            "desc": "Rem 700 .308 AICS Sniper Accuracy International",
+            "gcal": "",
+            "thumb": "http://egun.de/market/cache/aucimg/100x100/0.7607599.339439951.jpg",
+            "remaining": 0,
+            "url": "http://egun.de/market/item.php?id=7607599",
+            "timestamp": 0,
+            "is_price_final": true
+          },
+          "http://egun.de/market/item.php?id=7547554": {
+            "price": 1699.0,
+            "desc": "Remington 700 Police .308Win. 66cm Lauf, AICS/Accuracy International Klappschaft, EBIARMS-Bremse",
+            "gcal": "http://www.google.com/calendar/event?action=TEMPLATE&dates=20190808T131600/20190808T131600&text=Remington+700+Police+.308Win.+66cm+Lauf%2C+AICS%2FAccuracy+International+Klappschaft%2C+EBIARMS-Bremse&location=&details=",
+            "thumb": "http://egun.de/market/cache/aucimg/100x100/2.7547554.616577857.jpg",
+            "remaining": 1184040,
+            "url": "http://egun.de/market/item.php?id=7547554",
+            "timestamp": 1565262974,
+            "is_price_final": true
           }
         },
-        "avg_price": 595.0
-      },
-      "http://www.egun.de/market/list_items.php?mode=qry&query=smith+wesson+r8&plusdescr=off&wheremode=and&ewb=1": {
-        "auctions": {},
-        "avg_price": null
+        "avg_price": 1511.0
       },
-      "http://www.egun.de/market/list_items.php?mode=qry&plusdescr=off&query=sig+550&ewb=1&minprice=250&type=1": {
+      "http://www.egun.de/market/list_items.php?mode=qry&plusdescr=off&query=m1a&ewb=1&type=1": {
         "auctions": {
-          "http://egun.de/market/item.php?id=7550521": {
-            "price": 1395.0,
-            "desc": "Selbstladebüchse SIG Sport 550 Kal. .223 rem",
-            "gcal": "http://www.google.com/calendar/event?action=TEMPLATE&dates=20190806T122700/20190806T122700&text=Selbstladeb%C3%BCchse+SIG+Sport+550+Kal.+.223+rem&location=&details=",
-            "thumb": "http://egun.de/market/cache/aucimg/100x100/5.7550521.99022556.jpg",
-            "remaining": 594840,
-            "url": "http://egun.de/market/item.php?id=7550521",
-            "timestamp": 1565087234,
-            "is_price_final": false
+          "http://egun.de/market/item.php?id=7598625": {
+            "price": 2210.0,
+            "desc": "Springfield Armory M1A National Match",
+            "gcal": "",
+            "thumb": "http://egun.de/market/cache/aucimg/100x100/5.7598625.329083687.jpg",
+            "remaining": 0,
+            "url": "http://egun.de/market/item.php?id=7598625",
+            "timestamp": 0,
+            "is_price_final": true
           },
-          "http://egun.de/market/item.php?id=7566331": {
-            "price": 3900.0,
-            "desc": "SIG 550 Sport 223 Rem. Set Top viel Zubehör",
-            "gcal": "http://www.google.com/calendar/event?action=TEMPLATE&dates=20190824T192700/20190824T192700&text=SIG+550+Sport+223+Rem.+Set+Top+viel+Zubeh%C3%B6r&location=&details=",
-            "thumb": "http://egun.de/market/cache/aucimg/100x100/4.7566331.1312216270.jpg",
-            "remaining": 2175240,
-            "url": "http://egun.de/market/item.php?id=7566331",
-            "timestamp": 1566667634,
+          "http://egun.de/market/item.php?id=7590157": {
+            "price": 3500.0,
+            "desc": "Springfield Armory M1A Super Match mit ZF .308 WIN",
+            "gcal": "http://www.google.com/calendar/event?action=TEMPLATE&dates=20190906T140300/20190906T140300&text=Springfield+Armory+M1A+Super+Match+mit+ZF+.308+WIN&location=&details=",
+            "thumb": "http://egun.de/market/cache/aucimg/100x100/5.7590157.535403231.jpg",
+            "remaining": 872580,
+            "url": "http://egun.de/market/item.php?id=7590157",
+            "timestamp": 1567771412,
+            "is_price_final": true
+          },
+          "http://egun.de/market/item.php?id=7630316": {
+            "price": 2499.0,
+            "desc": "Springfield Armory M1A National Match Kal. .308 WIN",
+            "gcal": "http://www.google.com/calendar/event?action=TEMPLATE&dates=20191003T134200/20191003T134200&text=Springfield+Armory+M1A+National+Match+Kal.+.308+WIN&location=&details=",
+            "thumb": "http://egun.de/market/cache/aucimg/100x100/4.7630316.1266419958.jpg",
+            "remaining": 57900,
+            "url": "http://egun.de/market/item.php?id=7630316",
+            "timestamp": 1570102920,
             "is_price_final": false
+          },
+          "http://egun.de/market/item.php?id=7575853": {
+            "price": 635.0,
+            "desc": "Fallschirmjäg. 30 M1A1 National Postal Meter .30Carb.",
+            "gcal": "",
+            "thumb": "http://egun.de/market/cache/aucimg/100x100/6.7575853.1148015446.jpg",
+            "remaining": 0,
+            "url": "http://egun.de/market/item.php?id=7575853",
+            "timestamp": 0,
+            "is_price_final": true
+          },
+          "http://egun.de/market/item.php?id=7609956": {
+            "price": 1600.0,
+            "desc": "Springfield Armory M1A (zivil M 14) .308in Neuwertigen Zustand",
+            "gcal": "http://www.google.com/calendar/event?action=TEMPLATE&dates=20191002T170600/20191002T170600&text=Springfield+Armory+M1A+%28zivil+M+14%29+.308in+Neuwertigen+Zustand&location=&details=",
+            "thumb": "http://egun.de/market/cache/aucimg/100x100/1.7609956.572597730.jpg",
+            "remaining": 1389600,
+            "url": "http://egun.de/market/item.php?id=7609956",
+            "timestamp": 1570028814,
+            "is_price_final": true
+          },
+          "http://egun.de/market/item.php?id=7592691": {
+            "price": 2100.0,
+            "desc": "Springfield M1A M14 mit Montage",
+            "gcal": "",
+            "thumb": "http://egun.de/market/cache/aucimg/100x100/0.7592691.230697364.jpg",
+            "remaining": 0,
+            "url": "http://egun.de/market/item.php?id=7592691",
+            "timestamp": 0,
+            "is_price_final": true
+          },
+          "http://egun.de/market/item.php?id=7582640": {
+            "price": 3500.0,
+            "desc": "Springfield Armory M1A Super Match .308 Win",
+            "gcal": "http://www.google.com/calendar/event?action=TEMPLATE&dates=20190908T171400/20190908T171400&text=Springfield+Armory+M1A+Super+Match+.308+Win&location=&details=",
+            "thumb": "http://egun.de/market/cache/aucimg/100x100/5.7582640.581160072.jpg",
+            "remaining": 2586600,
+            "url": "http://egun.de/market/item.php?id=7582640",
+            "timestamp": 1567955696,
+            "is_price_final": true
+          },
+          "http://egun.de/market/item.php?id=7578583": {
+            "price": 1889.0,
+            "desc": "Springfield M1A (M21,M4 Schaft) .308 7,62 NATO Match",
+            "gcal": "http://www.google.com/calendar/event?action=TEMPLATE&dates=20190830T222100/20190830T222100&text=Springfield+M1A+%28M21%2CM4+Schaft%29+.308+7%2C62+NATO+Match&location=&details=",
+            "thumb": "http://egun.de/market/cache/aucimg/100x100/1.7578583.983615036.jpg",
+            "remaining": 2108520,
+            "url": "http://egun.de/market/item.php?id=7578583",
+            "timestamp": 1567196480,
+            "is_price_final": true
           }
         },
-        "avg_price": 2617.5
+        "avg_price": 2216.625
       },
-      "http://www.egun.de/market/list_items.php?mode=qry&plusdescr=off&query=stgw+57&ewb=1": {
+      "http://www.egun.de/market/list_items.php?mode=qry&plusdescr=off&wheremode=and&query=shr+970&quick=1": {
+        "auctions": {
+          "http://egun.de/market/item.php?id=7492300": {
+            "price": 140.0,
+            "desc": "SHR 970 Magazin 30.06 uvm.(Restbestand)",
+            "gcal": "",
+            "thumb": "http://egun.de/market/cache/aucimg/100x100/5.7492300.92710934.jpg",
+            "remaining": 0,
+            "url": "http://egun.de/market/item.php?id=7492300",
+            "timestamp": 0,
+            "is_price_final": true
+          },
+          "http://egun.de/market/item.php?id=7506617": {
+            "price": 149.0,
+            "desc": "Sig Arms SHR 970 Magazin, 30/06 ,7x64, 9,3x62 usw. Neu",
+            "gcal": "",
+            "thumb": "http://egun.de/market/cache/aucimg/100x100/2.7506617.943962973.jpg",
+            "remaining": 0,
+            "url": "http://egun.de/market/item.php?id=7506617",
+            "timestamp": 0,
+            "is_price_final": true
+          }
+        },
+        "avg_price": 144.5
+      },
+      "http://www.egun.de/market/list_items.php?mode=qry&query=smith+wesson+r8&plusdescr=off&wheremode=and&ewb=1": {
+        "auctions": {
+          "http://egun.de/market/item.php?id=7592473": {
+            "price": 999.0,
+            "desc": "Revolver Smith&Wesson Kaliber 357Mag Modell M&P R8",
+            "gcal": "http://www.google.com/calendar/event?action=TEMPLATE&dates=20190908T165200/20190908T165200&text=Revolver+Smith%26Wesson+Kaliber+357Mag+Modell+M%26P+R8&location=&details=",
+            "thumb": "http://egun.de/market/images/picture.gif",
+            "remaining": 1305840,
+            "url": "http://egun.de/market/item.php?id=7592473",
+            "timestamp": 1567954348,
+            "is_price_final": true
+          }
+        },
+        "avg_price": 999.0
+      },
+      "http://www.egun.de/market/list_items.php?mode=qry&query=m305&plusdescr=off&wheremode=and&ewb=1": {
         "auctions": {},
         "avg_price": null
       },
+      "http://www.egun.de/market/list_items.php?mode=qry&plusdescr=off&query=steyr+scout -rfr -98&ewb=1": {
+        "auctions": {
+          "http://egun.de/market/item.php?id=7572344": {
+            "price": 1760.0,
+            "desc": "Steyr Mannlicher Scout Kal. 308 Win",
+            "gcal": "",
+            "thumb": "http://egun.de/market/cache/aucimg/100x100/3.7572344.1161086465.jpg",
+            "remaining": 0,
+            "url": "http://egun.de/market/item.php?id=7572344",
+            "timestamp": 0,
+            "is_price_final": true
+          }
+        },
+        "avg_price": 1760.0
+      },
       "http://www.egun.de/market/list_items.php?mode=qry&plusdescr=off&query=SG+510&ewb=1": {
         "auctions": {
           "http://egun.de/market/item.php?id=7038461": {
             "price": 595.0,
             "desc": "Rep.Büchse .22lr Steyr Mannlicher SCOUT RFR 510mm Lauf/ Mündungsgewinde (1/2-20) Geradezug (.22lfB)",
-            "gcal": "http://www.google.com/calendar/event?action=TEMPLATE&dates=20190812T185300/20190812T185300&text=Rep.B%C3%BCchse+.22lr+Steyr+Mannlicher+SCOUT+RFR+510mm+Lauf%2F+M%C3%BCndungsgewinde+%281%2F2-20%29+Geradezug+%28.22lfB%29&location=&details=",
-            "thumb": "http://egun.de/market/cache/aucimg/100x100/2.7038461.546939400.jpg",
-            "remaining": 1136400,
+            "gcal": "",
+            "thumb": "http://egun.de/market/cache/aucimg/100x100/4.7038461.777004617.jpg",
+            "remaining": 0,
             "url": "http://egun.de/market/item.php?id=7038461",
-            "timestamp": 1565628794,
-            "is_price_final": false
+            "timestamp": 0,
+            "is_price_final": true
           }
         },
         "avg_price": 595.0
       },
-      "http://www.egun.de/market/list_items.php?mode=qry&plusdescr=off&query=m1a&ewb=1&type=1": {
-        "auctions": {},
-        "avg_price": null
+      "http://www.egun.de/market/list_items.php?mode=qry&plusdescr=off&query=m14+luxdef&ewb=1&minprice=200": {
+        "auctions": {
+          "http://egun.de/market/item.php?id=7510941": {
+            "price": 2099.0,
+            "desc": "LuxDefTec M14 Cal. 308 Win inkl. Montage",
+            "gcal": "http://www.google.com/calendar/event?action=TEMPLATE&dates=20190915T145400/20190915T145400&text=LuxDefTec+M14+Cal.+308+Win+inkl.+Montage&location=&details=",
+            "thumb": "http://egun.de/market/cache/aucimg/100x100/6.7510941.937973306.jpg",
+            "remaining": 969480,
+            "url": "http://egun.de/market/item.php?id=7510941",
+            "timestamp": 1568552060,
+            "is_price_final": true
+          }
+        },
+        "avg_price": 2099.0
       },
-      "http://www.egun.de/market/list_items.php?mode=qry&plusdescr=off&wheremode=and&query=shr+970&quick=1": {
+      "http://www.egun.de/market/list_items.php?mode=qry&plusdescr=off&query=sig+550&ewb=1&minprice=250&type=1": {
         "auctions": {
-          "http://egun.de/market/item.php?id=7506617": {
-            "price": 149.0,
-            "desc": "Sig Arms SHR 970 Magazin, 30/06 ,7x64, 9,3x62 usw. Neu",
-            "gcal": "http://www.google.com/calendar/event?action=TEMPLATE&dates=20190806T083500/20190806T083500&text=Sig+Arms+SHR+970+Magazin%2C+30%2F06+%2C7x64%2C+9%2C3x62+usw.+Neu&location=&details=",
-            "thumb": "http://egun.de/market/cache/aucimg/100x100/2.7506617.943962973.jpg",
-            "remaining": 580920,
-            "url": "http://egun.de/market/item.php?id=7506617",
-            "timestamp": 1565073313,
+          "http://egun.de/market/item.php?id=7583963": {
+            "price": 1763.0,
+            "desc": "Ha.Büchse .223Rem Swiss Arms/ SAN SIG Sport 551 SIG 550, Matchlauf",
+            "gcal": "",
+            "thumb": "http://egun.de/market/cache/aucimg/100x100/0.7583963.190933556.jpg",
+            "remaining": 0,
+            "url": "http://egun.de/market/item.php?id=7583963",
+            "timestamp": 0,
+            "is_price_final": true
+          },
+          "http://egun.de/market/item.php?id=7607676": {
+            "price": 2460.0,
+            "desc": "SIG 550 Zivil-Match-Kempf 223 Rem.",
+            "gcal": "",
+            "thumb": "http://egun.de/market/cache/aucimg/100x100/0.7607676.120689578.jpg",
+            "remaining": 0,
+            "url": "http://egun.de/market/item.php?id=7607676",
+            "timestamp": 0,
+            "is_price_final": true
+          },
+          "http://egun.de/market/item.php?id=7566331": {
+            "price": 3850.0,
+            "desc": "SIG 550 Sport 223 Rem. Set Top viel Zubehör",
+            "gcal": "",
+            "thumb": "http://egun.de/market/cache/aucimg/100x100/4.7566331.1312216270.jpg",
+            "remaining": 0,
+            "url": "http://egun.de/market/item.php?id=7566331",
+            "timestamp": 0,
+            "is_price_final": true
+          },
+          "http://egun.de/market/item.php?id=7603289": {
+            "price": 1800.0,
+            "desc": "SIG Kempf 550 Zivil Match",
+            "gcal": "http://www.google.com/calendar/event?action=TEMPLATE&dates=20190929T175900/20190929T175900&text=SIG+Kempf+550+Zivil+Match&location=&details=",
+            "thumb": "http://egun.de/market/cache/aucimg/100x100/2.7603289.1513912340.jpg",
+            "remaining": 108900,
+            "url": "http://egun.de/market/item.php?id=7603289",
+            "timestamp": 1569772774,
+            "is_price_final": true
+          },
+          "http://egun.de/market/item.php?id=7615909": {
+            "price": 2510.0,
+            "desc": "Original SIG 550-1 Sniper",
+            "gcal": "http://www.google.com/calendar/event?action=TEMPLATE&dates=20191003T005300/20191003T005300&text=Original+SIG+550-1+Sniper&location=&details=",
+            "thumb": "http://egun.de/market/cache/aucimg/100x100/0.7615909.252666101.jpg",
+            "remaining": 11820,
+            "url": "http://egun.de/market/item.php?id=7615909",
+            "timestamp": 1570056838,
+            "is_price_final": false
+          },
+          "http://egun.de/market/item.php?id=7639992": {
+            "price": 625.0,
+            "desc": "Selbstladebüchse - SIG / SAR Mod. 550 \"Europa Sport\" + 3 Magazine | Cal. .223 Remington",
+            "gcal": "http://www.google.com/calendar/event?action=TEMPLATE&dates=20191020T195900/20191020T195900&text=Selbstladeb%C3%BCchse+-+SIG+%2F+SAR+Mod.+550+%22Europa+Sport%22+%2B+3+Magazine+%7C+Cal.+.223+Remington&location=&details=",
+            "thumb": "http://egun.de/market/cache/aucimg/100x100/5.7639992.911896745.jpg",
+            "remaining": 1549380,
+            "url": "http://egun.de/market/item.php?id=7639992",
+            "timestamp": 1571594398,
             "is_price_final": false
+          },
+          "http://egun.de/market/item.php?id=7636978": {
+            "price": 3350.0,
+            "desc": "SIG Kempf SG 550 Zivilmatch",
+            "gcal": "http://www.google.com/calendar/event?action=TEMPLATE&dates=20191024T194700/20191024T194700&text=SIG+Kempf+SG+550+Zivilmatch&location=&details=",
+            "thumb": "http://egun.de/market/cache/aucimg/100x100/2.7636978.1307450727.jpg",
+            "remaining": 1894260,
+            "url": "http://egun.de/market/item.php?id=7636978",
+            "timestamp": 1571939278,
+            "is_price_final": false
+          },
+          "http://egun.de/market/item.php?id=7607677": {
+            "price": 2500.0,
+            "desc": "SIG 550 Zivil-Match-Kempf 223 Rem.",
+            "gcal": "http://www.google.com/calendar/event?action=TEMPLATE&dates=20191001T115300/20191001T115300&text=SIG+550+Zivil-Match-Kempf+223+Rem.&location=&details=",
+            "thumb": "http://egun.de/market/images/picture.gif",
+            "remaining": 2477880,
+            "url": "http://egun.de/market/item.php?id=7607677",
+            "timestamp": 1569923598,
+            "is_price_final": true
+          },
+          "http://egun.de/market/item.php?id=7550521": {
+            "price": 2310.0,
+            "desc": "Selbstladebüchse SIG Sport 550 Kal. .223 rem",
+            "gcal": "",
+            "thumb": "http://egun.de/market/cache/aucimg/100x100/5.7550521.99022556.jpg",
+            "remaining": 0,
+            "url": "http://egun.de/market/item.php?id=7550521",
+            "timestamp": 0,
+            "is_price_final": true
           }
         },
-        "avg_price": 149.0
+        "avg_price": 2350.3333
+      },
+      "http://www.egun.de/market/list_items.php?mode=qry&plusdescr=off&query=stgw+57&ewb=1": {
+        "auctions": {},
+        "avg_price": null
       },
       "http://www.egun.de/market/list_items.php?mode=qry&plusdescr=off&query=accuracy+international&minprice=250&type=1": {
         "auctions": {
+          "http://egun.de/market/item.php?id=7607599": {
+            "price": 1449.0,
+            "desc": "Rem 700 .308 AICS Sniper Accuracy International",
+            "gcal": "",
+            "thumb": "http://egun.de/market/cache/aucimg/100x100/0.7607599.339439951.jpg",
+            "remaining": 0,
+            "url": "http://egun.de/market/item.php?id=7607599",
+            "timestamp": 0,
+            "is_price_final": true
+          },
           "http://egun.de/market/item.php?id=7557075": {
-            "price": 610.0,
+            "price": 705.0,
             "desc": "Accuracy International klappbarer Schaft Remington 700 short action (G22 Schaft)",
-            "gcal": "http://www.google.com/calendar/event?action=TEMPLATE&dates=20190807T211900/20190807T211900&text=Accuracy+International+klappbarer+Schaft+Remington+700+short+action+%28G22+Schaft%29&location=&details=",
+            "gcal": "",
             "thumb": "http://egun.de/market/cache/aucimg/100x100/3.7557075.185135632.jpg",
-            "remaining": 713160,
+            "remaining": 0,
             "url": "http://egun.de/market/item.php?id=7557075",
-            "timestamp": 1565205552,
-            "is_price_final": false
+            "timestamp": 0,
+            "is_price_final": true
+          },
+          "http://egun.de/market/item.php?id=7612252": {
+            "price": 1850.0,
+            "desc": "SPORT-SNIPER REMINGTON 700 SPS TACTICAL, ACCURACY INTERNATIONAL KLAPPSCHAFT",
+            "gcal": "",
+            "thumb": "http://egun.de/market/cache/aucimg/100x100/3.7612252.469808946.jpg",
+            "remaining": 0,
+            "url": "http://egun.de/market/item.php?id=7612252",
+            "timestamp": 0,
+            "is_price_final": true
           }
         },
-        "avg_price": 605.0
-      },
-      "http://www.egun.de/market/list_items.php?mode=qry&plusdescr=off&query=aics+-magazin&minprice=350": {
+        "avg_price": 1334.6666
+      }
+    }
+  },
+  "lars": {
+    "queries": {
+      "http://www.egun.de/market/list_items.php?mode=qry&plusdescr=off&query=Steyr+aug&ewb=1": {
         "auctions": {
-          "http://egun.de/market/item.php?id=7020521": {
-            "price": 1392.0,
-            "desc": "Accuracy International Chassis System (AICS-AX 2.0) FDE Remington 700 SA .308 Repetierbüchsen",
-            "gcal": "http://www.google.com/calendar/event?action=TEMPLATE&dates=20190806T035100/20190806T035100&text=Accuracy+International+Chassis+System+%28AICS-AX+2.0%29+FDE+Remington+700+SA+.308+Repetierb%C3%BCchsen&location=&details=",
-            "thumb": "http://egun.de/market/cache/aucimg/100x100/0.7020521.1109967068.jpg",
-            "remaining": 563880,
-            "url": "http://egun.de/market/item.php?id=7020521",
-            "timestamp": 1565056274,
+          "http://egun.de/market/item.php?id=7595521": {
+            "price": 2409.0,
+            "desc": "Steyr AUG-Z A3 Selbstladebüchse StG77 Kal. .223 Rem. 5,56x45 NEU",
+            "gcal": "http://www.google.com/calendar/event?action=TEMPLATE&dates=20190922T200100/20190922T200100&text=Steyr+AUG-Z+A3+Selbstladeb%C3%BCchse+StG77+Kal.+.223+Rem.+5%2C56x45+NEU&location=&details=",
+            "thumb": "http://egun.de/market/cache/aucimg/100x100/2.7595521.989940334.jpg",
+            "remaining": 60,
+            "url": "http://egun.de/market/item.php?id=7595521",
+            "timestamp": 1569175277,
+            "is_price_final": true
+          },
+          "http://egun.de/market/item.php?id=7645498": {
+            "price": 3000.0,
+            "desc": "Steyr Aug A3 Einzelstück",
+            "gcal": "http://www.google.com/calendar/event?action=TEMPLATE&dates=20191015T100800/20191015T100800&text=Steyr+Aug+A3+Einzelst%C3%BCck&location=&details=",
+            "thumb": "http://egun.de/market/cache/aucimg/100x100/2.7645498.816300357.jpg",
+            "remaining": 1081920,
+            "url": "http://egun.de/market/item.php?id=7645498",
+            "timestamp": 1571126933,
             "is_price_final": false
           },
-          "http://egun.de/market/item.php?id=7547554": {
-            "price": 1699.0,
-            "desc": "Remington 700 Police .308Win. 66cm Lauf, AICS/Accuracy International Klappschaft, EBIARMS-Bremse",
-            "gcal": "http://www.google.com/calendar/event?action=TEMPLATE&dates=20190808T131600/20190808T131600&text=Remington+700+Police+.308Win.+66cm+Lauf%2C+AICS%2FAccuracy+International+Klappschaft%2C+EBIARMS-Bremse&location=&details=",
-            "thumb": "http://egun.de/market/cache/aucimg/100x100/2.7547554.616577857.jpg",
-            "remaining": 1184040,
-            "url": "http://egun.de/market/item.php?id=7547554",
-            "timestamp": 1565262974,
+          "http://egun.de/market/item.php?id=7576444": {
+            "price": 2000.0,
+            "desc": "Steyr AUG Z A3 Bullpup mit Zubehör (kein AR / OA)",
+            "gcal": "http://www.google.com/calendar/event?action=TEMPLATE&dates=20190818T191800/20190818T191800&text=Steyr+AUG+Z+A3+Bullpup+mit+Zubeh%C3%B6r+%28kein+AR+%2F+OA%29&location=&details=",
+            "thumb": "http://egun.de/market/images/picture.gif",
+            "remaining": 459480,
+            "url": "http://egun.de/market/item.php?id=7576444",
+            "timestamp": 1566148735,
+            "is_price_final": true
+          },
+          "http://egun.de/market/item.php?id=7635178": {
+            "price": 3000.0,
+            "desc": "Steyr Aug A3 mit Swarovski z6i",
+            "gcal": "http://www.google.com/calendar/event?action=TEMPLATE&dates=20191007T083800/20191007T083800&text=Steyr+Aug+A3+mit+Swarovski+z6i&location=&details=",
+            "thumb": "http://egun.de/market/cache/aucimg/100x100/1.7635178.345007921.jpg",
+            "remaining": 1026840,
+            "url": "http://egun.de/market/item.php?id=7635178",
+            "timestamp": 1570430311,
             "is_price_final": false
+          },
+          "http://egun.de/market/item.php?id=7590893": {
+            "price": 2500.0,
+            "desc": "Steyr Aug A2 Kal 223 Rem",
+            "gcal": "http://www.google.com/calendar/event?action=TEMPLATE&dates=20190915T135200/20190915T135200&text=Steyr+Aug+A2+Kal+223+Rem&location=&details=",
+            "thumb": "http://egun.de/market/cache/aucimg/100x100/6.7590893.1041189384.jpg",
+            "remaining": 681300,
+            "url": "http://egun.de/market/item.php?id=7590893",
+            "timestamp": 1568548338,
+            "is_price_final": true
+          },
+          "http://egun.de/market/item.php?id=7591133": {
+            "price": 2100.0,
+            "desc": "Steyr AUG Z A3 Bullpup (kein AR / OA)",
+            "gcal": "http://www.google.com/calendar/event?action=TEMPLATE&dates=20190831T180300/20190831T180300&text=Steyr+AUG+Z+A3+Bullpup+%28kein+AR+%2F+OA%29&location=&details=",
+            "thumb": "http://egun.de/market/cache/aucimg/100x100/6.7591133.577206180.jpg",
+            "remaining": 117360,
+            "url": "http://egun.de/market/item.php?id=7591133",
+            "timestamp": 1567267413,
+            "is_price_final": true
+          },
+          "http://egun.de/market/item.php?id=7613929": {
+            "price": 1353.0,
+            "desc": "Sako TRG 21 baugleich 22 oder Steyr SSG 04 Nachfolger der 69 , Vorlage für die 08 jeweils in .308",
+            "gcal": "http://www.google.com/calendar/event?action=TEMPLATE&dates=20191006T120900/20191006T120900&text=Sako+TRG+21+baugleich+22+oder+Steyr+SSG+04+Nachfolger+der+69+%2C+Vorlage+f%C3%BCr+die+08+jeweils+in+.308&location=&details=",
+            "thumb": "http://egun.de/market/cache/aucimg/100x100/5.7613929.92607526.jpg",
+            "remaining": 311580,
+            "url": "http://egun.de/market/item.php?id=7613929",
+            "timestamp": 1570356593,
+            "is_price_final": false
+          },
+          "http://egun.de/market/item.php?id=7595506": {
+            "price": 2399.0,
+            "desc": "Steyr AUG-Z A3 Selbstladebüchse StG77 Kal. .223 Rem. 5,56x45",
+            "gcal": "http://www.google.com/calendar/event?action=TEMPLATE&dates=20190903T200000/20190903T200000&text=Steyr+AUG-Z+A3+Selbstladeb%C3%BCchse+StG77+Kal.+.223+Rem.+5%2C56x45&location=&details=",
+            "thumb": "http://egun.de/market/cache/aucimg/100x100/2.7595506.325534694.jpg",
+            "remaining": 60,
+            "url": "http://egun.de/market/item.php?id=7595506",
+            "timestamp": 1567533637,
+            "is_price_final": true
+          },
+          "http://egun.de/market/item.php?id=7595216": {
+            "price": 100.0,
+            "desc": "STEYR AUG-Zivil verschlussstückkörper links zivil",
+            "gcal": "",
+            "thumb": "http://egun.de/market/cache/aucimg/100x100/2.7595216.217170795.jpg",
+            "remaining": 0,
+            "url": "http://egun.de/market/item.php?id=7595216",
+            "timestamp": 0,
+            "is_price_final": true
           }
         },
-        "avg_price": 1545.5
+        "avg_price": 2094.5923
       }
     }
   },
@@ -191,14 +528,104 @@
     "queries": {
       "http://www.egun.de/market/list_items.php?mode=qry&plusdescr=off&query=desert+eagle&ewb=1&minprice=500": {
         "auctions": {
-          "http://egun.de/market/item.php?id=7570916": {
-            "price": 2100.0,
-            "desc": "Desert Eagle 50 AE",
-            "gcal": "http://www.google.com/calendar/event?action=TEMPLATE&dates=20190803T175400/20190803T175400&text=Desert+Eagle+50+AE&location=&details=",
-            "thumb": "http://egun.de/market/cache/aucimg/100x100/1.7570916.713150939.jpg",
-            "remaining": 355260,
-            "url": "http://egun.de/market/item.php?id=7570916",
-            "timestamp": 1564847655,
+          "http://egun.de/market/item.php?id=7576636": {
+            "price": 1144.99,
+            "desc": "Desert Eagle Original IMI 44 Magnum",
+            "gcal": "",
+            "thumb": "http://egun.de/market/cache/aucimg/100x100/0.7576636.999821047.jpg",
+            "remaining": 0,
+            "url": "http://egun.de/market/item.php?id=7576636",
+            "timestamp": 0,
+            "is_price_final": true
+          },
+          "http://egun.de/market/item.php?id=7618164": {
+            "price": 1322.89,
+            "desc": "Pistole IMI Magnum Research Desert Eagle Mark XIX, Kal. .44 Rem. Magnum, Bj.2002, tiptop!",
+            "gcal": "",
+            "thumb": "http://egun.de/market/cache/aucimg/100x100/0.7618164.92639369.jpg",
+            "remaining": 0,
+            "url": "http://egun.de/market/item.php?id=7618164",
+            "timestamp": 0,
+            "is_price_final": true
+          },
+          "http://egun.de/market/item.php?id=7598461": {
+            "price": 2210.0,
+            "desc": "Desert Eagle 50AE mit Wechsellauf 44 MAG",
+            "gcal": "",
+            "thumb": "http://egun.de/market/cache/aucimg/100x100/5.7598461.508371333.jpg",
+            "remaining": 0,
+            "url": "http://egun.de/market/item.php?id=7598461",
+            "timestamp": 0,
+            "is_price_final": true
+          },
+          "http://egun.de/market/item.php?id=7639689": {
+            "price": 904.0,
+            "desc": "Desert Eagle Cal.44",
+            "gcal": "http://www.google.com/calendar/event?action=TEMPLATE&dates=20191010T215900/20191010T215900&text=Desert+Eagle+Cal.44&location=&details=",
+            "thumb": "http://egun.de/market/cache/aucimg/100x100/4.7639689.579085821.jpg",
+            "remaining": 692580,
+            "url": "http://egun.de/market/item.php?id=7639689",
+            "timestamp": 1570737593,
+            "is_price_final": false
+          },
+          "http://egun.de/market/item.php?id=7600978": {
+            "price": 2376.9,
+            "desc": "Desert Eagle",
+            "gcal": "",
+            "thumb": "http://egun.de/market/cache/aucimg/100x100/0.7600978.747228888.jpg",
+            "remaining": 0,
+            "url": "http://egun.de/market/item.php?id=7600978",
+            "timestamp": 0,
+            "is_price_final": true
+          },
+          "http://egun.de/market/item.php?id=7584828": {
+            "price": 1999.0,
+            "desc": "Desert Eagle XIX .357Mag L5 von Magnum Research",
+            "gcal": "http://www.google.com/calendar/event?action=TEMPLATE&dates=20191005T194500/20191005T194500&text=Desert+Eagle+XIX+.357Mag+L5+von+Magnum+Research&location=&details=",
+            "thumb": "http://egun.de/market/cache/aucimg/100x100/0.7584828.661756861.jpg",
+            "remaining": 252540,
+            "url": "http://egun.de/market/item.php?id=7584828",
+            "timestamp": 1570297553,
+            "is_price_final": false
+          },
+          "http://egun.de/market/item.php?id=7599758": {
+            "price": 899.0,
+            "desc": "Desert Eagle 357 Mag. IMI Top Zustand.",
+            "gcal": "http://www.google.com/calendar/event?action=TEMPLATE&dates=20190914T210900/20190914T210900&text=Desert+Eagle+357+Mag.+IMI+Top+Zustand.&location=&details=",
+            "thumb": "http://egun.de/market/images/picture.gif",
+            "remaining": 1564980,
+            "url": "http://egun.de/market/item.php?id=7599758",
+            "timestamp": 1568488199,
+            "is_price_final": true
+          },
+          "http://egun.de/market/item.php?id=7574101": {
+            "price": 2599.99,
+            "desc": "IMI Desert Eagle 50AE Großkaliber Pistole Israel Handfeuer Waffe",
+            "gcal": "http://www.google.com/calendar/event?action=TEMPLATE&dates=20190822T220600/20190822T220600&text=IMI+Desert+Eagle+50AE+Gro%C3%9Fkaliber+Pistole+Israel+Handfeuer+Waffe&location=&details=",
+            "thumb": "http://egun.de/market/images/picture.gif",
+            "remaining": 1209900,
+            "url": "http://egun.de/market/item.php?id=7574101",
+            "timestamp": 1566504366,
+            "is_price_final": true
+          },
+          "http://egun.de/market/item.php?id=7609683": {
+            "price": 932.97,
+            "desc": "Wechsellauf Desert Eagle .357 Magnum 14\" inkl. Aimpoint",
+            "gcal": "",
+            "thumb": "http://egun.de/market/cache/aucimg/100x100/1.7609683.414051379.jpg",
+            "remaining": 0,
+            "url": "http://egun.de/market/item.php?id=7609683",
+            "timestamp": 0,
+            "is_price_final": true
+          },
+          "http://egun.de/market/item.php?id=7632212": {
+            "price": 804.0,
+            "desc": "Desert Eagle Kal. 44 Mag. orig. IMI, super Stück!",
+            "gcal": "http://www.google.com/calendar/event?action=TEMPLATE&dates=20191013T193000/20191013T193000&text=Desert+Eagle+Kal.+44+Mag.+orig.+IMI%2C+super+St%C3%BCck%21&location=&details=",
+            "thumb": "http://egun.de/market/cache/aucimg/100x100/6.7632212.1473465344.jpg",
+            "remaining": 942840,
+            "url": "http://egun.de/market/item.php?id=7632212",
+            "timestamp": 1570987853,
             "is_price_final": false
           },
           "http://egun.de/market/item.php?id=7539610": {
@@ -211,28 +638,147 @@
             "timestamp": 0,
             "is_price_final": true
           },
-          "http://egun.de/market/item.php?id=7565498": {
-            "price": 1035.0,
-            "desc": "Pistole IMI Magnum Research Desert Eagle Kal. .50 Action Express, Bj. 1995, mit Wechsellauf, schön!",
-            "gcal": "http://www.google.com/calendar/event?action=TEMPLATE&dates=20190818T214600/20190818T214600&text=Pistole+IMI+Magnum+Research+Desert+Eagle+Kal.+.50+Action+Express%2C+Bj.+1995%2C+mit+Wechsellauf%2C+sch%C3%B6n%21&location=&details=",
-            "thumb": "http://egun.de/market/cache/aucimg/100x100/3.7565498.164056026.jpg",
-            "remaining": 1665180,
-            "url": "http://egun.de/market/item.php?id=7565498",
-            "timestamp": 1566157575,
-            "is_price_final": false
+          "http://egun.de/market/item.php?id=7630108": {
+            "price": 1118.88,
+            "desc": "Desert Eagle",
+            "gcal": "http://www.google.com/calendar/event?action=TEMPLATE&dates=20190924T121500/20190924T121500&text=Desert+Eagle&location=&details=",
+            "thumb": "http://egun.de/market/images/picture.gif",
+            "remaining": 60,
+            "url": "http://egun.de/market/item.php?id=7630108",
+            "timestamp": 1569320158,
+            "is_price_final": true
           },
           "http://egun.de/market/item.php?id=7310815": {
             "price": 2690.0,
             "desc": "IMI Desert Eagle Kal. .50AE in Silbern mit Gold, Abzug gemacht, verst. Visier, Holzgriff",
-            "gcal": "http://www.google.com/calendar/event?action=TEMPLATE&dates=20190811T174800/20190811T174800&text=IMI+Desert+Eagle+Kal.+.50AE+in+Silbern+mit+Gold%2C+Abzug+gemacht%2C+verst.+Visier%2C+Holzgriff&location=&details=",
+            "gcal": "",
             "thumb": "http://egun.de/market/cache/aucimg/100x100/3.7310815.51406938.jpg",
-            "remaining": 1046100,
+            "remaining": 0,
             "url": "http://egun.de/market/item.php?id=7310815",
-            "timestamp": 1565538495,
+            "timestamp": 0,
+            "is_price_final": true
+          },
+          "http://egun.de/market/item.php?id=7633036": {
+            "price": 1025.0,
+            "desc": "Desert Eagle .50 AE mit Wechselsystem .44 Magnum",
+            "gcal": "http://www.google.com/calendar/event?action=TEMPLATE&dates=20191013T101300/20191013T101300&text=Desert+Eagle+.50+AE+mit+Wechselsystem+.44+Magnum&location=&details=",
+            "thumb": "http://egun.de/market/cache/aucimg/100x100/0.7633036.861606495.jpg",
+            "remaining": 909420,
+            "url": "http://egun.de/market/item.php?id=7633036",
+            "timestamp": 1570954433,
+            "is_price_final": false
+          },
+          "http://egun.de/market/item.php?id=7570772": {
+            "price": 1499.0,
+            "desc": "Pistole Desert Eagle, Kal..357 Mag.im Originlalkoffer.TOP-Zustand!!!",
+            "gcal": "",
+            "thumb": "http://egun.de/market/cache/aucimg/100x100/1.7570772.1335862830.jpg",
+            "remaining": 0,
+            "url": "http://egun.de/market/item.php?id=7570772",
+            "timestamp": 0,
+            "is_price_final": true
+          },
+          "http://egun.de/market/item.php?id=7565498": {
+            "price": 1530.0,
+            "desc": "Pistole IMI Magnum Research Desert Eagle Kal. .50 Action Express, Bj. 1995, mit Wechsellauf, schön!",
+            "gcal": "",
+            "thumb": "http://egun.de/market/cache/aucimg/100x100/3.7565498.164056026.jpg",
+            "remaining": 0,
+            "url": "http://egun.de/market/item.php?id=7565498",
+            "timestamp": 0,
+            "is_price_final": true
+          },
+          "http://egun.de/market/item.php?id=7583671": {
+            "price": 1103.0,
+            "desc": "Desert Eagle",
+            "gcal": "",
+            "thumb": "http://egun.de/market/cache/aucimg/100x100/6.7583671.812612452.jpg",
+            "remaining": 0,
+            "url": "http://egun.de/market/item.php?id=7583671",
+            "timestamp": 0,
+            "is_price_final": true
+          },
+          "http://egun.de/market/item.php?id=7641110": {
+            "price": 2199.0,
+            "desc": "Magnum Research Desert Eagle black 6\" .50AE",
+            "gcal": "http://www.google.com/calendar/event?action=TEMPLATE&dates=20191028T105400/20191028T105400&text=Magnum+Research+Desert+Eagle+black+6%22+.50AE&location=&details=",
+            "thumb": "http://egun.de/market/cache/aucimg/100x100/6.7641110.1345344762.jpg",
+            "remaining": 2207880,
+            "url": "http://egun.de/market/item.php?id=7641110",
+            "timestamp": 1572252893,
+            "is_price_final": false
+          },
+          "http://egun.de/market/item.php?id=7609647": {
+            "price": 960.0,
+            "desc": "Pistole Desert Eagle .357 Magnum IMI",
+            "gcal": "",
+            "thumb": "http://egun.de/market/cache/aucimg/100x100/1.7609647.696131569.jpg",
+            "remaining": 0,
+            "url": "http://egun.de/market/item.php?id=7609647",
+            "timestamp": 0,
+            "is_price_final": true
+          },
+          "http://egun.de/market/item.php?id=7618515": {
+            "price": 1268.88,
+            "desc": "IMI Desert Eagle in .44 Magnum",
+            "gcal": "",
+            "thumb": "http://egun.de/market/cache/aucimg/100x100/0.7618515.1001601499.jpg",
+            "remaining": 0,
+            "url": "http://egun.de/market/item.php?id=7618515",
+            "timestamp": 0,
+            "is_price_final": true
+          },
+          "http://egun.de/market/item.php?id=7570916": {
+            "price": 2100.0,
+            "desc": "Desert Eagle 50 AE",
+            "gcal": "http://www.google.com/calendar/event?action=TEMPLATE&dates=20190803T175400/20190803T175400&text=Desert+Eagle+50+AE&location=&details=",
+            "thumb": "http://egun.de/market/cache/aucimg/100x100/1.7570916.713150939.jpg",
+            "remaining": 155160,
+            "url": "http://egun.de/market/item.php?id=7570916",
+            "timestamp": 1564847662,
+            "is_price_final": true
+          },
+          "http://egun.de/market/item.php?id=7624856": {
+            "price": 2499.0,
+            "desc": "Desert Eagle .50 ae",
+            "gcal": "http://www.google.com/calendar/event?action=TEMPLATE&dates=20191010T115800/20191010T115800&text=Desert+Eagle+.50+ae&location=&details=",
+            "thumb": "http://egun.de/market/cache/aucimg/100x100/0.7624856.1097816156.jpg",
+            "remaining": 656520,
+            "url": "http://egun.de/market/item.php?id=7624856",
+            "timestamp": 1570701533,
             "is_price_final": false
+          },
+          "http://egun.de/market/item.php?id=7585706": {
+            "price": 1299.95,
+            "desc": "Vernickelte IMI \" Desert Eagle \" Pistole im Kal .357 Magnum",
+            "gcal": "http://www.google.com/calendar/event?action=TEMPLATE&dates=20190911T170000/20190911T170000&text=Vernickelte+IMI+%22+Desert+Eagle+%22+Pistole+im+Kal+.357+Magnum&location=&details=",
+            "thumb": "http://egun.de/market/cache/aucimg/100x100/5.7585706.915274368.jpg",
+            "remaining": 1743720,
+            "url": "http://egun.de/market/item.php?id=7585706",
+            "timestamp": 1568214011,
+            "is_price_final": true
+          }
+        },
+        "avg_price": 1533.8024
+      }
+    }
+  },
+  "test": {
+    "queries": {
+      "http://www.egun.de/market/list_items.php?mode=qry&plusdescr=off&query=schusssichere+weste": {
+        "auctions": {
+          "http://egun.de/market/item.php?id=7567346": {
+            "price": 91.0,
+            "desc": "Stichschutzweste-Stichschutz-schusssichere-k",
+            "gcal": "http://www.google.com/calendar/event?action=TEMPLATE&dates=20190805T165100/20190805T165100&text=Stichschutzweste-Stichschutz-schusssichere-k&location=&details=",
+            "thumb": "http://egun.de/market/cache/aucimg/100x100/5.7567346.1031537147.jpg",
+            "remaining": 863700,
+            "url": "http://egun.de/market/item.php?id=7567346",
+            "timestamp": 1565016676,
+            "is_price_final": true
           }
         },
-        "avg_price": 1831.25
+        "avg_price": 91.0
       }
     }
   }

BIN
guntrader


+ 11 - 7
src/main.rs

@@ -33,14 +33,18 @@ fn daemon() {
     loop {
         println!(">>> Running update...");
 
-            let accounts_unlocked = ACCOUNTS.lock().unwrap().clone();
+        let accounts_unlocked = ACCOUNTS.lock().unwrap();
+        let accounts_cl = accounts_unlocked.clone();
+        drop(accounts_unlocked);
 
-            for (account_name, account) in accounts_unlocked {
-                thread::spawn(move || {
-                    let mut accounts = ACCOUNTS.lock().unwrap();
-                    accounts.insert(account_name.to_string(), account.updated());
-                });
-            }
+
+        for (account_name, account) in accounts_cl {
+            thread::spawn(move || {
+                let updated_account = account.updated();
+                let mut accounts = ACCOUNTS.lock().unwrap();
+                accounts.insert(account_name.to_string(), updated_account);
+            });
+        }
 
 
         let accounts_unlocked = ACCOUNTS.lock().unwrap();

+ 11 - 8
src/server.rs

@@ -46,27 +46,30 @@ fn proxy_gate(url: String)  -> Vec<u8>{
 }
 
 
-#[get("/")]
-fn index() -> &'static str {
-    let accounts = ACCOUNTS.lock().unwrap();
-    dbg!(&*accounts);
-    drop(accounts);
-    "Base url"
-}
+// #[get("/")]
+// fn index() -> &'static str {
+//     let accounts = ACCOUNTS.lock().unwrap();
+//     dbg!(&*accounts);
+//     drop(accounts);
+//     "Base url"
+// }
 
 #[post("/save", data = "<account>")] //<tasks> means that the function below will have a var called tasks
 fn save(account: Json<HashMap<String, Account>>) -> &'static str {
     dbg!(&account);
     let mut accounts = ACCOUNTS.lock().unwrap();
     accounts.extend(account.into_inner());
-    dbg!(&accounts);
+    // dbg!(&accounts);
     drop(accounts);
     "Inserted"
 }
 
 #[get("/load/<account>")]
 fn load(account: String) -> content::Json<String> {
+    // println!("U want: {}",account);
+    // let guard = ACCOUNTS.clone();
     let guard = ACCOUNTS.lock().unwrap().clone();
+    // println!("LCK get");
     match guard.get(&account) {
         Some(accountdata) => {
             let json_string = serde_json::to_string(&accountdata.queries).unwrap();

+ 8 - 3
webapp/app.js

@@ -1,5 +1,6 @@
 Number.prototype.currency = function() { return '$' + this.toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, '$1,') };
 function ts_to_remaining(ts) {
+    moment.locale('de');
     return moment.unix(ts).fromNow();
 }
 
@@ -32,7 +33,6 @@ var app = new Vue({
         this.update();
         window.addEventListener('hashchange', function() {
             self.update()
-
         }, false);
 
     },
@@ -63,16 +63,21 @@ var app = new Vue({
         update: function () {
             this.account = window.location.hash.slice(1)
             if (this.account) {
-                console.log(this.account);
+                // console.log(this.account);
                 this.load_account();
             }
         },
+        proxy_img: function (url) {
+            console.log("proxy/" + encodeURIComponent(url));
+            
+            return "proxy/" + encodeURIComponent(url)
+        },
         ordered_auctions: function () {
             return Object.values(this.queries)
             .map(q => Object.values(q.auctions) )
             .flat()
             .sort(function(a, b) {
-                return a.remaining - b.remaining;
+                return a.timestamp - b.timestamp;
             });
     
         },

+ 10 - 10
webapp/index.html

@@ -5,12 +5,10 @@
   <meta content="utf-8" http-equiv="encoding">
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <meta name="mobile-web-app-capable" content="yes">
-  <meta name="theme-color" content="#dddddd">
   <link rel="icon" sizes="128x128" href="icon.png">
   <link rel="apple-touch-icon" sizes="128x128" href="icon.png">
   <meta name="theme-color" content="#216e51">
   <meta name="apple-mobile-web-app-status-bar-style" content="#216e51">
-  <link rel="manifest" href="manifest.json">
 
   <!-- <meta name="theme-color" content="#f7d723">
   <meta name="apple-mobile-web-app-status-bar-style" content="#f7d723"> -->
@@ -45,7 +43,7 @@
   <div id="app" style="display: none">
     <nav>
       <div class="logo">{{title}}</div>
-      <div id="nav-icon">M</div>
+      <div id="nav-icon"></div>
       <input id="nav-toggle" type="checkbox">
       <div id="nav-items">
         <button v-if="account" @click="search_visible = !search_visible">Sucheinstellungen</button>
@@ -60,10 +58,6 @@
     <div class="content">
 
 
-
-
-
-
       <div v-for="auction in ordered_auctions()"
         v-if="auction.price != null && !auction.is_price_final && !search_visible">
 
@@ -95,6 +89,8 @@
       </div>
 
 
+
+
       <div v-for="auction in ordered_auctions()"
         v-if="auction.price != null && auction.is_price_final && !search_visible">
         <div class="auction">
@@ -201,7 +197,7 @@
 <link rel="stylesheet" href="https://rawgit.com/woelper/lilac/master/lilac.min.css">
 
 <!-- Moment.js library -->
-<script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.18.1/moment.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.24.0/moment-with-locales.min.js"></script>
 <!-- moment-duration-format plugin -->
 <script
   src="https://cdnjs.cloudflare.com/ajax/libs/moment-duration-format/1.3.0/moment-duration-format.min.js"></script>
@@ -224,9 +220,8 @@
   }
 
   .auction a {
-    color: aquamarine;
     text-decoration: none;
-    color: #444;
+    color: rgb(27, 162, 216);
   }
 
   .currency {
@@ -258,6 +253,11 @@
     margin: auto;
   }
 
+  #nav-icon {
+    text-align: center;
+    box-sizing: content-box;
+  }
+
   @media screen and (max-width:600px) {
     #nav-items {
       width: 50%;