manapool pricer

Author: nicol

src/main/java/org/magic/api/pricers/impl/ManaPoolPricer.java

@@ -0,0 +1,42 @@
+package org.magic.api.pricers.impl;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+
+import org.magic.api.beans.MTGCard;
+import org.magic.api.beans.MTGPrice;
+import org.magic.api.beans.technical.MTGProperty;
+import org.magic.api.interfaces.abstracts.AbstractPricesProvider;
+import org.magic.services.providers.MTGJsonPricerProvider;
+import org.magic.services.providers.MTGJsonPricerProvider.VENDOR;
+
+public class ManaPoolPricer extends AbstractPricesProvider {
+
+	@Override
+	public String getName() {
+		return "ManaPool";
+	}
+
+	@Override
+	protected List<MTGPrice> getLocalePrice(MTGCard card) throws IOException {
+
+		logger.debug("{} looking for prices for {} ",getName(),card);
+
+		MTGJsonPricerProvider.getInstance().expirationDay(getInt("EXPIRE_FILE_DAYS"));
+
+		return MTGJsonPricerProvider.getInstance().getPriceFor(card,VENDOR.MANAPOOL);
+	}
+
+	@Override
+	public STATUT getStatut() {
+		return STATUT.BETA;
+	}
+
+	@Override
+	public Map<String, MTGProperty> getDefaultAttributes() {
+		return Map.of("EXPIRE_FILE_DAYS",MTGProperty.newIntegerProperty("1","Number of day when the file will be updated",1,-1));
+	}
+
+
+}

src/main/java/org/magic/api/pricers/impl/MkmPricer.java

@@ -12,6 +12,7 @@
 import org.magic.api.beans.technical.MTGProperty;
 import org.magic.api.interfaces.abstracts.AbstractPricesProvider;
 import org.magic.services.providers.MTGJsonPricerProvider;
+import org.magic.services.providers.MTGJsonPricerProvider.VENDOR;
 
 public class MkmPricer extends AbstractPricesProvider {
 
@@ -27,19 +28,14 @@ protected List<MTGPrice> getLocalePrice(MTGCard card) throws IOException {
 
 		MTGJsonPricerProvider.getInstance().expirationDay(getInt("EXPIRE_FILE_DAYS"));
 
-		return MTGJsonPricerProvider.getInstance().getPriceFor(card);
+		return MTGJsonPricerProvider.getInstance().getPriceFor(card,VENDOR.CARDMARKET);
 	}
 
 	@Override
 	public Icon getIcon() {
 		return new ImageIcon(MkmPricer.class.getResource("/icons/plugins/magiccardmarket.png"));
 	}
 
-	@Override
-	public STATUT getStatut() {
-		return STATUT.BETA;
-	}
-
 	@Override
 	public Map<String, MTGProperty> getDefaultAttributes() {
 		return Map.of("EXPIRE_FILE_DAYS",MTGProperty.newIntegerProperty("1","Number of day when the file will be updated",1,-1));

src/main/java/org/magic/services/providers/MTGJsonPricerProvider.java

@@ -5,12 +5,13 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Currency;
+import java.util.EnumMap;
 import java.util.List;
+import java.util.Map;
 import java.util.NavigableMap;
 import java.util.TreeMap;
 
 import org.apache.logging.log4j.Logger;
-import org.api.mkm.tools.MkmConstants;
 import org.magic.api.beans.MTGCard;
 import org.magic.api.beans.MTGPrice;
 import org.magic.api.interfaces.abstracts.extra.AbstractMTGJsonProvider;
@@ -34,9 +35,9 @@
 public class MTGJsonPricerProvider {
 	public enum SUPPORT {PAPER,MTGO}
 	public enum STOCK {RETAIL, BUYLIST}
-	public enum VENDOR {CARDKINGDOM,TCGPLAYER,CARDHOARDER,CARDMARKET,CARDSPHERE}
+	public enum VENDOR {CARDKINGDOM,TCGPLAYER,CARDHOARDER,CARDMARKET,CARDSPHERE,MANAPOOL}
 
-	private List<Data> caches;
+	private Map<VENDOR,List<Data>> caches;
 	private static MTGJsonPricerProvider inst;
 
 	protected Logger logger = MTGLogger.getLogger(this.getClass());
@@ -48,7 +49,9 @@ public enum VENDOR {CARDKINGDOM,TCGPLAYER,CARDHOARDER,CARDMARKET,CARDSPHERE}
 	public MTGJsonPricerProvider() throws IOException {
 
 		gson = new GsonBuilder().setPrettyPrinting().create();
-
+		
+		caches = new EnumMap<>(VENDOR.class);
+		
 
 		if(!dataFile.exists())
 			downloadDataFile();
@@ -62,7 +65,6 @@ public static MTGJsonPricerProvider getInstance() throws IOException
 		return inst;
 	}
 
-
 	public Meta getVersion()
 	{
 		try(var reader = new JsonReader(new FileReader(dataFile)))
@@ -177,11 +179,6 @@ public List<Data> loadData(VENDOR v) throws IOException
 	{
 		File f = new File(MTGConstants.DATA_DIR.getAbsolutePath(),v.name()+".json");
 
-
-		if(caches==null)
-			caches = new ArrayList<>();
-
-
 		if(f.exists())
 		{
 			int lastModif = FileTools.daysBetween(f);
@@ -202,14 +199,18 @@ public List<Data> loadData(VENDOR v) throws IOException
 				logger.error("{} doesn't existe. running buildPrices({})",f.getAbsolutePath(),v);
 				buildPrices(v);
 			}
-
+			logger.debug("Filling cache for {}", v);
+			
 			try(var reader = new FileReader(f))
 			{
 				var el = JsonParser.parseReader(reader).getAsJsonArray();
-				el.forEach(e->caches.add(gson.fromJson(e,Data.class)));
+				
+				for(var e : el)
+					caches.computeIfAbsent(v, _->new ArrayList<Data>()).add(gson.fromJson(e,Data.class));
 			}
+			logger.debug("Filling cache for {} done", v);
 		}
-		return caches;
+		return caches.get(v);
 	}
 
 	private Currency getCurrencyFor(VENDOR v)
@@ -220,19 +221,19 @@ private Currency getCurrencyFor(VENDOR v)
 		return Currency.getInstance("USD");
 	}
 
-	public List<MTGPrice> getPriceFor(MTGCard card) {
-		List<MTGPrice> ret = new ArrayList<>();
+	public List<MTGPrice> getPriceFor(MTGCard card, VENDOR v) {
+		var ret = new ArrayList<MTGPrice>();
 		Data d;
 		try {
-			d = loadData(VENDOR.CARDMARKET).stream().filter(i->i.getMtgjsonId().equals(card.getId())).findFirst().orElse(null);
+			d = loadData(v).stream().filter(i->i.getMtgjsonId().equals(card.getId())).findFirst().orElse(null);
 			logger.debug("data = {}", d);
 		} catch (Exception e) {
 			logger.error(e);
 			return ret;
 		}
 		if(d==null)
 		{
-			logger.warn("MTGJson found nothing for {}",card);
+			logger.warn("{} found nothing for {}",v,card);
 			return ret;
 		}
 
@@ -243,9 +244,8 @@ public List<MTGPrice> getPriceFor(MTGCard card) {
 				mp.setCountry("None");
 				mp.setCurrency("EUR");
 				mp.setCardData(card);
-				mp.setSeller("Mkm");
-				mp.setSite("Mkm");
-				mp.setUrl(MkmConstants.MKM_SITE_URL);
+				mp.setSeller(v.name());
+				mp.setSite(v.name());
 				mp.setFoil(b);
 				mp.setValue(d.listPricesByFoil(b).get(0).getStockPrices().lastEntry().getValue());
 				ret.add(mp);
@@ -257,7 +257,7 @@ public List<MTGPrice> getPriceFor(MTGCard card) {
 			}
 		}
 
-		logger.debug("MTGJson found {} prices",ret.size());
+		logger.debug("{} found {} prices",v,ret.size());
 		return ret;
 	}