Johann Woelper 5 лет назад
Родитель
Сommit
9447a85cd3
3 измененных файлов с 566 добавлено и 503 удалено
  1. 359 350
      Cargo.lock
  2. 152 150
      accounts.json
  3. 55 3
      src/query.rs

Разница между файлами не показана из-за своего большого размера
+ 359 - 350
Cargo.lock


+ 152 - 150
accounts.json

@@ -1,52 +1,90 @@
 {
   "johann": {
     "queries": {
-      "http://www.egun.de/market/list_items.php?mode=qry&query=accuracy&plusdescr=off&wheremode=and&ewb=&status=&minprice=300&maxprice=2100": {
+      "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=308+enfield&plusdescr=off&wheremode=and&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=20190806T035200/20190806T035200&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/images/picture.gif",
-            "remaining": 1746060,
-            "url": "http://egun.de/market/item.php?id=7020521",
-            "timestamp": 1565056330,
-            "is_price_final": false
+          "http://egun.de/market/item.php?id=7545805": {
+            "price": 412.0,
+            "desc": "Seltene Lee Enfield Ishapore 2A1 im Kal. 308 Win",
+            "gcal": "",
+            "thumb": "http://egun.de/market/cache/aucimg/64x64/0.7545805.565137928.jpg",
+            "remaining": 0,
+            "url": "http://egun.de/market/item.php?id=7545805",
+            "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=",
+          "http://egun.de/market/item.php?id=7547250": {
+            "price": 482.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=20190802T221200/20190802T221200&text=Original+Enfield+No4+Conversion+auf+7.62%C3%9751mm+NATO%2F+308+Gro%C3%9Fe+Bilder&location=&details=",
             "thumb": "http://egun.de/market/images/picture.gif",
-            "remaining": 1952700,
-            "url": "http://egun.de/market/item.php?id=7547554",
-            "timestamp": 1565262970,
+            "remaining": 346800,
+            "url": "http://egun.de/market/item.php?id=7547250",
+            "timestamp": 1564776777,
             "is_price_final": false
           },
-          "http://egun.de/market/item.php?id=7102212": {
-            "price": 1495.0,
-            "desc": "Accuracy International AX Chassis System grün",
-            "gcal": "http://www.google.com/calendar/event?action=TEMPLATE&dates=20190728T111800/20190728T111800&text=Accuracy+International+AX+Chassis+System+gr%C3%BCn&location=&details=",
+          "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",
+            "gcal": "http://www.google.com/calendar/event?action=TEMPLATE&dates=20190716T211100/20190716T211100&text=Rep.+-+B%C3%BCchse+.308+Win.%3B+Enfield+AIA+M10+No.4+Mk.IV+top+Pr%C3%A4zision+Sniper+Einzelst%C3%BCck+selten+Rarit%C3%A4t&location=&details=",
+            "thumb": "http://egun.de/market/cache/aucimg/64x64/4.7550217.1231953745.jpg",
+            "remaining": 80100,
+            "url": "http://egun.de/market/item.php?id=7550217",
+            "timestamp": 1563304315,
+            "is_price_final": true
+          }
+        },
+        "avg_price": 654.3333
+      },
+      "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=7566331": {
+            "price": 3850.0,
+            "desc": "SIG 550 Sport 223 Rem. Set Top viel Zubehör",
+            "gcal": "http://www.google.com/calendar/event?action=TEMPLATE&dates=20190824T192600/20190824T192600&text=SIG+550+Sport+223+Rem.+Set+Top+viel+Zubeh%C3%B6r&location=&details=",
             "thumb": "http://egun.de/market/images/picture.gif",
-            "remaining": 995220,
-            "url": "http://egun.de/market/item.php?id=7102212",
-            "timestamp": 1564305490,
+            "remaining": 2237640,
+            "url": "http://egun.de/market/item.php?id=7566331",
+            "timestamp": 1566667618,
             "is_price_final": false
           },
-          "http://egun.de/market/item.php?id=7525551": {
-            "price": 645.0,
-            "desc": "Remington Model 783 Accuracy",
-            "gcal": "http://www.google.com/calendar/event?action=TEMPLATE&dates=20190722T075900/20190722T075900&text=Remington+Model+783+Accuracy&location=&details=",
+          "http://egun.de/market/item.php?id=7550521": {
+            "price": 1385.0,
+            "desc": "Selbstladebüchse SIG Sport 550 Kal. .223 rem",
+            "gcal": "http://www.google.com/calendar/event?action=TEMPLATE&dates=20190806T122600/20190806T122600&text=Selbstladeb%C3%BCchse+SIG+Sport+550+Kal.+.223+rem&location=&details=",
+            "thumb": "http://egun.de/market/cache/aucimg/64x64/5.7550521.99022556.jpg",
+            "remaining": 657240,
+            "url": "http://egun.de/market/item.php?id=7550521",
+            "timestamp": 1565087218,
+            "is_price_final": false
+          }
+        },
+        "avg_price": 2617.5
+      },
+      "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=7557075": {
+            "price": 605.0,
+            "desc": "Accuracy International klappbarer Schaft Remington 700 short action (G22 Schaft)",
+            "gcal": "http://www.google.com/calendar/event?action=TEMPLATE&dates=20190807T211800/20190807T211800&text=Accuracy+International+klappbarer+Schaft+Remington+700+short+action+%28G22+Schaft%29&location=&details=",
             "thumb": "http://egun.de/market/images/picture.gif",
-            "remaining": 464880,
-            "url": "http://egun.de/market/item.php?id=7525551",
-            "timestamp": 1563775150,
+            "remaining": 775560,
+            "url": "http://egun.de/market/item.php?id=7557075",
+            "timestamp": 1565205539,
             "is_price_final": false
           }
         },
-        "avg_price": 1307.75
+        "avg_price": 605.0
+      },
+      "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&wheremode=and&maxprice=2200&query=m14+luxdef&quick=1": {
+      "http://www.egun.de/market/list_items.php?mode=qry&query=m305&plusdescr=off&wheremode=and&ewb=1": {
         "auctions": {},
         "avg_price": null
       },
@@ -55,153 +93,97 @@
           "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=20190806T083600/20190806T083600&text=Sig+Arms+SHR+970+Magazin%2C+30%2F06+%2C7x64%2C+9%2C3x62+usw.+Neu&location=&details=",
+            "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/64x64/2.7506617.943962973.jpg",
-            "remaining": 1763100,
+            "remaining": 643380,
             "url": "http://egun.de/market/item.php?id=7506617",
-            "timestamp": 1565073370,
+            "timestamp": 1565073357,
             "is_price_final": false
           }
         },
         "avg_price": 149.0
       },
-      "http://www.egun.de/market/list_items.php?mode=qry&plusdescr=off&query=mcmillan&minprice=200": {
+      "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=7348238": {
-            "price": 1579.0,
-            "desc": "Browning X-Bolt /McMillan Kal. 308 Win. - Waffen Outlet",
-            "gcal": "http://www.google.com/calendar/event?action=TEMPLATE&dates=20190716T130900/20190716T130900&text=Browning+X-Bolt+%2FMcMillan+Kal.+308+Win.+-+Waffen+Outlet&location=&details=",
-            "thumb": "http://egun.de/market/cache/aucimg/64x64/4.7348238.481318013.jpg",
-            "remaining": 51180,
-            "url": "http://egun.de/market/item.php?id=7348238",
-            "timestamp": 1563275394,
-            "is_price_final": true
-          },
-          "http://egun.de/market/item.php?id=7550948": {
-            "price": 525.0,
-            "desc": "McMillan \" Custom \" Repetierer im Kal .308 Winchester",
-            "gcal": "http://www.google.com/calendar/event?action=TEMPLATE&dates=20190811T201500/20190811T201500&text=McMillan+%22+Custom+%22+Repetierer+im+Kal+.308+Winchester&location=&details=",
-            "thumb": "http://egun.de/market/cache/aucimg/64x64/5.7550948.311856634.jpg",
-            "remaining": 2237040,
-            "url": "http://egun.de/market/item.php?id=7550948",
-            "timestamp": 1565547310,
-            "is_price_final": false
-          },
-          "http://egun.de/market/item.php?id=7552914": {
-            "price": 240.0,
-            "desc": "Grayboe Schaft für Remington 700, .308Win, Nachbau McMillan A5",
-            "gcal": "http://www.google.com/calendar/event?action=TEMPLATE&dates=20190728T170700/20190728T170700&text=Grayboe+Schaft+f%C3%BCr+Remington+700%2C+.308Win%2C+Nachbau+McMillan+A5&location=&details=",
-            "thumb": "http://egun.de/market/images/picture.gif",
-            "remaining": 1016160,
-            "url": "http://egun.de/market/item.php?id=7552914",
-            "timestamp": 1564326430,
+          "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=20190812T185200/20190812T185200&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/64x64/2.7038461.546939400.jpg",
+            "remaining": 1198800,
+            "url": "http://egun.de/market/item.php?id=7038461",
+            "timestamp": 1565628776,
             "is_price_final": false
           }
         },
-        "avg_price": 781.3333
+        "avg_price": 595.0
       },
-      "http://www.egun.de/market/list_items.php?mode=qry&query=aics&plusdescr=off&wheremode=and&ewb=&status=0&minprice=300&maxprice=2800": {
+      "http://www.egun.de/market/list_items.php?mode=qry&plusdescr=off&query=Steyr+scout&ewb=1": {
         "auctions": {
-          "http://egun.de/market/item.php?id=7552935": {
-            "price": 333.0,
-            "desc": "Tikka T3 Schichtholzschaft / AICS Magazin",
-            "gcal": "http://www.google.com/calendar/event?action=TEMPLATE&dates=20190804T171300/20190804T171300&text=Tikka+T3+Schichtholzschaft+%2F+AICS+Magazin&location=&details=",
-            "thumb": "http://egun.de/market/cache/aucimg/64x64/0.7552935.884702445.jpg",
-            "remaining": 1621320,
-            "url": "http://egun.de/market/item.php?id=7552935",
-            "timestamp": 1564931589,
-            "is_price_final": false
-          },
-          "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=20190806T035200/20190806T035200&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/images/picture.gif",
-            "remaining": 1746060,
-            "url": "http://egun.de/market/item.php?id=7020521",
-            "timestamp": 1565056329,
+          "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=20190812T185200/20190812T185200&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/64x64/2.7038461.546939400.jpg",
+            "remaining": 1198800,
+            "url": "http://egun.de/market/item.php?id=7038461",
+            "timestamp": 1565628776,
             "is_price_final": false
           }
         },
-        "avg_price": 862.5
+        "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
-      },
-      "http://www.egun.de/market/list_items.php?mode=qry&query=m1a&plusdescr=off&wheremode=and&ewb=1&status=&minprice=&maxprice=1900": {
+      "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&query=308+enfield&plusdescr=off&wheremode=and&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=7547250": {
-            "price": 378.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=",
+          "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/images/picture.gif",
-            "remaining": 1466520,
-            "url": "http://egun.de/market/item.php?id=7547250",
-            "timestamp": 1564776790,
+            "remaining": 626280,
+            "url": "http://egun.de/market/item.php?id=7020521",
+            "timestamp": 1565056260,
             "is_price_final": false
           },
-          "http://egun.de/market/item.php?id=7550217": {
-            "price": 749.0,
-            "desc": "Rep. - Büchse .308 Win.; Enfield AIA M10 No.4 Mk.IV top Präzision Sniper Einzelstück selten Rarität",
-            "gcal": "http://www.google.com/calendar/event?action=TEMPLATE&dates=20190716T211100/20190716T211100&text=Rep.+-+B%C3%BCchse+.308+Win.%3B+Enfield+AIA+M10+No.4+Mk.IV+top+Pr%C3%A4zision+Sniper+Einzelst%C3%BCck+selten+Rarit%C3%A4t&location=&details=",
-            "thumb": "http://egun.de/market/cache/aucimg/64x64/4.7550217.1231953745.jpg",
-            "remaining": 80100,
-            "url": "http://egun.de/market/item.php?id=7550217",
-            "timestamp": 1563304315,
-            "is_price_final": true
-          },
-          "http://egun.de/market/item.php?id=7545805": {
-            "price": 3.5,
-            "desc": "Seltene Lee Enfield Ishapore 2A1 im Kal. 308 Win",
-            "gcal": "http://www.google.com/calendar/event?action=TEMPLATE&dates=20190728T202400/20190728T202400&text=Seltene+Lee+Enfield+Ishapore+2A1+im+Kal.+308+Win&location=&details=",
-            "thumb": "http://egun.de/market/cache/aucimg/64x64/0.7545805.565137928.jpg",
-            "remaining": 1027980,
-            "url": "http://egun.de/market/item.php?id=7545805",
-            "timestamp": 1564338250,
+          "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/images/picture.gif",
+            "remaining": 1184040,
+            "url": "http://egun.de/market/item.php?id=7547554",
+            "timestamp": 1565262974,
             "is_price_final": false
           }
         },
-        "avg_price": 376.83334
+        "avg_price": 1545.5
       },
-      "http://www.egun.de/market/list_items.php?mode=qry&query=m305&plusdescr=off&wheremode=and&ewb=1": {
+      "http://www.egun.de/market/list_items.php?mode=qry&query=smith+wesson+r8&plusdescr=off&wheremode=and&ewb=1": {
         "auctions": {},
         "avg_price": null
       }
     }
   },
-  "offline": {
+  "test": {
     "queries": {
-      "http://localhost:8002": {
+      "http://www.egun.de/market/list_items.php?mode=qry&plusdescr=off&query=schusssichere+weste": {
         "auctions": {
-          "http://egun.de/market/http://egun.de/market/item.php?id=888888": {
-            "price": 88.88,
-            "desc": "Harris Zweibein old",
-            "gcal": "yo",
+          "http://egun.de/market/item.php?id=7567346": {
+            "price": 95.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/images/picture.gif",
-            "remaining": 789000,
-            "url": "http://egun.de/market/http://egun.de/market/item.php?id=88888888",
-            "timestamp": 1562264532,
-            "is_price_final": true
+            "remaining": 863700,
+            "url": "http://egun.de/market/item.php?id=7567346",
+            "timestamp": 1565016676,
+            "is_price_final": false
           }
         },
-        "avg_price": 88.88
-      },
-      "http://localhost:8001": {
-        "auctions": {},
-        "avg_price": null
-      }
-    }
-  },
-  "test": {
-    "queries": {
-      "http://www.egun.de/market/list_items.php?mode=qry&plusdescr=off&query=schusssichere+weste": {
-        "auctions": {},
-        "avg_price": null
+        "avg_price": 95.0
       }
     }
   },
@@ -209,28 +191,48 @@
     "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=20190803T175300/20190803T175300&text=Desert+Eagle+50+AE&location=&details=",
+            "thumb": "http://egun.de/market/images/picture.gif",
+            "remaining": 417660,
+            "url": "http://egun.de/market/item.php?id=7570916",
+            "timestamp": 1564847634,
+            "is_price_final": false
+          },
           "http://egun.de/market/item.php?id=7539610": {
-            "price": 1420.0,
+            "price": 1510.0,
             "desc": "Desert Eagle IMI IXI Chro. 6 Zoll in .44 Mag.",
-            "gcal": "http://www.google.com/calendar/event?action=TEMPLATE&dates=20190723T185500/20190723T185500&text=Desert+Eagle+IMI+IXI+Chro.+6+Zoll+in+.44+Mag.&location=&details=",
+            "gcal": "",
             "thumb": "http://egun.de/market/images/picture.gif",
-            "remaining": 590640,
+            "remaining": 0,
             "url": "http://egun.de/market/item.php?id=7539610",
-            "timestamp": 1563900911,
-            "is_price_final": false
+            "timestamp": 0,
+            "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=20190811T174700/20190811T174700&text=IMI+Desert+Eagle+Kal.+.50AE+in+Silbern+mit+Gold%2C+Abzug+gemacht%2C+verst.+Visier%2C+Holzgriff&location=&details=",
             "thumb": "http://egun.de/market/cache/aucimg/64x64/3.7310815.51406938.jpg",
-            "remaining": 2228160,
+            "remaining": 1108500,
             "url": "http://egun.de/market/item.php?id=7310815",
-            "timestamp": 1565538431,
+            "timestamp": 1565538474,
+            "is_price_final": false
+          },
+          "http://egun.de/market/item.php?id=7565498": {
+            "price": 1025.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=20190818T214500/20190818T214500&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/64x64/3.7565498.164056026.jpg",
+            "remaining": 1727580,
+            "url": "http://egun.de/market/item.php?id=7565498",
+            "timestamp": 1566157554,
             "is_price_final": false
           }
         },
-        "avg_price": 2055.0
+        "avg_price": 1831.25
       }
     }
   }

+ 55 - 3
src/query.rs

@@ -22,7 +22,13 @@ pub struct Auction {
 impl Auction {
     fn update(&mut self) {
         // println!("now: {:?} auction: {:?}", Utc::now().with_timezone(&Local).timestamp(), self.timestamp);
-        self.is_price_final = Utc::now().with_timezone(&Local).timestamp() > self.timestamp
+        let was_not_final = self.is_price_final;
+        self.is_price_final = Utc::now().with_timezone(&Local).timestamp() > self.timestamp;
+        // self.price = price_from_auction(&self.url)
+        // TODO: delete ^^ and enable lines below
+        if was_not_final != self.is_price_final {
+            self.price = price_from_auction(&self.url)
+        }
     }
 }
 
@@ -72,7 +78,6 @@ impl Account {
             })
             .map(|(url, mut query)| {
                 query.auctions = query.detect_expired();
-
                 (url, query)
             })
             .collect()
@@ -115,6 +120,53 @@ fn parse_price(price: &str) -> Option<f32> {
 }
 
 
+fn price_from_auction(url: &str) -> f32 {
+    let client = reqwest::Client::builder()
+        .timeout(Some(core::time::Duration::from_secs(2)))
+        .build()
+        .unwrap();
+
+
+    match client.get(url).send() {
+        Ok(mut resp) => {
+            if !resp.status().is_success() {
+                println!("ERR {:?}", resp.text());
+                
+            }
+
+            let text = resp.text().unwrap_or("".to_string());
+
+            for node in Document::from_read(text.as_bytes())
+                .unwrap()
+                // .find(Name("a"))
+                // .filter(|n| n.attr("href").is_some())
+                // .filter(|n| n.attr("href").unwrap().contains("item.php?id="))
+                .find(Name("b"))
+                .flat_map(|x| x.children())
+                .map(|x| x.text())
+                .filter(|x| x.contains("EUR"))
+                
+                // .filter(|x| x.attr("bgcolor").is_some())
+
+            {
+                let price: f32 = node
+                    .replace("\n", "")
+                    .replace("\t", "")
+                    .replace(".","")
+                    .replace(",",".")
+                    .replace(" EUR", "").parse().unwrap_or(0.0);
+                return price;
+                // Get auction name
+                
+            }
+        }
+        Err(e) => println!("{:?}", e),
+    }
+
+    0.0
+
+}
+
 
 fn auctions_from_url(url: &str) -> HashMap<String, Auction> {
     let mut auctions = HashMap::new();
@@ -125,7 +177,6 @@ fn auctions_from_url(url: &str) -> HashMap<String, Auction> {
         .build()
         .unwrap();
 
-
     match client.get(url).send() {
         Ok(mut resp) => {
             if !resp.status().is_success() {
@@ -214,6 +265,7 @@ fn auctions_from_url(url: &str) -> HashMap<String, Auction> {
                         .get(0)
                     {
                         auction.url = format!("http://egun.de/market/{}", url);
+                        // price_from_auction(&auction.url);
                     }
                     // TODO: check if https://doc.rust-lang.org/std/time/struct.SystemTime.html works too
                     if let Some(remaining) = parse_remaining(