X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=src%2Fcom%2Ftedpearson%2Fypp%2Fmarket%2FMarketUploader.java;h=e09a8760e65c5754601686046ad37f17c454399c;hb=e8f844a2dbe2190cb4680c9a8f2bd410beb414b5;hp=5ecc9ab7592ed9578a0b4be17cb5d5c07e7b1850;hpb=7478647d64ade9f3b5f3a3181a3b8641785a88ee;p=jarrg-ian.git diff --git a/src/com/tedpearson/ypp/market/MarketUploader.java b/src/com/tedpearson/ypp/market/MarketUploader.java index 5ecc9ab..e09a876 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,7 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis private JFrame frame = null; private Window window = null; private JButton findMarket = null; + private JLabel resultSummary = null; private final static String PCTB_LIVE_HOST_URL = "http://pctb.crabdance.com/"; private final static String PCTB_TEST_HOST_URL = "http://pctb.ilk.org/"; @@ -252,7 +253,7 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis } frame = new JFrame("MarketUploader"); frame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE); - frame.getContentPane().setLayout(new FlowLayout()); + frame.getContentPane().setLayout(new GridLayout(2,1)); //frame.setPreferredSize(new Dimension(200, 60)); findMarket = new JButton("Upload Market Data"); @@ -261,11 +262,13 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis findMarket.setEnabled(false); new Thread() { public void run() { + resultSummary.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 +282,10 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis } }); frame.add(findMarket); + + resultSummary = new JLabel("ready"); + frame.add(resultSummary); + frame.pack(); } @@ -372,6 +379,7 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis 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) { yarrgts = getYarrgTimestamp(); @@ -400,7 +408,7 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis ArrayList> data = getData(t); - if (uploadToYarrg) { + if (uploadToYarrg && yarrgts != null) { pm.setNote("Preparing data for Yarrg"); pm.setProgress(10); @@ -424,7 +432,7 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis pm.setNote("Uploading to Yarrg"); 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"); } @@ -470,14 +478,24 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis writeBuySellOffers(buys,sells,offerCount,out); out.finish(); InputStream in = sendInitialData(new ByteArrayInputStream(outStream.toByteArray())); + if (in == null) return; pm.setProgress(80); if(pm.isCanceled()) { return; } pm.setNote("Waiting for PCTB..."); - finishUpload(in); + donepctb = finishUpload(in); } pm.setProgress(100); + + if ((uploadToPCTB && !donepctb) || + (uploadToYarrg && !doneyarrg)) { + resultSummary.setText("trouble"); + } else if (donepctb || doneyarrg) { + resultSummary.setText("Done " + islandName); + } else { + resultSummary.setText("uploaded nowhere!"); + } } /** @@ -804,6 +822,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. @@ -813,7 +841,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(); } /** @@ -836,14 +869,8 @@ 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; @@ -885,7 +912,7 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis JOptionPane.QUESTION_MESSAGE, null, myOceansList, null); if(option == null) { error_html("Unable to determine the current island!", html); - return; + return false; } ocean = islandNumbers.get(option).toString(); } else { @@ -893,11 +920,11 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis } } else { error_html("Unknown island or other problem!", html); - return; + return false; } } else { error_html("Unable to determine island name from the client!", html); - return; + return false; } } else { topIsland = m.group(1); @@ -909,7 +936,7 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis m = oceanIslandNum.matcher(html); if(!m.find()) { error_html("This does not seem to be a valid island! Unable to upload.", html); - return; + return false; } islandNum = m.group(1); Pattern params = Pattern.compile("(?s).+?.+?"); @@ -917,41 +944,48 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis if(!m.find()) { error_html("The PCTB server returned unusual data. Maybe you're using an old version of the uploader?", html); - return; + return false; } action = m.group(1); forceReload = m.group(2); filename = m.group(3); URL get = new URL(PCTB_HOST_URL + "upload.php?topisland=" + topIsland + "&ocean=" + ocean + "&island=" + islandNum + "&action=" + action + "&forcereload=" + forceReload + "&filename=" + filename); - // System.out.println(get); - BufferedReader br2 = new BufferedReader(new InputStreamReader(get.openStream())); - sb = new StringBuilder(); - while((str = br2.readLine()) != null) { - sb.append(str+"\n"); - } + String complete = readstreamstring(get.openStream()); Pattern done = Pattern.compile("Your data has been integrated into the database. Thank you!"); - m = done.matcher(sb.toString()); + m = done.matcher(complete); if(m.find()) { - //System.out.println("FILE upload successful!!!"); + System.out.println("FILE upload successful!!!"); + return true; } else { - error_html("Something was wrong with the final upload parameters!", html); + error_html("Something was wrong with the final upload parameters!", complete); + return false; } } + private InputStream post_for_yarrg(ClientHttpRequest http) throws IOException { + if (!http.post()) { + String err = readstreamstring(http.resultstream()); + error("

Error reported by YARRG server

\n" + err); + return null; + } + return http.resultstream(); + } + private String getYarrgTimestamp() throws IOException { ClientHttpRequest http = new ClientHttpRequest (YARRG_URL); http.setParameter("clientname", YARRG_CLIENTNAME); http.setParameter("clientversion", YARRG_CLIENTVERSION); http.setParameter("clientfixes", YARRG_CLIENTFIXES); http.setParameter("requesttimestamp", "y"); - InputStream in = http.post(); + InputStream in = post_for_yarrg(http); + if (in == null) return null; BufferedReader br = new BufferedReader(new InputStreamReader(in)); String tsresult = br.readLine(); return tsresult.substring(3, tsresult.length()-1); } - private void runYarrg(String timestamp, String ocean, String island, String yarrgdata) throws IOException { + private boolean runYarrg(String timestamp, String ocean, String island, String yarrgdata) throws IOException { ByteArrayOutputStream bos = new ByteArrayOutputStream(); BufferedOutputStream bufos = new BufferedOutputStream(new GZIPOutputStream(bos)); bufos.write(yarrgdata.getBytes() ); @@ -966,12 +1000,14 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis http.setParameter("ocean", ocean); http.setParameter("island", island); http.setParameter("data", "deduped.tsv.gz", file, "application/octet-stream"); - InputStream in = http.post(); + 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); } + return true; } }