Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Update googlecode upload

Browse source
This commit is contained in:
Victor Shcherb 2012-05-19 18:38:18 +02:00
parent 966843a4fc
commit 2bbe2ee08d
1 changed files with 29 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
DataExtractionOSM/src/net/osmand/data/index/IndexUploader.java
View file

@ -43,9 +43,10 @@ import com.jcraft.jsch.Session;
* This helper will find obf and zip files, create description for them, and zip them, or update the description.
* This helper also can upload files through ssh,ftp or to googlecode.
*
* IndexUploader dir targetDir [--ff=file] [--fp=ptns] [--dp=ptns] [-ssh|-ftp|-google] [--password=|--user=|--url=|--path=|--gpassword=|--privKey=|--knownHosts=]
* IndexUploader dir targetDir [--ff=file] [--fp=ptns] [--ep=ptns] [--dp=ptns] [-ssh|-ftp|-google] [--password=|--user=|--url=|--path=|--gpassword=|--privKey=|--knownHosts=]
* --ff file with names of files to be uploaded from the dir, supporting regexp
* --fp comma separated names of files to be uploaded from the dir, supporting regexp
* --ep comma separated names of files to be excluded from upload, supporting regexp
* --dp comma separated names of files to be delete on remote system, supporting regexp
* One of:
* -ssh to upload to ssh site
@ -163,6 +164,14 @@ public class IndexUploader {
fileFilter.parseCSV(args[start].substring("--fp=".length()));
start++;
}
if (args[start].startsWith("--ep=")) {
if(fileFilter == null) {
throw new NullPointerException();
}
fileFilter.parseExcludeCSV(args[start].substring("--ep=".length()));
start++;
}
if (args[start].startsWith("--dp=")) {
deleteFileFilter = new FileFilter();
deleteFileFilter.parseCSV(args[start].substring("--dp=".length()));
@ -196,6 +205,7 @@ public class IndexUploader {
protected static class FileFilter {
private List<Pattern> matchers = null;
private List<Pattern> exculdeMatchers = null;
public void parseCSV(String patterns){
String[] s = patterns.split(",");
@ -207,6 +217,16 @@ public class IndexUploader {
}
}
public void parseExcludeCSV(String patterns){
String[] s = patterns.split(",");
if(exculdeMatchers == null) {
exculdeMatchers = new ArrayList<Pattern>();
}
for(String p : s) {
exculdeMatchers.add(Pattern.compile(p.trim()));
}
}
public void parseFile(String file) throws IOException{
File f = new File(file);
if (f.exists()) {
@ -230,6 +250,9 @@ public class IndexUploader {
}
public boolean patternMatches(String name){
return internalPatternMatches(name, matchers);
}
public boolean internalPatternMatches(String name, List<Pattern> matchers ){
if(matchers == null) {
return true;
}
@ -245,7 +268,11 @@ public class IndexUploader {
if (!f.isFile() && !f.getName().endsWith(IndexBatchCreator.GEN_LOG_EXT)) {
return false;
}
return patternMatches(f.getName());
boolean matches = internalPatternMatches(f.getName(), matchers);
if(matches && exculdeMatchers != null && internalPatternMatches(f.getName(), exculdeMatchers)) {
return false;
}
return matches;
}
}