chiark / gitweb /
~yarrgweb / jarrg-ian.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Show progress of various things in log, with milliseconds
[jarrg-ian.git] / src / com / tedpearson / ypp / market / MarketUploader.java
diff --git a/src/com/tedpearson/ypp/market/MarketUploader.java b/src/com/tedpearson/ypp/market/MarketUploader.java
index f1f78e15a10b17382b77016946a21054bfc71385..98c5dd8808ecbe1b1c3c21c04811f33afd495520 100644 (file)
--- a/src/com/tedpearson/ypp/market/MarketUploader.java
+++ b/src/com/tedpearson/ypp/market/MarketUploader.java
@@ -40,6 +40,7 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
        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/";
@@ -88,6 +89,20 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
                        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 = "<html>" + arb + "<br>" + s;
+           pm.setNote(s);
+       }
        
        /**
        *       An abstract market offer, entailing a commodity being bought or sold by
@@ -251,7 +266,7 @@ 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);
                GridLayout layout = new GridLayout(2,1);
                frame.getContentPane().setLayout(layout);
@@ -263,6 +278,7 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
                                findMarket.setEnabled(false);
                                new Thread() {
                                        public void run() {
+                                               startTime = new Date().getTime();
                                                resultSummary.setText("");
                                                arbitrageResult.setText("");
                                                try {
@@ -384,6 +400,8 @@ 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);
@@ -391,7 +409,9 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
                boolean doneyarrg = false, donepctb = false;
 
                if (uploadToYarrg) {
+                       progresslog("yarrg timestamp...");
                        yarrgts = getYarrgTimestamp();
+                       progresslog("yarrg timestamp done.");
                }
 
                AccessibleTable accesstable = findMarketTable();
@@ -408,13 +428,18 @@ 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);
                }
 
+               progresslog("table check...");
+
                String headings_expected[] = new String[]
                    { "Commodity", "Trading outlet", "Buy price", "Will buy", "Sell price", "Will sell" };
                ArrayList<ArrayList<String>> headers = getData(accesstable.getAccessibleColumnHeader());
@@ -437,14 +462,19 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
                    }
                }
 
+               progresslog("table read...");
+
                ArrayList<ArrayList<String>> data = getData(accesstable);
 
                if (showArbitrage) {
+                       progresslog("arbitrage...");
                        calculateArbitrage(data);
+                       progresslog("arbitrage done.");
                }
 
                if (uploadToYarrg && yarrgts != null) {
-                       pm.setNote("Yarrg: Preparing data");
+                       progresslog("yarrg prepare...");
+                       progressNote(pm, "Yarrg: Preparing data");
                        pm.setProgress(10);
 
                        StringBuilder yarrgsb = new StringBuilder();
@@ -464,17 +494,20 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
 
                        yarrgdata = yarrgsb.toString();
 
-                       pm.setNote("Yarrg: Uploading");
+                       progressNote(pm, "Yarrg: Uploading");
+                       progresslog("yarrg upload...");
 
                        if (islandName != null) {
                                doneyarrg = runYarrg(yarrgts, oceanName, islandName, yarrgdata);
                        } else {
                                System.out.println("Couldn't upload to Yarrg - no island name found");
                        }
+                       progresslog("yarrg done.");
                }
 
                if (uploadToPCTB) {
-                   pm.setNote("PCTB: Getting stall names");
+                   progresslog("pctb prepare...");
+                   progressNote(pm, "PCTB: Getting stall names");
                    pm.setProgress(20);
                    if(pm.isCanceled()) {
                        return;
@@ -483,7 +516,7 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
                    TreeSet<Offer> sells = new TreeSet<Offer>();
                    LinkedHashMap<String,Integer> stallMap = getStallMap(data);
                    pm.setProgress(40);
-                   pm.setNote("PCTB: Sorting offers");
+                   progressNote(pm, "PCTB: Sorting offers");
                    if(pm.isCanceled()) {
                        return;
                    }
@@ -500,7 +533,7 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
 
                    ByteArrayOutputStream outStream = new ByteArrayOutputStream();
                    pm.setProgress(60);
-                   pm.setNote("PCTB: Sending data");
+                   progressNote(pm, "PCTB: Sending data");
                    if(pm.isCanceled()) {
                        return;
                    }
@@ -512,14 +545,18 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
                    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;
                    }
-                   pm.setNote("PCTB: Waiting ...");
+                   progressNote(pm, "PCTB: Waiting ...");
+                   progresslog("pctb finish...");
                    donepctb = finishUpload(in);
+                   progresslog("pctb done.");
                }
                pm.setProgress(100);
 
@@ -531,6 +568,7 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
                } else {
                        resultSummary.setText("uploaded nowhere!");
                }
+               progresslog("done.");
        }
        
        /**
@@ -1037,8 +1075,8 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
        }
     }
 
-    private @SuppressWarnings("unchecked") void calculateArbitrage(ArrayList<ArrayList<String>> data)
-           {
+    private @SuppressWarnings("unchecked")
+    void calculateArbitrage(ArrayList<ArrayList<String>> data) {
        int arbitrage = 0;
        ArrayList<SortedSet<int[]>> arb_bs = null;
        String lastcommod = null;
@@ -1070,7 +1108,7 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
        }
        arbitrage += calculateArbitrageCommodity(arb_bs);
        if (arbitrage != 0) {
-           arbitrageResult.setText("arbitrage: "+arbitrage+" poe");
+           arbitrageResult.setText("<html><strong>arbitrage: "+arbitrage+" poe</strong>");
        } else {
            arbitrageResult.setText("no arbitrage");
        }
JARRG main public tree