Skip to content

Commit bd1a1dc

Browse files
robywwrobyww
committed
Firefly-441: improve ext naming
1 parent a2ba9b1 commit bd1a1dc

File tree

7 files changed

+19
-47
lines changed

7 files changed

+19
-47
lines changed

‎src/firefly/java/edu/caltech/ipac/astro/ibe/IBE.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ private FileInfo downloadViaUrl(URL url, Map<String, String> sourceParams, File
153153

154154
HttpServiceInput addtlInfo = HttpServiceInput.createWithCredential(url.toString());
155155

156-
return URLFileInfoProcessor.retrieveViaURL(url, dir, progressKey, plotId, null, addtlInfo);
156+
return URLFileInfoProcessor.retrieveViaURL(url, dir, progressKey, plotId, addtlInfo);
157157
} catch (DataAccessException e) {
158158
throw new IOException(e.getMessage(), e);
159159
}

‎src/firefly/java/edu/caltech/ipac/firefly/server/query/URLFileInfoProcessor.java‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,20 @@
33
*/
44
package edu.caltech.ipac.firefly.server.query;
55

6+
import edu.caltech.ipac.firefly.data.FileInfo;
67
import edu.caltech.ipac.firefly.data.ServerRequest;
78
import edu.caltech.ipac.firefly.server.ServerContext;
8-
import edu.caltech.ipac.firefly.data.FileInfo;
99
import edu.caltech.ipac.firefly.server.network.HttpServiceInput;
1010
import edu.caltech.ipac.firefly.server.visualize.LockingVisNetwork;
1111
import edu.caltech.ipac.firefly.visualize.WebPlotRequest;
1212
import edu.caltech.ipac.util.FileUtil;
13-
import edu.caltech.ipac.util.StringUtils;
1413
import edu.caltech.ipac.util.download.FailedRequestException;
1514
import edu.caltech.ipac.visualize.net.AnyUrlParams;
1615

1716
import java.io.File;
1817
import java.io.IOException;
1918
import java.net.MalformedURLException;
2019
import java.net.URL;
21-
import java.util.Arrays;
22-
import java.util.Map;
2320

2421

2522
/**
@@ -42,23 +39,20 @@ protected FileInfo loadData(ServerRequest sr) throws IOException, DataAccessExce
4239
}
4340

4441

45-
return retrieveViaURL(url,null,progressKey,plotId,getFileExtension(),addtlInfo );
42+
return retrieveViaURL(url,null,progressKey,plotId,addtlInfo );
4643

4744
}
4845

4946
protected boolean identityAware() {
5047
return true;
5148
}
5249

53-
public String getFileExtension() { return ""; }
54-
5550
public abstract URL getURL(ServerRequest sr) throws MalformedURLException;
5651

5752
public static FileInfo retrieveViaURL(URL url,
5853
File dir,
5954
String progressKey,
6055
String plotId,
61-
String fileExtension,
6256
HttpServiceInput addtlInfo)
6357
throws IOException, DataAccessException {
6458
FileInfo retval= null;
@@ -67,9 +61,6 @@ public static FileInfo retrieveViaURL(URL url,
6761

6862
AnyUrlParams params = new AnyUrlParams(url,progressKey,plotId);
6963
if (dir!=null) params.setFileDir(dir);
70-
if (!StringUtils.isEmpty(fileExtension)) {
71-
params.setLocalFileExtensions(Arrays.asList(fileExtension));
72-
}
7364

7465
if (addtlInfo != null) {
7566
params.setAddtlInfo(addtlInfo);

‎src/firefly/java/edu/caltech/ipac/firefly/server/visualize/LockingVisNetwork.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ public static FileInfo retrieve(ImageServiceParams params, ServiceCaller svcCall
4848

4949
public static FileInfo retrieveURL(URL url) throws FailedRequestException {
5050
AnyUrlParams p= new AnyUrlParams(url, url.toString(),null);
51-
p.setLocalFileExtensions(Collections.singletonList(FileUtil.FITS));
5251
return retrieveURL(p);
5352
}
5453

‎src/firefly/java/edu/caltech/ipac/firefly/server/visualize/imageretrieve/AllSkyRetriever.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,11 @@
1010
import edu.caltech.ipac.firefly.data.FileInfo;
1111
import edu.caltech.ipac.firefly.server.visualize.LockingVisNetwork;
1212
import edu.caltech.ipac.firefly.visualize.WebPlotRequest;
13-
import edu.caltech.ipac.util.FileUtil;
1413
import edu.caltech.ipac.util.download.FailedRequestException;
1514
import edu.caltech.ipac.visualize.net.AnyUrlParams;
1615
import edu.caltech.ipac.visualize.plot.plotdata.GeomException;
1716

1817
import java.net.URL;
19-
import java.util.Collections;
2018
/**
2119
* User: roby
2220
* Date: Feb 26, 2010
@@ -52,7 +50,6 @@ public FileInfo getFile(WebPlotRequest request) throws FailedRequestException, G
5250
try {
5351
URL url= this.getClass().getClassLoader().getResource(urlStr);
5452
AnyUrlParams p= new AnyUrlParams(url);
55-
p.setLocalFileExtensions(Collections.singletonList(FileUtil.FITS));
5653
fitsFileInfo= LockingVisNetwork.retrieveURL(p);
5754
} catch (FailedRequestException e) {
5855
throw e;

‎src/firefly/java/edu/caltech/ipac/firefly/server/visualize/imageretrieve/URLFileRetriever.java‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
import edu.caltech.ipac.firefly.server.visualize.ProgressStat;
1616
import edu.caltech.ipac.firefly.server.visualize.VisContext;
1717
import edu.caltech.ipac.firefly.visualize.WebPlotRequest;
18-
import edu.caltech.ipac.util.FileUtil;
1918
import edu.caltech.ipac.util.download.FailedRequestException;
2019
import edu.caltech.ipac.util.download.ResponseMessage;
2120
import edu.caltech.ipac.visualize.net.AnyUrlParams;
@@ -24,8 +23,6 @@
2423
import java.io.UnsupportedEncodingException;
2524
import java.net.URL;
2625
import java.net.URLEncoder;
27-
import java.util.Arrays;
28-
import java.util.List;
2926
import java.util.Map;
3027

3128
import static edu.caltech.ipac.util.StringUtils.isEmpty;
@@ -44,8 +41,6 @@ public class URLFileRetriever implements FileRetriever {
4441

4542
public static final long EXPIRE_IN_SEC = 60 * 60 * 4; // 4 hours
4643
public static final String FITS = "fits";
47-
private static List<String> extsList=
48-
Arrays.asList(FileUtil.FITS, FileUtil.GZ, "tar", FileUtil.PDF, "votable", "tbl", "csv", "tsv");
4944

5045
public FileInfo getFile(WebPlotRequest request) throws FailedRequestException, GeomException, SecurityException {
5146
return getFile(request,true);
@@ -81,7 +76,6 @@ public FileInfo getFile(WebPlotRequest request, boolean handleAllErrors) throws
8176
}
8277
}
8378
params.setCheckForNewer(request.getUrlCheckForNewer());
84-
params.setLocalFileExtensions(extsList);
8579
params.setMaxSizeToDownload(VisContext.FITS_MAX_SIZE);
8680
if (request.getUserDesc() != null) params.setDesc(request.getUserDesc()); // set file description
8781

‎src/firefly/java/edu/caltech/ipac/util/FileUtil.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,18 +51,23 @@ public class FileUtil
5151
public final static String PS = "ps";
5252
public final static String PDF = "pdf";
5353
public final static String HTML = "html";
54+
public final static String XML = "xml";
5455
public final static String AOR = "aor";
5556
public final static String TXT = "txt";
5657
public final static String TGT = "tgt";
5758
public final static String ZIP = "zip";
5859
public final static String TBL = "tbl";
5960
public final static String NL = "nl";
6061
public final static String JAR = "jar";
62+
public final static String TAR = "tar";
6163
public final static String CSH = "csh";
6264
public final static String SH = "sh";
6365
public final static String PL = "pl";
6466
public final static String SO = "so";
6567
public final static String REG = "reg";
68+
public final static String CSV = "csv";
69+
public final static String TSV = "tsv";
70+
public final static String VOT = "vot";
6671

6772
public static final long MEG = 1048576;
6873
public static final long GIG = 1048576 * 1024;

‎src/firefly/java/edu/caltech/ipac/visualize/net/AnyUrlParams.java‎

Lines changed: 11 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,25 @@
99

1010
import java.io.File;
1111
import java.net.URL;
12+
import java.util.Arrays;
1213
import java.util.HashMap;
1314
import java.util.List;
1415
import java.util.Map;
1516

1617
public class AnyUrlParams extends BaseNetParams {
18+
public static List<String> DEF_EXT_LIST=
19+
Arrays.asList(
20+
"ul", FileUtil.FITS, FileUtil.GZ, FileUtil.TAR, FileUtil.PDF, FileUtil.GZ, FileUtil.REG,
21+
"votable", FileUtil.VOT, FileUtil.XML, FileUtil.TBL, FileUtil.CSV, FileUtil.TSV,
22+
FileUtil.jpeg, FileUtil.jpg, FileUtil.png, FileUtil.bmp, FileUtil.gif, FileUtil.tiff, FileUtil.tif);
23+
1724
private final static int MAX_LENGTH = 30;
1825
private final URL _url;
1926
private final Map<String,String> cookies= new HashMap<>();
2027
private String _loginName= null;
2128
private String _securityCookie= null;
2229
private boolean _checkForNewer= false;
23-
private List<String> _localFileExtensions = null;
30+
private final List<String> _localFileExtensions = DEF_EXT_LIST;
2431
private String _desc = null;
2532
private File _dir = null; // if null, the use the default dir
2633
private long _maxSizeToDownload= 0L;
@@ -77,16 +84,9 @@ public String getUniqueString() {
7784
}
7885
//note: "=","," signs causes problem in download servlet.
7986
retval = retval.replaceAll("[ :\\[\\]\\/\\\\|\\*\\?<>\\=\\,]","\\-");
80-
if (_localFileExtensions!=null) {
81-
String ext= FileUtil.getExtension(fileStr);
82-
if (_localFileExtensions.contains(ext)) {
83-
retval = retval + "." + ext;
84-
}
85-
else {
86-
retval = retval + "." + _localFileExtensions.get(0);
87-
}
88-
}
89-
return retval;
87+
String ext= FileUtil.getExtension(fileStr);
88+
var fileExt= _localFileExtensions.contains(ext) ? ext : _localFileExtensions.getFirst();
89+
return retval + "." + fileExt;
9090
}
9191

9292
public void setLoginName(String name) { _loginName= name; }
@@ -112,20 +112,6 @@ public Map<String,String> getCookies() {
112112
return retval;
113113
}
114114

115-
public String getAllCookiesAsString() {
116-
if (cookies.size()==0) return null;
117-
StringBuilder sb= new StringBuilder(200);
118-
for(Map.Entry<String,String> entry : cookies.entrySet()) {
119-
if (sb.length()>0) sb.append("; ");
120-
sb.append(entry.getKey());
121-
sb.append("=");
122-
sb.append(entry.getValue());
123-
}
124-
return sb.toString();
125-
}
126-
127-
public void setLocalFileExtensions(List<String> extList) { _localFileExtensions = extList; }
128-
129115
public void setDesc(String desc) { _desc = desc; }
130116
public String getDesc() { return _desc; }
131117
}

0 commit comments

Comments
 (0)