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/";
private AccessibleContext sidePanel;
private HashMap<String,Integer> commodMap;
- private HashMap<String,String> islandNumbers = new HashMap<String,String>();
- {
- String[] nums = new String[]
- {"","Viridian","Midnight","Hunter","Cobalt","Sage","Ice","Malachite","Crimson","Opal"};
- for(int i=1;i<nums.length;i++) {
- islandNumbers.put(nums[i],""+i);
- }
- }
+
private PropertyChangeListener changeListener = new PropertyChangeListener() {
public void propertyChange(PropertyChangeEvent e) {
if(e.getNewValue() != null &&
}
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");
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
}
});
frame.add(findMarket);
+
+ resultSummary = new JLabel("ready");
+ frame.add(resultSummary);
+
frame.pack();
}
html = m.replaceAll(" ");
}
String whole_msg = "<html><h1>Error</h1>"+msg+"<h1>PCTB Server said:</h1><blockquote>"+html+"</blockquote>";
- //System.err.println("###" + whole_msg + "###");
+ System.err.println("###" + whole_msg + "###");
JOptionPane.showMessageDialog(frame,whole_msg,"Error",JOptionPane.ERROR_MESSAGE);
}
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();
ArrayList<ArrayList<String>> data = getData(t);
if (uploadToYarrg && yarrgts != null) {
- pm.setNote("Preparing data for Yarrg");
+ pm.setNote("Yarrg: Preparing data");
pm.setProgress(10);
StringBuilder yarrgsb = new StringBuilder();
yarrgdata = yarrgsb.toString();
- pm.setNote("Uploading to Yarrg");
+ pm.setNote("Yarrg: Uploading");
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");
}
}
- pm.setNote("Getting stall names");
- pm.setProgress(20);
- if(pm.isCanceled()) {
+ if (uploadToPCTB) {
+ pm.setNote("PCTB: Getting stall names");
+ pm.setProgress(20);
+ if(pm.isCanceled()) {
return;
- }
- TreeSet<Offer> buys = new TreeSet<Offer>();
- TreeSet<Offer> sells = new TreeSet<Offer>();
- LinkedHashMap<String,Integer> stallMap = getStallMap(data);
- pm.setProgress(40);
- pm.setNote("Sorting offers");
- if(pm.isCanceled()) {
+ }
+ TreeSet<Offer> buys = new TreeSet<Offer>();
+ TreeSet<Offer> sells = new TreeSet<Offer>();
+ LinkedHashMap<String,Integer> stallMap = getStallMap(data);
+ pm.setProgress(40);
+ pm.setNote("PCTB: Sorting offers");
+ if(pm.isCanceled()) {
return;
- }
- // get commod map
+ }
+ // get commod map
- HashMap<String,Integer> commodMap = getCommodMap();
- if(commodMap == null) {
+ HashMap<String,Integer> 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);
+
+ ByteArrayOutputStream outStream = new ByteArrayOutputStream();
+ pm.setProgress(60);
+ pm.setNote("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();
+ InputStream in = sendInitialData(new ByteArrayInputStream(outStream.toByteArray()));
+ if (in == null) return;
+ pm.setProgress(80);
+ if(pm.isCanceled()) {
+ return;
+ }
+ pm.setNote("PCTB: Waiting ...");
+ donepctb = finishUpload(in);
}
- int[] offerCount = getBuySellMaps(data,buys,sells,stallMap,commodMap);
- //println(buys.toString());
- //System.out.println(sells);
- //System.out.println("\n\n\n"+buys);
+ pm.setProgress(100);
- 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()));
- if (in == null) return;
- pm.setProgress(80);
- if(pm.isCanceled()) {
- return;
- }
- pm.setNote("Waiting for PCTB...");
- finishUpload(in);
+ if ((uploadToPCTB && !donepctb) ||
+ (uploadToYarrg && !doneyarrg)) {
+ resultSummary.setText("trouble");
+ } else if (donepctb || doneyarrg) {
+ resultSummary.setText("Done " + islandName);
+ } else {
+ resultSummary.setText("uploaded nowhere!");
}
- pm.setProgress(100);
}
/**
*
* @param in stream of data from the server to read
*/
- private void finishUpload(InputStream in) throws IOException {
+ 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("<option value=\"\\d+\">" + islandName + ", ([^<]+)</ocean>");
- m = whoIsland.matcher(html);
- if(m.find()) {
- // the server agrees with us
- ocean = islandNumbers.get(m.group(1));
- } else {
- // if the server doesn't agree with us:
- Pattern island = Pattern.compile("<option value=\"(\\d+)\">([^,]+), ([^<]+)</ocean>");
- m = island.matcher(html);
- if(!m.find()) {
- // server doesn't know what island. if we do, let's select it.
- if(islandName != null && !islandName.equals("")) {
- // find the island name in the list as many times as it occurs
- // if more than once, present a dialog
- // set the ocean, we have the islandname, topIsland = 0
- Pattern myIsland = Pattern.compile("islands\\[(\\d+)\\]\\[\\d+\\]=new Option\\(\"" + islandName +
- "\",\\d+");
- Matcher m1 = myIsland.matcher(html);
- ArrayList<Integer> myOceanNums = new ArrayList<Integer>();
- while(m1.find()) {
- myOceanNums.add(new Integer(m1.group(1)));
- }
- if(myOceanNums.size() > 0) {
- if(myOceanNums.size() > 1) {
- String[] myOceansList = new String[myOceanNums.size()];
- int i = 0;
- for(int myOcean : myOceanNums) {
- Pattern oceanNumPat = Pattern.compile("<option value=\"\\" + myOcean + "\">([^<]+)</option>");
- m1 = oceanNumPat.matcher(html);
- if(m1.find()) {
- myOceansList[i++] = m1.group(1);
- }
- }
- Object option = JOptionPane.showInputDialog(null,"We found islands named \"" +
- islandName +"\" on " + myOceansList.length + " oceans:","Choose Ocean",
- JOptionPane.QUESTION_MESSAGE, null, myOceansList, null);
- if(option == null) {
- error_html("Unable to determine the current island!", html);
- return;
- }
- ocean = islandNumbers.get(option).toString();
- } else {
- ocean = myOceanNums.get(0).toString();
- }
- } else {
- error_html("Unknown island or other problem!", html);
- return;
- }
- } else {
- error_html("Unable to determine island name from the client!", html);
- return;
- }
- } else {
- topIsland = m.group(1);
- islandName = m.group(2);
- ocean = islandNumbers.get(m.group(3));
- }
- }
- Pattern oceanIslandNum = Pattern.compile("islands\\[" + ocean + "\\]\\[\\d+\\]=new Option\\(\"" + islandName + "\",(\\d+)");
- m = oceanIslandNum.matcher(html);
- if(!m.find()) {
- error_html("This does not seem to be a valid island! Unable to upload.", html);
- return;
- }
- islandNum = m.group(1);
- Pattern params = Pattern.compile("(?s)<input type=\"hidden\" name=\"action\" value=\"([^\"]+)\" />.+?<input type=\"hidden\" name=\"forcereload\" value=\"([^\"]+)\" />.+?<input type=\"hidden\" name=\"filename\" value=\"([^\"]+)\" />");
+
+ Pattern params = Pattern.compile("(?s)<input type=\"hidden\" name=\"action\" value=\"setisland\" />.+?<input type=\"hidden\" name=\"forcereload\" value=\"([^\"]+)\" />.+?<input type=\"hidden\" name=\"filename\" value=\"([^\"]+)\" />");
m = params.matcher(html);
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);
+ String forceReload = m.group(1);
+ String filename = m.group(2);
+
+ Pattern oceanNumPat = Pattern.compile("<option value=\"(\\d+)\">"+oceanName+"</option>");
+ m = oceanNumPat.matcher(html);
+ if (!m.find()) {
+ error_html("Unable to find the ocean in the server's list of oceans!", html);
+ return false;
+ }
+ String oceanNum = m.group(1);
+
+ Pattern oceanIslandNum = Pattern.compile("islands\\[" + oceanNum + "\\]\\[\\d+\\]=new Option\\(\"" + islandName + "\",(\\d+)");
+ m = oceanIslandNum.matcher(html);
+ if(!m.find()) {
+ error_html("This does not seem to be a valid island! Unable to upload.", html);
+ return false;
+ }
+ String islandNum = m.group(1);
+
+ URL get = new URL(PCTB_HOST_URL + "upload.php?action=setisland&ocean=" + oceanNum + "&island="
+ + islandNum + "&forcereload=" + forceReload + "&filename=" + filename);
String complete = readstreamstring(get.openStream());
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!!!");
+ System.out.println("FILE upload successful!!!");
+ return true;
} else {
error_html("Something was wrong with the final upload parameters!", complete);
+ return false;
}
}
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() );
http.setParameter("island", island);
http.setParameter("data", "deduped.tsv.gz", file, "application/octet-stream");
InputStream in = post_for_yarrg(http);
- if (in == null) return;
+ 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;
}
}