updates

Author: nicol

pom.xml

@@ -62,7 +62,7 @@
 		<slf4j.version>2.1.0-alpha1</slf4j.version>
 		<rhino.version>1.8.0</rhino.version>
 		<commonmark.version>0.27.0</commonmark.version>
-		<langchain4j.version>1.8.0</langchain4j.version>
+		<langchain4j.version>1.9.1</langchain4j.version>
 	</properties>
 
 
@@ -454,7 +454,7 @@
 		<dependency>
 			<groupId>net.dv8tion</groupId>
 			<artifactId>JDA</artifactId>
-			<version>6.1.1</version>
+			<version>6.1.2</version>
 			<exclusions>
 				<exclusion>
 					<groupId>club.minnced</groupId>
@@ -552,7 +552,7 @@
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-configuration2</artifactId>
-			<version>2.12.0</version>
+			<version>2.13.0</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-io</groupId>

src/main/java/org/magic/api/interfaces/abstracts/extra/AbstractWarServer.java

@@ -2,6 +2,7 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.eclipse.jetty.ee10.webapp.WebAppContext;
@@ -64,9 +65,10 @@ private WebAppContext createWebapp(Server server, String scheme,String context)
 
 		@Override
 		public Map<String, MTGProperty> getDefaultAttributes() {
-				return Map.of("AUTOSTART", MTGProperty.newBooleanProperty(FALSE, "Run server at startup"),
-									 "PORT", MTGProperty.newIntegerProperty("8083", "listening port for webserver", 80, -1)
-									 );
+				var m = new HashMap<String, MTGProperty>();
+				m.put("AUTOSTART", MTGProperty.newBooleanProperty(FALSE, "Run server at startup"));
+				m.put("PORT", MTGProperty.newIntegerProperty("8083", "listening port for webserver", 80, -1));
+				return m;
 		}
 
 		@Override

src/main/java/org/magic/api/pictureseditor/impl/MTGCardSmithEditor.java

@@ -9,6 +9,8 @@
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
+import org.apache.http.entity.mime.MultipartEntityBuilder;
+import org.apache.http.entity.mime.content.FileBody;
 import org.magic.api.beans.MTGCard;
 import org.magic.api.beans.MTGEdition;
 import org.magic.api.beans.enums.EnumBorders;
@@ -28,6 +30,7 @@
 
 import com.google.gson.JsonObject;
 
+
 public class MTGCardSmithEditor extends AbstractPicturesEditorProvider {
 
 	private static final String BLACK_COLOR = "#000000";
@@ -393,7 +396,7 @@ private void connect() throws IOException
 
 	private String uploadPicture(File f, MTGCard mc) throws IOException
 	{
-		var res = RequestBuilder.build().url(urlPictureUpload).setClient(client).post().addHeader(urlBuilder, urlAuthentication)
+		var res = RequestBuilder.build().url(urlPictureUpload).setClient(client).post()
 												.addHeader(URLTools.ACCEPT, "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.7")
 												.addHeader(URLTools.ACCEPT_ENCODING, "gzip, deflate, br, zstd")
 												.addHeader(URLTools.CONTENT_TYPE, "application/x-www-form-urlencoded")
@@ -405,14 +408,62 @@ private String uploadPicture(File f, MTGCard mc) throws IOException
 												.addContent("location", "mtg-card-maker")	 
 												.addContent("status", "new")
 												.addContent("slim[]", generateJsonData(f,mc.getCustomMetadata()).toString())
-												.toHtml();
+												.execute();
+		
+		
+		for(var h : res.getAllHeaders() )
+			System.out.println(h.getName() + " "+ h.getValue());
+		
+		var doc = RequestBuilder.build().url(BASE_URL+"/mtg-card-maker/edit").setClient(client).get()
+				.addHeader(URLTools.ACCEPT, "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.7")
+				.addHeader(URLTools.ACCEPT_ENCODING, "gzip, deflate, br, zstd")
+				.addHeader(URLTools.ACCEPT_LANGUAGE, "fr-FR,fr;q=0.9,en;q=0.8")
+				.addHeader("cache-control", "no-cache")
+				.addHeader(URLTools.REFERER, BASE_URL+"/mtg-card-maker").toHtml();
+		
+		
+		System.out.println(doc);
 
-		var imgPath = res.select("img.previewImg2").attr("src");
+		//var imgPath = res.select("img.previewImg2").attr("src");
+		
+		
+		var imgPath = "";
 		logger.debug("File {} uploaded at {}", f,imgPath);
 
 		return imgPath ;
 	}
 
+	private String uploadPicture2(File f, MTGCard mc) throws IOException
+	{
+		var hs = new HashMap<String,String>();
+		hs.put(URLTools.ACCEPT, "application/json, text/javascript, */*; q=0.01");
+		hs.put(URLTools.ACCEPT_ENCODING, "gzip, deflate, br, zstd");
+		hs.put("Pragma", "no-cache");
+		hs.put("Connection", "keep-alive");
+		hs.put("priority","u=1, i");
+		hs.put(URLTools.REFERER, BASE_URL+"/mtg-card-maker/edit");
+		hs.put(URLTools.HOST, "mtgcardsmith.com");
+		hs.put(URLTools.ORIGIN, BASE_URL);
+		hs.put("sec-ch-ua-mobile","?0");
+		hs.put("sec-ch-ua-platform","Windows");
+		hs.put("sec-fetch-dest","empty");
+		hs.put("sec-fetch-mode","cors");
+		hs.put("sec-fetch-site","same-origin");
+		hs.put("x-requested-with","XMLHttpRequest");
+		hs.put("content-type", "multipart/form-data");
+		
+		
+		var res = client.doPost(BASE_URL+"/api/imgUpload.php", MultipartEntityBuilder.create().addPart("file", new FileBody(f)).build(), hs);
+		var content = res.getEntity().getContent();
+		var jres = URLTools.toText(content);
+		System.out.println(jres);
+		
+		
+		return "" ;
+	}
+	
+	
+	
 
 	private JsonObject generateJsonData(File f, Map<EnumExtraCardMetaData, String> map) throws IOException
 	{
@@ -501,7 +552,7 @@ public String getName() {
 
 	@Override
 	public STATUT getStatut() {
-		return STATUT.DEV;
+		return STATUT.BUGGED;
 	}
 
 }

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

@@ -9,6 +9,7 @@
 import java.net.URI;
 import java.net.URLDecoder;
 import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -235,5 +236,9 @@ public static String extractElementText(@Nullable Element element) {
 		return element.text();
 	}
 
+	public static String toText(InputStream content) throws IOException {
+		return new String(content.readAllBytes(), StandardCharsets.UTF_8);
+	}
+
 
 }