sape: switch to xml output

3 files changed, 29 insertions, 60 deletions

diff --git a/src/main/java/ru/sape/Sape.java b/src/main/java/ru/sape/Sape.java
index a94bcc62..6b28be25 100644
--- a/src/main/java/ru/sape/Sape.java
+++ b/src/main/java/ru/sape/Sape.java
@@ -4,6 +4,7 @@
 package ru.sape;
 
 import java.net.URI;
+import java.util.Optional;
 
 public class Sape {
 
@@ -19,7 +20,8 @@ public class Sape {
     }
     public boolean debug = false;
 
-    public SapePageLinks getPageLinks(URI requestUri, String cookie) {
-        return new SapePageLinks(sapePageLinkConnection, sapeUser, requestUri, cookie, debug);
+    public Optional<SapePageLinks> getPageLinks(URI requestUri, String cookie) {
+        return sapePageLinkConnection.getData()
+                .map(site -> new SapePageLinks(site, sapeUser, requestUri, cookie, debug));
     }
 }
diff --git a/src/main/java/ru/sape/SapeConnection.java b/src/main/java/ru/sape/SapeConnection.java
index ee5a5e5c..cec308bf 100644
--- a/src/main/java/ru/sape/SapeConnection.java
+++ b/src/main/java/ru/sape/SapeConnection.java
@@ -1,8 +1,8 @@
 package ru.sape;
 
-import com.github.ooxi.phparser.SerializedPhpParser;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import com.juick.www.ad.models.Site;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -66,17 +66,16 @@ public class SapeConnection {
             }
         }
     }
-    Map<String, Object> cached;
+    Site cachedSite;
     long cacheUpdated;
 
-    @SuppressWarnings("unchecked")
-    public Map<String, Object> getData() {
+    public Optional<Site> getData() {
         if (cacheLifeTime <= (System.currentTimeMillis() - cacheUpdated) / 1000) {
             for (String server : serverList) {
                 String data;
 
                 try {
-                    data = fetchRemoteFile(server, dispenserPath + "&charset=UTF-8");
+                    data = fetchRemoteFile(server, dispenserPath + "&charset=UTF-8&as_xml=true");
                 } catch (IOException e1) {
                     continue;
                 }
@@ -88,7 +87,7 @@ public class SapeConnection {
                 }
 
                 try {
-                    cached = (Map<String, Object>) new SerializedPhpParser(data).parse();
+                    cachedSite = Site.fromXMLData(data);
                 } catch (Exception e) {
                     logger.error("Can't parse Sape data", e);
                     continue;
@@ -96,14 +95,14 @@ public class SapeConnection {
 
                 cacheUpdated = System.currentTimeMillis();
 
-                return cached;
+                return Optional.of(cachedSite);
             }
 
             logger.error("Unable to fetch Sape data");
 
-            return Collections.emptyMap();
+            return Optional.empty();
         }
 
-        return cached;
+        return Optional.of(cachedSite);
     }
 }
diff --git a/src/main/java/ru/sape/SapePageLinks.java b/src/main/java/ru/sape/SapePageLinks.java
index 77715aea..52def3f6 100644
--- a/src/main/java/ru/sape/SapePageLinks.java
+++ b/src/main/java/ru/sape/SapePageLinks.java
@@ -1,71 +1,39 @@
 package ru.sape;
 
+import com.juick.www.ad.models.Site;
 import org.apache.commons.lang3.StringUtils;
 
 import java.net.URI;
-import java.util.*;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
 
 public class SapePageLinks {
 
-    private boolean showCode;
+    private final boolean showCode;
+    private final String linkDelimiter;
+    private final List<String> pageLinks;
 
-    @SuppressWarnings("unchecked")
-    public SapePageLinks(SapeConnection sapeConnection, String sapeUser, URI request, String sapeCookie, boolean showCode) {
+    public SapePageLinks(Site site, String sapeUser, URI request, String sapeCookie, boolean showPageCode) {
         String req = StringUtils.isNotEmpty(request.getQuery()) ? request.getPath() + "?" + request.getQuery()
                 : request.getPath();
-        if (sapeUser.equals(sapeCookie)) {
-            showCode = true;
-        }
-
-        Map<String, Object> data = sapeConnection.getData();
 
-        if (data.containsKey("__sape_delimiter__")) {
-            linkDelimiter = (String) data.get("__sape_delimiter__");
-        }
-
-        if (data.containsKey(req)) {
-            pageLinks = new ArrayList<>(((Map<Object, String>) data.get(req)).values());
-        }
+        linkDelimiter = site.getDelimiter();
 
-        if (data.containsKey("__sape_new_url__")) {
-            if (showCode) {
-                Object newUrl = data.get("__sape_new_url__");
+        this.showCode = showPageCode || sapeUser.equals(sapeCookie);
 
-                if (newUrl instanceof Map) {
-                    pageLinks = new ArrayList<>(((Map<Object, String>) newUrl).values());
-                } else {
-                    pageLinks = new ArrayList<>(Collections.singletonList((String) newUrl));
-                }
-            }
+        if (showCode) {
+            pageLinks = Collections.singletonList(site.getCode());
+        } else {
+            pageLinks = site.getPages().stream().filter(page -> page.getUri().equals(req))
+                    .flatMap(page -> page.getLinks().stream()).collect(Collectors.toList());
         }
-
-        this.showCode = showCode;
     }
-    private String linkDelimiter = ".";
-    private List<String> pageLinks = new ArrayList<>();
 
-    public String render() {
-        return render(-1);
-    }
 
-    public String render(int count) {
+    public String render() {
         StringBuilder s = new StringBuilder();
-
-        if (count < 0) {
-            count = pageLinks.size();
-        }
-
-        for (Iterator<String> i = pageLinks.iterator(); i.hasNext() && count > 0; count--) {
-            if (s.length() > 0) {
-                s.append(linkDelimiter);
-            }
-
-            String l = i.next();
-
-            s.append(l);
-
-            i.remove();
-        }
+        s.append(String.join(linkDelimiter, pageLinks));
 
         if (showCode) {
             s.insert(0, "<sape_noindex>");