Skip to content

Commit 2a06b14

Browse files
nicolnicol
authored andcommitted
manapool updates
1 parent be7c486 commit 2a06b14

File tree

3 files changed

+30
-14
lines changed

3 files changed

+30
-14
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@
308308
<dependency>
309309
<groupId>com.github.nicho92</groupId>
310310
<artifactId>manapool-api-java</artifactId>
311-
<version>0.0.2</version>
311+
<version>0.0.3</version>
312312
</dependency>
313313
<dependency>
314314
<groupId>com.github.nicho92</groupId>

src/main/java/org/magic/api/exports/impl/ManaPoolExport.java

Lines changed: 28 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@
22

33
import java.io.File;
44
import java.io.IOException;
5+
import java.util.Currency;
56
import java.util.List;
67

7-
import org.api.cardtrader.tools.URLCallInfo;
8+
import org.apache.http.client.methods.HttpRequestBase;
9+
import org.api.manapool.listener.URLCallInfo;
810
import org.api.manapool.model.EnumCondition;
911
import org.api.manapool.model.EnumFinish;
1012
import org.api.manapool.model.EnumLangages;
@@ -16,6 +18,7 @@
1618
import org.magic.api.beans.technical.audit.NetworkInfo;
1719
import org.magic.api.interfaces.abstracts.AbstractCardExport;
1820
import org.magic.api.interfaces.abstracts.AbstractTechnicalServiceManager;
21+
import org.magic.services.MTGControler;
1922

2023
public class ManaPoolExport extends AbstractCardExport {
2124

@@ -62,24 +65,36 @@ public String getVersion() {
6265
public void exportStock(List<MTGCardStock> stock, File f) throws IOException {
6366

6467
var inventoryManager = new InventoryService(getAuthenticator().get("EMAIL"), getAuthenticator().get("TOKEN"));
65-
// inventoryManager.setListener((URLCallInfo callInfo)->{
66-
// var netinfo = new NetworkInfo();
67-
// netinfo.setEnd(callInfo.getEnd());
68-
// netinfo.setStart(callInfo.getStart());
69-
// netinfo.setRequest(callInfo.getRequest());
70-
// netinfo.setReponse(callInfo.getResponse());
71-
//
72-
// AbstractTechnicalServiceManager.inst().store(netinfo);
73-
//
74-
// });
68+
inventoryManager.getClient().setCallListener((URLCallInfo callInfo)->{
69+
var netinfo = new NetworkInfo();
70+
netinfo.setEnd(callInfo.getEnd());
71+
netinfo.setStart(callInfo.getStart());
72+
netinfo.setRequest((HttpRequestBase)callInfo.getRequest());
73+
netinfo.setReponse(callInfo.getResponse());
74+
75+
AbstractTechnicalServiceManager.inst().store(netinfo);
76+
77+
});
7578

7679
var items = stock.stream().map(mcs->{
7780

7881
var item = new ProductQueryEntry();
7982
item.setScryfallId(mcs.getProduct().getScryfallId());
8083
item.setQuantity(mcs.getQte());
81-
item.setPrice(mcs.getValue().doubleValue());
82-
item.setCondition( EnumCondition.valueOf(aliases.getConditionFor(this, mcs.getCondition())));
84+
85+
if(MTGControler.getInstance().getCurrencyService().isEnable())
86+
item.setPrice(MTGControler.getInstance().getCurrencyService().convertTo(Currency.getInstance("USD"), mcs.getValue().doubleValue()));
87+
else
88+
item.setPrice(mcs.getValue().doubleValue());
89+
90+
try {
91+
item.setCondition( EnumCondition.valueOf(aliases.getConditionFor(this, mcs.getCondition())));
92+
}
93+
catch(IllegalArgumentException _)
94+
{
95+
logger.warn("EnumCondition {} is not found",mcs.getCondition().name() );
96+
item.setCondition(EnumCondition.NM);
97+
}
8398
item.setFinishId(mcs.isFoil()?EnumFinish.FO:EnumFinish.NF);
8499
item.setLanguage(EnumLangages.FR);
85100

src/main/resources/log4j2.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
<Logger name="org.ehcache" level="ERROR"></Logger>
2929
<Logger name="org.api.mkm" level="ERROR"></Logger>
3030
<Logger name="org.api.cardtrader" level="ERROR"></Logger>
31+
<Logger name="org.api.manapool" level="ERROR"></Logger>
3132
<Logger name="org.mtgstock.services" level="ERROR"></Logger>
3233
<Logger name="org.apache.poi" level="ERROR"></Logger>
3334
<Logger name="org.apache.http" level="ERROR"></Logger>

0 commit comments

Comments
 (0)