X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=jarrg-ian.git;a=blobdiff_plain;f=src%2Fcom%2Ftedpearson%2Fypp%2Fmarket%2FMarketUploader.java;h=98c5dd8808ecbe1b1c3c21c04811f33afd495520;hp=d8efac50a27d23dbcf5b84cff45ada8efabc99a3;hb=b4fbcc4b1b6ac5c88c747fbd98b51935fe8150d6;hpb=a4e5541cf8de10c7b350a27d058c9d5098dd8c73 diff --git a/src/com/tedpearson/ypp/market/MarketUploader.java b/src/com/tedpearson/ypp/market/MarketUploader.java index d8efac5..98c5dd8 100644 --- a/src/com/tedpearson/ypp/market/MarketUploader.java +++ b/src/com/tedpearson/ypp/market/MarketUploader.java @@ -16,7 +16,7 @@ import org.w3c.dom.*; import javax.xml.parsers.DocumentBuilderFactory; import org.xml.sax.InputSource; import java.util.zip.GZIPOutputStream; -import com.myjavatools.web.ClientHttpRequest; +import net.chiark.yarrg.ClientHttpRequest; import java.util.regex.*; import java.util.prefs.Preferences; import java.beans.*; @@ -38,6 +38,9 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis private JFrame frame = null; private Window window = null; private JButton findMarket = null; + private JLabel resultSummary = null; + private JLabel arbitrageResult = null; + private long startTime = 0; private final static String PCTB_LIVE_HOST_URL = "http://pctb.crabdance.com/"; private final static String PCTB_TEST_HOST_URL = "http://pctb.ilk.org/"; @@ -54,6 +57,7 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis private boolean uploadToYarrg; private boolean uploadToPCTB; + private boolean showArbitrage; private String islandName = null; private String oceanName = null; @@ -61,14 +65,7 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis private AccessibleContext sidePanel; private HashMap commodMap; - private HashMap islandNumbers = new HashMap(); - { - String[] nums = new String[] - {"","Viridian","Midnight","Hunter","Cobalt","Sage","Ice","Malachite","Crimson","Opal"}; - for(int i=1;i1000")) { + return 1001; + } else { + return Integer.parseInt(str); + } + } + + private void progresslog(String s) { + long now = new Date().getTime(); + System.out.println("progress "+(now - startTime)+"ms "+s); + } + + private void progressNote(ProgressMonitor pm, String s) { + String arb = null; + if (arbitrageResult != null) + arb = arbitrageResult.getText(); + if (arb != null && arb.length() != 0) + s = "" + arb + "
" + s; + pm.setNote(s); + } /** * An abstract market offer, entailing a commodity being bought or sold by @@ -114,11 +133,7 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis commodity = commodId.intValue(); price = Integer.parseInt(record.get(priceIndex)); String qty = record.get(priceIndex+1); - if(qty.equals(">1000")) { - quantity = 1001; - } else { - quantity = Integer.parseInt(record.get(priceIndex+1)); - } + quantity = parseQty(qty); shoppe = stallMap.get(record.get(1)).intValue(); } @@ -231,6 +246,7 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis uploadToYarrg=prefs.getBoolean("uploadToYarrg", true); uploadToPCTB=prefs.getBoolean("uploadToPCTB", true); + showArbitrage=prefs.getBoolean("showArbitrage", true); EventQueueMonitor.addTopLevelWindowListener(this); if (EventQueueMonitor.isGUIInitialized()) { @@ -250,9 +266,10 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis if (window.getAccessibleContext().getAccessibleName().equals("Puzzle Pirates")) frame.setVisible(true); return; } - frame = new JFrame("MarketUploader"); + frame = new JFrame("Jarrg Uploader"); frame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE); - frame.getContentPane().setLayout(new FlowLayout()); + GridLayout layout = new GridLayout(2,1); + frame.getContentPane().setLayout(layout); //frame.setPreferredSize(new Dimension(200, 60)); findMarket = new JButton("Upload Market Data"); @@ -261,11 +278,15 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis findMarket.setEnabled(false); new Thread() { public void run() { + startTime = new Date().getTime(); + resultSummary.setText(""); + arbitrageResult.setText(""); try { runPCTB(); } catch(Exception e) { error(e.toString()); e.printStackTrace(); + resultSummary.setText("failed"); } finally { if(sidePanel != null) { // remove it if it's still attached @@ -279,6 +300,17 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis } }); frame.add(findMarket); + + resultSummary = new JLabel("ready"); + frame.add(resultSummary); + + arbitrageResult = new JLabel(""); + + if (showArbitrage) { + layout.setRows(layout.getRows() + 1); + frame.add(arbitrageResult); + } + frame.pack(); } @@ -340,6 +372,25 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis JOptionPane.showMessageDialog(frame,msg,"Error",JOptionPane.ERROR_MESSAGE); } + private void error_html(String msg, String html) { + //System.err.println("===" + html + "==="); + + Pattern body = Pattern.compile("(.*)", Pattern.DOTALL | Pattern.CASE_INSENSITIVE); + Matcher m = body.matcher(html); + if (m.find()) { + html = m.group(1); + Pattern fixup = Pattern.compile("<(\\w+) */>");; + m = fixup.matcher(html); + html = m.replaceAll("<$1>"); + m = Pattern.compile("[\\r\\n]+").matcher(html); + html = m.replaceAll(" "); + } + String whole_msg = "

Error

"+msg+"

PCTB Server said:

"+html+"
"; + System.err.println("###" + whole_msg + "###"); + + JOptionPane.showMessageDialog(frame,whole_msg,"Error",JOptionPane.ERROR_MESSAGE); + } + /** * Run the data collection process, and upload the results. This is the method * that calls most of the other worker methods for the process. If an error occurs, @@ -349,21 +400,26 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis * @exception Exception if an error we didn't expect occured */ private void runPCTB() throws Exception { + progresslog("starting"); + String yarrgts = ""; ProgressMonitor pm = new ProgressMonitor(frame,"Processing Market Data","Getting table data",0,100); pm.setMillisToDecideToPopup(0); pm.setMillisToPopup(0); + boolean doneyarrg = false, donepctb = false; if (uploadToYarrg) { + progresslog("yarrg timestamp..."); yarrgts = getYarrgTimestamp(); + progresslog("yarrg timestamp done."); } - AccessibleTable t = findMarketTable(); - if(t == null) { + AccessibleTable accesstable = findMarketTable(); + if(accesstable == null) { error("Market table not found! Please open the Buy/Sell Commodities interface."); return; } - if(t.getAccessibleRowCount() == 0) { + if(accesstable.getAccessibleRowCount() == 0) { error("No data found, please wait for the table to have data first!"); return; } @@ -372,17 +428,53 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis return; } + progresslog("getisland..."); getIsland(); + progresslog("getocean..."); getOcean(); + progresslog("getocean done"); if (latch != null) { latch.await(2, java.util.concurrent.TimeUnit.SECONDS); } - ArrayList> data = getData(t); + progresslog("table check..."); - if (uploadToYarrg) { - pm.setNote("Preparing data for Yarrg"); + String headings_expected[] = new String[] + { "Commodity", "Trading outlet", "Buy price", "Will buy", "Sell price", "Will sell" }; + ArrayList> headers = getData(accesstable.getAccessibleColumnHeader()); + if (headers.size() != 1) { + error("Table headings not one row! " + headers.toString()); + return; + } + if (headers.get(0).size() != 6) { + error("Table headings not six columns! " + headers.toString()); + return; + } + for (int col=0; col> data = getData(accesstable); + + if (showArbitrage) { + progresslog("arbitrage..."); + calculateArbitrage(data); + progresslog("arbitrage done."); + } + + if (uploadToYarrg && yarrgts != null) { + progresslog("yarrg prepare..."); + progressNote(pm, "Yarrg: Preparing data"); pm.setProgress(10); StringBuilder yarrgsb = new StringBuilder(); @@ -402,63 +494,81 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis yarrgdata = yarrgsb.toString(); - pm.setNote("Uploading to Yarrg"); + progressNote(pm, "Yarrg: Uploading"); + progresslog("yarrg upload..."); if (islandName != null) { - runYarrg(yarrgts, oceanName, islandName, yarrgdata); + doneyarrg = runYarrg(yarrgts, oceanName, islandName, yarrgdata); } else { System.out.println("Couldn't upload to Yarrg - no island name found"); } + progresslog("yarrg done."); } - pm.setNote("Getting stall names"); - pm.setProgress(20); - if(pm.isCanceled()) { + if (uploadToPCTB) { + progresslog("pctb prepare..."); + progressNote(pm, "PCTB: Getting stall names"); + pm.setProgress(20); + if(pm.isCanceled()) { return; - } - TreeSet buys = new TreeSet(); - TreeSet sells = new TreeSet(); - LinkedHashMap stallMap = getStallMap(data); - pm.setProgress(40); - pm.setNote("Sorting offers"); - if(pm.isCanceled()) { + } + TreeSet buys = new TreeSet(); + TreeSet sells = new TreeSet(); + LinkedHashMap stallMap = getStallMap(data); + pm.setProgress(40); + progressNote(pm, "PCTB: Sorting offers"); + if(pm.isCanceled()) { return; - } - // get commod map + } + // get commod map - HashMap commodMap = getCommodMap(); - if(commodMap == null) { + HashMap commodMap = getCommodMap(); + if(commodMap == null) { return; - } - int[] offerCount = getBuySellMaps(data,buys,sells,stallMap,commodMap); - //println(buys.toString()); - //System.out.println(sells); - //System.out.println("\n\n\n"+buys); + } + int[] offerCount = getBuySellMaps(data,buys,sells,stallMap,commodMap); + //println(buys.toString()); + //System.out.println(sells); + //System.out.println("\n\n\n"+buys); - if (uploadToPCTB) { - ByteArrayOutputStream outStream = new ByteArrayOutputStream(); - pm.setProgress(60); - pm.setNote("Sending data"); - if(pm.isCanceled()) { - return; - } - GZIPOutputStream out = new GZIPOutputStream(outStream); - //FileOutputStream out = new FileOutputStream(new File("output.text")); - DataOutputStream dos = new DataOutputStream(out); - dos.writeBytes("005y\n"); - dos.writeBytes(stallMap.size()+"\n"); - dos.writeBytes(getAbbrevStallList(stallMap)); - writeBuySellOffers(buys,sells,offerCount,out); - out.finish(); - InputStream in = sendInitialData(new ByteArrayInputStream(outStream.toByteArray())); - pm.setProgress(80); - if(pm.isCanceled()) { - return; - } - pm.setNote("Waiting for PCTB..."); - finishUpload(in); + ByteArrayOutputStream outStream = new ByteArrayOutputStream(); + pm.setProgress(60); + progressNote(pm, "PCTB: Sending data"); + if(pm.isCanceled()) { + return; + } + GZIPOutputStream out = new GZIPOutputStream(outStream); + //FileOutputStream out = new FileOutputStream(new File("output.text")); + DataOutputStream dos = new DataOutputStream(out); + dos.writeBytes("005y\n"); + dos.writeBytes(stallMap.size()+"\n"); + dos.writeBytes(getAbbrevStallList(stallMap)); + writeBuySellOffers(buys,sells,offerCount,out); + out.finish(); + progresslog("pctb send..."); + InputStream in = sendInitialData(new ByteArrayInputStream(outStream.toByteArray())); + progresslog("pctb sent."); + if (in == null) return; + pm.setProgress(80); + if(pm.isCanceled()) { + return; + } + progressNote(pm, "PCTB: Waiting ..."); + progresslog("pctb finish..."); + donepctb = finishUpload(in); + progresslog("pctb done."); } pm.setProgress(100); + + if ((uploadToPCTB && !donepctb) || + (uploadToYarrg && !doneyarrg)) { + resultSummary.setText("trouble"); + } else if (donepctb || doneyarrg) { + resultSummary.setText("Done " + islandName); + } else { + resultSummary.setText("uploaded nowhere!"); + } + progresslog("done."); } /** @@ -667,6 +777,10 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis System.err.println("Error: Unsupported Commodity \"" + offer.get(0) + "\""); } } + if (buySellCount[0]==0 && buySellCount[1]==0) { + error("No (valid) offers for PCTB?!"); + throw new IllegalArgumentException(); + } return buySellCount; } @@ -781,6 +895,16 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis writeOffers(out,sells); } + private String readstreamstring(InputStream in) throws IOException { + StringBuilder sb = new StringBuilder(); + BufferedReader br = new BufferedReader(new InputStreamReader(in)); + String str; + while((str = br.readLine()) != null) { + sb.append(str+"\n"); + } + return sb.toString(); + } + /** * Sends the data to the server via multipart-formdata POST, * with the gzipped data as a file upload. @@ -790,7 +914,12 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis private InputStream sendInitialData(InputStream file) throws IOException { ClientHttpRequest http = new ClientHttpRequest(PCTB_HOST_URL + "upload.php"); http.setParameter("marketdata","marketdata.gz",file,"application/gzip"); - return http.post(); + if (!http.post()) { + String err = readstreamstring(http.resultstream()); + error("Error sending initial data:\n"+err); + return null; + } + return http.resultstream(); } /** @@ -813,123 +942,74 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis * * @param in stream of data from the server to read */ - private void finishUpload(InputStream in) throws IOException { - StringBuilder sb = new StringBuilder(); - BufferedReader br = new BufferedReader(new InputStreamReader(in)); - String str; - while((str = br.readLine()) != null) { - sb.append(str+"\n"); - } - String html = sb.toString(); + private boolean finishUpload(InputStream in) throws IOException { + String html = readstreamstring(in); //System.out.println(html); - String topIsland = "0", ocean, islandNum, action, forceReload, filename; Matcher m; - Pattern whoIsland = Pattern.compile("