From 9a2e705e968434da0abfd4a636941cfadc0a5a22 Mon Sep 17 00:00:00 2001
From: Bananeweizen <bananeweizen@gmx.de>
Date: Sun, 24 Jun 2012 09:57:50 +0200
Subject: fix #1792: Missing own spoiler images

---
 .../cgeo/geocaching/connector/gc/GCConstants.java  |  3 +-
 .../src/cgeo/geocaching/connector/gc/GCParser.java | 45 ++++++++++------------
 2 files changed, 22 insertions(+), 26 deletions(-)

(limited to 'main/src')

diff --git a/main/src/cgeo/geocaching/connector/gc/GCConstants.java b/main/src/cgeo/geocaching/connector/gc/GCConstants.java
index c280c74..5cbe479 100644
--- a/main/src/cgeo/geocaching/connector/gc/GCConstants.java
+++ b/main/src/cgeo/geocaching/connector/gc/GCConstants.java
@@ -55,8 +55,7 @@ public final class GCConstants {
     public final static Pattern PATTERN_ATTRIBUTES = Pattern.compile("<h3 class=\"WidgetHeader\">[^<]*<img[^>]+>\\W*Attributes[^<]*</h3>[^<]*<div class=\"WidgetBody\">((?:[^<]*<img src=\"[^\"]+\" alt=\"[^\"]+\"[^>]*>)+?)[^<]*<p");
     /** Two groups ! */
     public final static Pattern PATTERN_ATTRIBUTESINSIDE = Pattern.compile("[^<]*<img src=\"([^\"]+)\" alt=\"([^\"]+?)\"");
-    public final static Pattern PATTERN_SPOILERS = Pattern.compile("<p class=\"NoPrint\">\\s+((?:<a href=\"http://img\\.geocaching\\.com/cache/[^.]+\\.jpg\"[^>]+><img class=\"StatusIcon\"[^>]+><span>[^<]+</span></a><br />(?:[^<]+<br /><br />)?)+)\\s+</p>");
-    public final static Pattern PATTERN_SPOILERSINSIDE = Pattern.compile("<a href=\"(http://img\\.geocaching\\.com/cache/[^.]+\\.jpg)\"[^>]+><img class=\"StatusIcon\"[^>]+><span>([^<]+)</span></a><br />(?:([^<]+)<br /><br />)?");
+    public final static Pattern PATTERN_SPOILER_IMAGE = Pattern.compile("<a href=\"(http://img\\.geocaching\\.com/cache/[^.]+\\.jpg)\"[^>]+><img[^>]+><span>([^<]+)</span></a>(?:<br />([^<]+)<br /><br />)?");
     public final static Pattern PATTERN_INVENTORY = Pattern.compile("<span id=\"ctl00_ContentBody_uxTravelBugList_uxInventoryLabel\">\\W*Inventory[^<]*</span>[^<]*</h3>[^<]*<div class=\"WidgetBody\">([^<]*<ul>(([^<]*<li>[^<]*<a href=\"[^\"]+\"[^>]*>[^<]*<img src=\"[^\"]+\"[^>]*>[^<]*<span>[^<]+<\\/span>[^<]*<\\/a>[^<]*<\\/li>)+)[^<]*<\\/ul>)?");
     public final static Pattern PATTERN_INVENTORYINSIDE = Pattern.compile("[^<]*<li>[^<]*<a href=\"[a-z0-9\\-\\_\\.\\?\\/\\:\\@]*\\/track\\/details\\.aspx\\?guid=([0-9a-z\\-]+)[^\"]*\"[^>]*>[^<]*<img src=\"[^\"]+\"[^>]*>[^<]*<span>([^<]+)<\\/span>[^<]*<\\/a>[^<]*<\\/li>");
     public final static Pattern PATTERN_WATCHLIST = Pattern.compile("icon_stop_watchlist.gif");
diff --git a/main/src/cgeo/geocaching/connector/gc/GCParser.java b/main/src/cgeo/geocaching/connector/gc/GCParser.java
index 26aa7ad..f7dc684 100644
--- a/main/src/cgeo/geocaching/connector/gc/GCParser.java
+++ b/main/src/cgeo/geocaching/connector/gc/GCParser.java
@@ -522,35 +522,32 @@ public abstract class GCParser {
 
         // cache spoilers
         try {
-            final String spoilers = BaseUtils.getMatch(page, GCConstants.PATTERN_SPOILERS, false, null);
-            if (null != spoilers) {
-                if (CancellableHandler.isCancelled(handler)) {
-                    return null;
-                }
-                CancellableHandler.sendLoadProgressDetail(handler, R.string.cache_dialog_loading_details_status_spoilers);
+            if (CancellableHandler.isCancelled(handler)) {
+                return null;
+            }
+            CancellableHandler.sendLoadProgressDetail(handler, R.string.cache_dialog_loading_details_status_spoilers);
 
-                final Matcher matcherSpoilersInside = GCConstants.PATTERN_SPOILERSINSIDE.matcher(spoilers);
+            final Matcher matcherSpoilersInside = GCConstants.PATTERN_SPOILER_IMAGE.matcher(page);
 
-                while (matcherSpoilersInside.find()) {
-                    // the original spoiler URL (include .../display/... contains a low-resolution image
-                    // if we shorten the URL we get the original-resolution image
-                    String url = matcherSpoilersInside.group(1).replace("/display", "");
+            while (matcherSpoilersInside.find()) {
+                // the original spoiler URL (include .../display/... contains a low-resolution image
+                // if we shorten the URL we get the original-resolution image
+                String url = matcherSpoilersInside.group(1).replace("/display", "");
 
-                    String title = null;
-                    if (matcherSpoilersInside.group(2) != null) {
-                        title = matcherSpoilersInside.group(2);
-                    }
-                    String description = null;
-                    if (matcherSpoilersInside.group(3) != null) {
-                        description = matcherSpoilersInside.group(3);
-                    }
-                    final cgImage spoiler = new cgImage(url, title, description);
+                String title = null;
+                if (matcherSpoilersInside.group(2) != null) {
+                    title = matcherSpoilersInside.group(2);
+                }
+                String description = null;
+                if (matcherSpoilersInside.group(3) != null) {
+                    description = matcherSpoilersInside.group(3);
+                }
+                final cgImage spoiler = new cgImage(url, title, description);
 
-                    if (cache.getSpoilers() == null) {
-                        cache.setSpoilers(new ArrayList<cgImage>());
-                    }
-                    cache.getSpoilers().add(spoiler);
+                if (cache.getSpoilers() == null) {
+                    cache.setSpoilers(new ArrayList<cgImage>());
                 }
+                cache.getSpoilers().add(spoiler);
             }
         } catch (Exception e) {
             // failed to parse cache spoilers
-- 
cgit v1.1