yetangitu/FBReaderJ
1
0
Fork 0
mirror of https://github.com/geometer/FBReaderJ.git synced 2025-10-05 10:49:24 +02:00
Code Issues Releases Wiki Activity

Network Layer changes for Custom Links implementation

Browse source 
git-svn-id: https://only.mawhrin.net/repos/FBReaderJ/trunk@1515 6a642e6f-84f6-412e-ac94-c4a38d5a04b0
This commit is contained in:
Vasiliy Bout 2010-06-25 09:56:54 +00:00
parent 07b0007d71
commit a6fbebddc0
22 changed files with 276 additions and 155 deletions
Download patch file Download diff file Expand all files Collapse all files

45
src/org/geometerplus/fbreader/network/NetworkLibrary.java
View file

@ -45,15 +45,15 @@ public class NetworkLibrary {
public final ZLStringOption NetworkSearchPatternOption = new ZLStringOption("NetworkSearch", "Pattern", "");
private final ArrayList<NetworkLink> myLinks = new ArrayList<NetworkLink>();
private final ArrayList<INetworkLink> myLinks = new ArrayList<INetworkLink>();
private final RootTree myRootTree = new RootTree();
private boolean myUpdateChildren = true;
private boolean myUpdateVisibility;
private static class LinksComparator implements Comparator<NetworkLink> {
public int compare(NetworkLink link1, NetworkLink link2) {
String title1 = link1.Title;
private static class LinksComparator implements Comparator<INetworkLink> {
public int compare(INetworkLink link1, INetworkLink link2) {
String title1 = link1.getTitle();
for (int index = 0; index < title1.length(); ++index) {
final char ch = title1.charAt(index);
if (ch < 128 && Character.isLetter(ch)) {
@ -61,7 +61,7 @@ public class NetworkLibrary {
break;
}
}
String title2 = link2.Title;
String title2 = link2.getTitle();
for (int index = 0; index < title2.length(); ++index) {
final char ch = title2.charAt(index);
if (ch < 128 && Character.isLetter(ch)) {
@ -77,7 +77,7 @@ public class NetworkLibrary {
LinkedList<String> catalogs = readCatalogFileNames();
OPDSLinkReader reader = new OPDSLinkReader();
for (String fileName: catalogs) {
NetworkLink link = reader.readDocument(ZLResourceFile.createResourceFile("data/network/" + fileName));
INetworkLink link = reader.readDocument(ZLResourceFile.createResourceFile("data/network/" + fileName));
if (link != null) {
myLinks.add(link);
}
@ -105,14 +105,10 @@ public class NetworkLibrary {
return catalogs;
}
public List<NetworkLink> links() {
return Collections.unmodifiableList(myLinks);
}
public String rewriteUrl(String url, boolean externalUrl) {
final String host = ZLNetworkUtil.hostFromUrl(url).toLowerCase();
for (NetworkLink link: myLinks) {
if (host.contains(link.SiteName)) {
for (INetworkLink link: myLinks) {
if (host.contains(link.getSiteName())) {
url = link.rewriteUrl(url, externalUrl);
}
}
@ -135,10 +131,10 @@ public class NetworkLibrary {
int nodeCount = 0;
for (int i = 0; i < myLinks.size(); ++i) {
NetworkLink link = myLinks.get(i);
if (!link.OnOption.getValue()) {
INetworkLink link = myLinks.get(i);
/*if (!link.OnOption.getValue()) {
continue;
}
}*/
boolean processed = false;
while (currentNode != null || nodeIterator.hasNext()) {
if (currentNode == null) {
@ -149,7 +145,7 @@ public class NetworkLibrary {
++nodeCount;
continue;
}
final NetworkLink nodeLink = ((NetworkCatalogTree)currentNode).Item.Link;
final INetworkLink nodeLink = ((NetworkCatalogTree)currentNode).Item.Link;
if (nodeLink == link) {
currentNode = null;
++nodeCount;
@ -229,14 +225,15 @@ public class NetworkLibrary {
}
};
for (NetworkLink link: myLinks) {
if (link.OnOption.getValue()) {
NetworkOperationData data = new NetworkOperationData(link, synchronizedListener);
ZLNetworkRequest request = link.simpleSearchRequest(pattern, data);
if (request != null) {
dataList.add(data);
requestList.add(request);
}
for (INetworkLink link: myLinks) {
//if (link.OnOption.getValue()) {
// execute next code only if link is enabled
//}
NetworkOperationData data = new NetworkOperationData(link, synchronizedListener);
ZLNetworkRequest request = link.simpleSearchRequest(pattern, data);
if (request != null) {
dataList.add(data);
requestList.add(request);
}
}