X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=src%2Fcom%2Ftedpearson%2Fypp%2Fmarket%2FMarketUploader.java;h=98ef25e955239db0c402a706ded93dcd6555332d;hb=813ffd281d1dff106d6c04ef48925a45d552f223;hp=1b111cf1494bad083bdfde5483051fd49c8d3993;hpb=bc8471453c90b29dc162119866f0f2b73dec5081;p=jarrg-ian.git

diff --git a/src/com/tedpearson/ypp/market/MarketUploader.java b/src/com/tedpearson/ypp/market/MarketUploader.java
index 1b111cf..98ef25e 100644
--- 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/";
@@ -64,6 +65,7 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
 
 	private AccessibleContext sidePanel;
 	private HashMap<String,Integer> commodMap;
+        public PrintStream dtxt = null;
 
 	private PropertyChangeListener changeListener = new PropertyChangeListener() {
 		public void propertyChange(PropertyChangeEvent e) {
@@ -74,7 +76,7 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
 				int index = text.indexOf(":");
 				String name = text.substring(0,index);
 				islandName = name;
-				//System.out.println(islandName);
+				// if (dtxt!=null) dtxt.println(islandName);
 				sidePanel.removePropertyChangeListener(this);
 				latch.countDown();
 			}
@@ -89,6 +91,19 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
 		}
 	}
 
+        private void progresslog(String s) {
+	    if (dtxt == null) return;
+	    long now = new Date().getTime();
+	    dtxt.println("progress "+(now - startTime)+"ms "+s);
+	}
+
+        private void debug_write_stringdata(String what, String data) throws FileNotFoundException,IOException {
+	    if (dtxt==null) return;
+	    PrintStream strm = new PrintStream(new File("jarrg-debug-"+what));
+	    strm.print(data);
+	    strm.close();
+	}
+
         private void progressNote(ProgressMonitor pm, String s) {
 	    String arb = null;
 	    if (arbitrageResult != null)
@@ -227,9 +242,16 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
 	*	Entry point.  Read our preferences.
 	*/
 	public MarketUploader() {
-		// check if we've been turned off in the control panel
 		Preferences prefs = Preferences.userNodeForPackage(getClass());
 
+		if (prefs.getBoolean("writeDebugFiles", false)) {
+		    try {
+			dtxt = new PrintStream(new File("jarrg-debug-log.txt"));
+		    } catch (java.io.FileNotFoundException e) {
+			System.err.println("JARRG: Error opening debug log: "+e);
+		    }
+		}
+
 		if (prefs.getBoolean("useLiveServers", false)) {
 			YARRG_URL = YARRG_LIVE_URL;
 			PCTB_HOST_URL = PCTB_LIVE_HOST_URL;
@@ -260,7 +282,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);
@@ -272,10 +294,11 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
 				findMarket.setEnabled(false);
 				new Thread() {
 					public void run() {
+					        startTime = new Date().getTime();
 						resultSummary.setText("");
 						arbitrageResult.setText("");
 						try {
-							runPCTB();
+							runUpload();
 						} catch(Exception e) {
 							error(e.toString());
 							e.printStackTrace();
@@ -286,7 +309,6 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
 								sidePanel.removePropertyChangeListener(changeListener);
 							}
 						}
-						//findMarketTable();
 						findMarket.setEnabled(true);
 					}
 				}.start();
@@ -343,7 +365,6 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
 				}
 			}
 		}
-		// if we don't find the island name, hopefully the server will
 	}
 
 	/**
@@ -366,8 +387,6 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
 	}
 	
 	private void error_html(String msg, String html) {
-		//System.err.println("===" + html + "===");
-
 		Pattern body = Pattern.compile("<body>(.*)</body>", Pattern.DOTALL | Pattern.CASE_INSENSITIVE);
 		Matcher m = body.matcher(html);
 		if (m.find()) {
@@ -379,7 +398,7 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
 			html = m.replaceAll(" ");
 		}
 		String whole_msg = "<html><h1>Error</h1>"+msg+"<h1>PCTB Server said:</h1><blockquote>"+html+"</blockquote>";
-		System.err.println("###" + whole_msg + "###");
+		if (dtxt!=null) dtxt.println("###" + whole_msg + "###");
 
 		JOptionPane.showMessageDialog(frame,whole_msg,"Error",JOptionPane.ERROR_MESSAGE);
 	}
@@ -392,15 +411,31 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
 	*
 	*	@exception Exception if an error we didn't expect occured
 	*/
-	private void runPCTB() throws Exception {
-		String yarrgts = "";
+        private class YarrgTimestampFetcher extends Thread {
+	    public String ts = null;
+	    public void run() {
+		try {
+		    ts = getYarrgTimestamp();
+		    progresslog("(async) yarrg timestamp ready.");
+		} catch(Exception e) {
+		    error("Error getting YARRG timestamp: "+e);
+		}
+	    }
+	};
+
+	private void runUpload() throws Exception {
+		progresslog("starting");
+
 		ProgressMonitor pm = new ProgressMonitor(frame,"Processing Market Data","Getting table data",0,100);
 		pm.setMillisToDecideToPopup(0);
 		pm.setMillisToPopup(0);
 		boolean doneyarrg = false, donepctb = false;
+		YarrgTimestampFetcher yarrgts_thread = null;
 
 		if (uploadToYarrg) {
-			yarrgts = getYarrgTimestamp();
+		        progresslog("(async) yarrg timestamp...");
+			yarrgts_thread = new YarrgTimestampFetcher();
+			yarrgts_thread.start();
 		}
 
 		AccessibleTable accesstable = findMarketTable();
@@ -417,12 +452,31 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
 			return;
 		}
 
+		progresslog("(async) getisland...");
 	        getIsland();
+		progresslog("getocean...");
 		getOcean();
+		progresslog("getocean done");
 
 		if (latch != null) {
 		    latch.await(2, java.util.concurrent.TimeUnit.SECONDS);
 		}
+		progresslog("(async) getisland done");
+
+		String yarrgts = null;
+		if (yarrgts_thread != null) {
+		    progresslog("(async) yarrg timestamp join...");
+		    yarrgts_thread.join();
+		    progresslog("(async) yarrg timestamp joined.");
+		    yarrgts = yarrgts_thread.ts;
+		}
+
+		if (islandName == null) {
+		    error("Could not find island name in YPP user interface.");
+		    return;
+		}
+
+		progresslog("table check...");
 
 		String headings_expected[] = new String[]
 		    { "Commodity", "Trading outlet", "Buy price", "Will buy", "Sell price", "Will sell" };
@@ -446,13 +500,18 @@ 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) {
+		        progresslog("yarrg prepare...");
 			progressNote(pm, "Yarrg: Preparing data");
 			pm.setProgress(10);
 
@@ -474,15 +533,16 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
 			yarrgdata = yarrgsb.toString();
 
 			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");
-			}
+			debug_write_stringdata("yarrg-deduped.tsv", yarrgdata);
+
+			doneyarrg = runYarrg(yarrgts, oceanName, islandName, yarrgdata);
+			progresslog("yarrg done.");
 		}
 
 		if (uploadToPCTB) {
+		    progresslog("pctb prepare...");
 		    progressNote(pm, "PCTB: Getting stall names");
 		    pm.setProgress(20);
 		    if(pm.isCanceled()) {
@@ -498,14 +558,15 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
 		    }
 		    // get commod map
 		
+		    progresslog("pctb commodmap...");
 		    HashMap<String,Integer> commodMap = getCommodMap();
 		    if(commodMap == null) {
 			return;
 		    }
+		    progresslog("pctb commodmap done.");
 		    int[] offerCount = getBuySellMaps(data,buys,sells,stallMap,commodMap);
-		    //println(buys.toString());
-		    //System.out.println(sells);
-		    //System.out.println("\n\n\n"+buys);
+		    // if (dtxt!=null) dtxt.println(sells);
+		    // if (dtxt!=null) dtxt.println("\n\n\n"+buys);
 
 		    ByteArrayOutputStream outStream = new ByteArrayOutputStream();
 		    pm.setProgress(60);
@@ -514,21 +575,32 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
 			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()));
+		    progresslog("pctb send...");
+
+		    byte[] ba = outStream.toByteArray();
+		    if (dtxt!=null) {
+			FileOutputStream dbgdata = new FileOutputStream(new File("jarrg-debug-pctb-marketdata.gz"));
+			dbgdata.write(ba);
+			dbgdata.close();
+		    }
+
+		    InputStream in = sendInitialData(new ByteArrayInputStream(ba));
+		    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);
 
@@ -540,6 +612,7 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
 		} else {
 		        resultSummary.setText("uploaded nowhere!");
 		}
+		progresslog("done.");
 	}
 	
 	/**
@@ -567,13 +640,13 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
 		Accessible node1 = window;
 		Accessible node = descendNodes(node1,new int[] {0,1,0,0,0,0,1,0,0,1,0,0}); // commod market
 		// commod market: {0,1,0,0,0,0,1,0,0,1,0}  {0,1,0,0,0,0,1,0,1,0,0,1,0,0})
-		//System.out.println(node);
+		// if (dtxt!=null) dtxt.println(node);
 		if (!(node instanceof JTable)) {
 			node = descendNodes(node1,new int[] {0,1,0,0,0,0,1,0,1,0,0,1,0,0}); // commod market
 		}
 		if (!(node instanceof JTable)) return null;
 		AccessibleTable table = node.getAccessibleContext().getAccessibleTable();
-		//System.out.println(table);
+		// if (dtxt!=null) dtxt.println(table);
 		return table;
 	}
 	
@@ -590,7 +663,7 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
 	private Accessible descendNodes(Accessible parent, int[] path) {
 		for(int i=0;i<path.length;i++) {
 			if (null == (parent = descend(parent, path[i]))) return null;
-			// System.out.println(parent.getClass());
+			// if (dtxt!=null) dtxt.println(parent.getClass());
 		}
 		return parent;
 	}
@@ -647,13 +720,6 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
 	
 	/**
 	*	Gets the list of commodities and their associated commodity ids.
-	*	On the first run, the data is downloaded from the PCTB server. 
-	*	After the first run, the data is cached using <code>Preferences</code>.
-	*	<p>
-	*	Potential issues: When more commodities are added to the server, this
-	*	program will currently break unless the user deletes the preferences
-	*	file or we give them a new release with a slighly different storage
-	*	location for the data.
 	*
 	*	@return a map where the key is the commodity and the value is the commodity id.
 	*/
@@ -662,7 +728,6 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
 			return commodMap;
 		}
 		HashMap<String,Integer> map = new HashMap<String,Integer>();
-		Preferences prefs = Preferences.userNodeForPackage(getClass());
 		String xml;
 		try {
 			URL host = new URL(PCTB_HOST_URL + "commodmap.php");
@@ -675,7 +740,6 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
 			int first = sb.indexOf("<pre>") + 5;
 			int last = sb.indexOf("</body>");
 			xml = sb.substring(first,last);
-			//System.out.println(xml);
 			Reader reader = new CharArrayReader(xml.toCharArray());
 			Document d = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(new InputSource(reader));
 			NodeList maps = d.getElementsByTagName("CommodMap");
@@ -745,7 +809,7 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
 					buySellCount[1]++;
 				}
 			} catch(IllegalArgumentException e) {
-				System.err.println("Error: Unsupported Commodity \"" + offer.get(0) + "\"");
+				if (dtxt!=null) dtxt.println("Error: Unsupported Commodity \"" + offer.get(0) + "\"");
 			}
 		}
 		if (buySellCount[0]==0 && buySellCount[1]==0) {
@@ -915,7 +979,7 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
 	*/
 	private boolean finishUpload(InputStream in) throws IOException {
 		String html = readstreamstring(in);
-		//System.out.println(html);
+		debug_write_stringdata("pctb-initial.html", html);
 		Matcher m;
 
 		Pattern params = Pattern.compile("(?s)<input type=\"hidden\" name=\"action\" value=\"setisland\" />.+?<input type=\"hidden\" name=\"forcereload\" value=\"([^\"]+)\" />.+?<input type=\"hidden\" name=\"filename\" value=\"([^\"]+)\" />");
@@ -947,10 +1011,10 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
 		URL get = new URL(PCTB_HOST_URL + "upload.php?action=setisland&ocean=" + oceanNum + "&island="
 			+ islandNum + "&forcereload=" + forceReload + "&filename=" + filename);
 		String complete = readstreamstring(get.openStream());
+		debug_write_stringdata("pctb-final.html", complete);
 		Pattern done = Pattern.compile("Your data has been integrated into the database. Thank you!");
 		m = done.matcher(complete);
 		if(m.find()) {
-			System.out.println("FILE upload successful!!!");
 			return true;
 		} else {
 			error_html("Something was wrong with the final upload parameters!", complete);
@@ -997,16 +1061,17 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
 	http.setParameter("data", "deduped.tsv.gz", file, "application/octet-stream");
 	InputStream in = post_for_yarrg(http);
 	if (in == null) return false;
-	BufferedReader br = new BufferedReader(new InputStreamReader(in));
-	String yarrgresult; 
-	while((yarrgresult = br.readLine()) != null) {
-	    System.out.println(yarrgresult);
+	String output = readstreamstring(in);
+	if (!output.startsWith("OK")) {
+	    error("<html><h1>Unexpected output from YARRG server</h1>\n" + output);
+	    return false;
 	}
+	debug_write_stringdata("yarrg-result.txt", output);
 	return true;
     }
 
     private int calculateArbitrageCommodity(ArrayList<SortedSet<int[]>> arb_bs) {
-	//System.out.println("ARBITRAGE?");
+	// if (dtxt!=null) dtxt.println("ARBITRAGE?");
 	int profit = 0;
 	SortedSet<int[]> buys = arb_bs.get(0);
 	SortedSet<int[]> sells = arb_bs.get(1);
@@ -1022,7 +1087,7 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
 
 	    int unitprofit = buy[0] - sell[0];
 	    int count = buy[1] < sell[1] ? buy[1] : sell[1];
-	    //System.out.println(" sell @"+sell[0]+" x"+sell[1]+" buy @"+buy[0]+" x"+buy[1]
+	    // if (dtxt!=null) dtxt.println(" sell @"+sell[0]+" x"+sell[1]+" buy @"+buy[0]+" x"+buy[1]
 	    //		       +" => x"+count+" @"+unitprofit);
 
 	    if (unitprofit <= 0)
@@ -1034,7 +1099,7 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
 	    if (buy[1]==0) buys.remove(buy);
 	    if (sell[1]==0) sells.remove(sell);
 	}
-	//System.out.println(" PROFIT "+profit);
+	// if (dtxt!=null) dtxt.println(" PROFIT "+profit);
 	return profit;
     }
 
@@ -1055,15 +1120,15 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
 
 	for (ArrayList<String> row : data) {
 	    String thiscommod = row.get(0);
-	    //System.out.println("ROW "+row.toString());
+	    // if (dtxt!=null) dtxt.println("ROW "+row.toString());
 	    if (lastcommod == null || !thiscommod.equals(lastcommod)) {
 		if (lastcommod != null)
 		    arbitrage += calculateArbitrageCommodity(arb_bs);
-		//System.out.println("ROW rdy");
+		// if (dtxt!=null) dtxt.println("ROW rdy");
 		arb_bs = new ArrayList<SortedSet<int[]>>(2);
 		arb_bs.add(0, new TreeSet<int[]>(compar));
 		arb_bs.add(1, new TreeSet<int[]>(compar));
-		//System.out.println("ROW init");
+		// if (dtxt!=null) dtxt.println("ROW init");
 		lastcommod = thiscommod;
 	    }
 	    for (int bs = 0; bs < 2; bs++) {
@@ -1071,7 +1136,7 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
 		if (pricestr == null)
 		    continue;
 		int[] entry = new int[2];
-		//System.out.println("ROW BS "+bs);
+		// if (dtxt!=null) dtxt.println("ROW BS "+bs);
 		entry[0] = parseQty(pricestr);
 		entry[1] = parseQty(row.get(bs*2 + 3));
 		arb_bs.get(bs).add(entry);