CS Quote Feed uses new URL and format (#3767)

name.abuchen.portfolio/src/name/abuchen/portfolio/Messages.java

@@ -248,6 +248,7 @@ public class Messages extends NLS
     public static String MsgErrorBaseAndTermCurrencyAreEqualWithInvalidExchangeRate;
     public static String MsgErrorCannotConvertToRequestedCurrency;
     public static String MsgErrorCannotRetrieveExchangeRateForCurrency;
+    public static String MsgErrorCSFeedOldURL;
     public static String MsgErrorDecrypting;
     public static String MsgErrorDownloadYahoo;
     public static String MsgErrorDownloadEurostatHICP;
@@ -257,6 +258,7 @@ public class Messages extends NLS
     public static String MsgErrorDuplicateTicker;
     public static String MsgErrorDuplicateWKN;
     public static String MsgErrorEncrypting;
+    public static String MsgErrorFeedCurrencyMismatch;
     public static String MsgErrorIllegalForexUnit;
     public static String MsgErrorInvalidURL;
     public static String MsgErrorInvalidWKN;

name.abuchen.portfolio/src/name/abuchen/portfolio/messages.properties

@@ -482,6 +482,8 @@ MsgDeltaWithoutAssets = Warning: Delta without assets: {0} on {1}
 
 MsgErrorBaseAndTermCurrencyAreEqualWithInvalidExchangeRate = Base and term currency are equal ({0}) but exchange rate is {1}
 
+MsgErrorCSFeedOldURL = Security {0} is still using old URL
+
 MsgErrorCannotConvertToRequestedCurrency = Cannot convert {0} to currency {1} with ''{2}''
 
 MsgErrorCannotRetrieveExchangeRateForCurrency = Cannot retrieve exchange rate for {0} with ''{1}''
@@ -504,6 +506,8 @@ MsgErrorDuplicateWKN = WKN {0} exists multiple times in the list of securities.
 
 MsgErrorEncrypting = Error while encrypting output: {0}
 
+MsgErrorFeedCurrencyMismatch = Error at {0}: Currency of feed ({1}) does not match currency of security ({2})
+
 MsgErrorIllegalForexUnit = Illegal transaction unit {0}: {1} x {2} != {3}
 
 MsgErrorInvalidURL = Invalid URL: {0}

name.abuchen.portfolio/src/name/abuchen/portfolio/messages_de.properties

@@ -482,6 +482,8 @@ MsgDeltaWithoutAssets = Warnung: Ver\u00E4nderung ohne Kapital: {0} am {1}
 
 MsgErrorBaseAndTermCurrencyAreEqualWithInvalidExchangeRate = Basis- und Zielw\u00E4hrung sind gleich ({0}), aber der Wechselkurs ist {1}
 
+MsgErrorCSFeedOldURL = Wertschrift {0} benutzt noch alte URL
+
 MsgErrorCannotConvertToRequestedCurrency = {0} kann nicht in W\u00E4hrung {1} mit ''{2}'' konvertiert werden
 
 MsgErrorCannotRetrieveExchangeRateForCurrency = Wechselkurs f\u00FCr {0} kann nicht mit ''{1}'' abgerufen werden.
@@ -504,6 +506,8 @@ MsgErrorDuplicateWKN = WKN {0} existiert mehrfach in der Wertpapierliste.
 
 MsgErrorEncrypting = Fehler w\u00E4hrend der Verschl\u00FCsselung: {0}
 
+MsgErrorFeedCurrencyMismatch = Fehler be {0}: W\u00E4hrung des Feeds ({1}) entspricht nicht der W\u00E4hrung der Wertschrift ({2})
+
 MsgErrorIllegalForexUnit = Ung\u00FCltige Buchungskomponente {0}: {1} x {2} != {3}
 
 MsgErrorInvalidURL = Ung\u00FCltige URL: {0}

name.abuchen.portfolio/src/name/abuchen/portfolio/online/impl/CSQuoteFeed.java

@@ -4,49 +4,34 @@
 package name.abuchen.portfolio.online.impl;
 
 import java.io.IOException;
-import java.io.PrintWriter;
+import java.text.MessageFormat;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
 
 import name.abuchen.portfolio.Messages;
+import name.abuchen.portfolio.model.LatestSecurityPrice;
+import name.abuchen.portfolio.model.Security;
+import name.abuchen.portfolio.money.Values;
+import name.abuchen.portfolio.online.QuoteFeed;
+import name.abuchen.portfolio.online.QuoteFeedData;
+import name.abuchen.portfolio.util.WebAccess;
 
 /**
- * This class provides a feed for Credit Suisse Quotes. Probably all quotes
- * provided by Credit Suisse can be downloaded but it is only tested with Credit
- * Suisse institutional funds which are normally not offered to the general
- * public except in special scenarios like via the Swiss third pillar provider
- * VIAC (third pillar = "Säule 3a", a tax-exempt retirement saving scheme). The
- * challenge of downloading these quotes are: 1) there is a HTML page where the
- * user has to state his/her country of residence plus investor status (private,
- * professional). This page can be avoided by using "curl" as user agent. -
- * there are header titles that are specific to Credit Suisse and 2) Credit
- * Suisse returns the quotes with Excel mime-type which are in fact HTML tables
- * but would be converted upon opening Excel. This is a little bit of a hack on
- * CS' part.
- * 
- * For testing ==>
- * https://amfunds.credit-suisse.com/ch/de/institutional/fund/history/CH0209106761?currency=USD
+ * This class provides a feed for Credit Suisse Quotes of institutional funds
+ * which are normally not offered to the general public except in special
+ * scenarios like via the Swiss third pillar provider VIAC (third pillar =
+ * "Säule 3a", a tax-exempt retirement saving scheme for residents of
+ * Switzerland).
  */
-public class CSQuoteFeed extends HTMLTableQuoteFeed
+public class CSQuoteFeed implements QuoteFeed
 {
+    // The ID still contains "HTML" even though the format has changed. The ID
+    // is not
+    // changed though so that users don't have to save a new feed but can still
+    // use the old one (they have to change the URL though)
     public static final String ID = "CREDITSUISSE_HTML_TABLE"; //$NON-NLS-1$
-    public static final String USERAGENT = "curl/7.58.0"; //$NON-NLS-1$
-
-    protected static class CSDateColumn extends DateColumn
-    {
-        public CSDateColumn()
-        {
-            super(new String[] { "NAV Date" }); //$NON-NLS-1$
-        }
-    }
-
-    protected static class CSCloseColumn extends CloseColumn
-    {
-        public CSCloseColumn()
-        {
-            super(new String[] { "NAV" }); //$NON-NLS-1$
-        }
-    }
-
-    private static final Column[] COLUMNS = new Column[] { new CSDateColumn(), new CSCloseColumn() };
+    // public static final String USERAGENT = "curl/7.58.0"; //$NON-NLS-1$
+    private static final DateTimeFormatter DATEFORMATTER = DateTimeFormatter.ofPattern("dd.MM.yyyy"); //$NON-NLS-1$
 
     public CSQuoteFeed()
     {
@@ -66,29 +51,82 @@ public String getName()
     }
 
     @Override
-    protected Column[] getColumns()
+    public QuoteFeedData getHistoricalQuotes(Security security, boolean collectRawResponse)
     {
-        return COLUMNS;
+        return internalGetQuotes(security, security.getFeedURL(), collectRawResponse);
     }
 
-    @Override
-    protected String getUserAgent()
+    private QuoteFeedData internalGetQuotes(Security security, String feedURL, boolean collectRawResponse)
     {
-        return USERAGENT;
+        if (feedURL == null || feedURL.length() == 0)
+        {
+            return QuoteFeedData.withError(
+                            new IOException(MessageFormat.format(Messages.MsgMissingFeedURL, security.getName())));
+        }
+
+        QuoteFeedData result = new QuoteFeedData();
+
+        if (feedURL.startsWith("https://amfunds.credit")) //$NON-NLS-1$
+        {
+            return QuoteFeedData.withError(new IllegalArgumentException(
+                            MessageFormat.format(Messages.MsgErrorCSFeedOldURL, security.getName())));
+        }
+
+        try
+        {
+            String content = new WebAccess(feedURL).get();
+            boolean dataLine = false;
+
+            if (collectRawResponse)
+            {
+                result.addResponse(feedURL, content);
+            }
+
+            for (String line : content.lines().toArray(String[]::new))
+            {
+                if (dataLine)
+                {
+                    if (line.isBlank())
+                    {
+                        dataLine = false;
+                    }
+                    else
+                    {
+                        result.addPrice(getPrice(line));
+                    }
+                }
+                else if (line.startsWith("Currency")) //$NON-NLS-1$
+                {
+                    checkCurrency(security, line);
+                }
+                else if (line.startsWith("NAV Date")) //$NON-NLS-1$
+                {
+                    dataLine = true;
+                }
+            }
+        }
+        catch (Exception e)
+        {
+            return QuoteFeedData.withError(e);
+        }
+        return result;
+    }
+
+    private void checkCurrency(Security security, String line)
+    {
+        String feedCurrency = line.split(" ")[1].trim(); //$NON-NLS-1$
+        if (!security.getCurrencyCode().equals(feedCurrency))
+        {
+            throw new IllegalStateException(MessageFormat.format(Messages.MsgErrorFeedCurrencyMismatch,
+                            security.getName(), feedCurrency, security.getCurrencyCode()));
+        }
     }
 
-    /**
-     * Test method to parse HTML tables
-     * 
-     * @param args
-     *            list of URLs and/or local files
-     */
-    public static void main(String[] args) throws IOException
+    private LatestSecurityPrice getPrice(String line)
     {
-        PrintWriter writer = new PrintWriter(System.out); // NOSONAR
-        for (String arg : args)
-            if (arg.charAt(0) != '#')
-                new CSQuoteFeed().doLoad(arg, writer);
-        writer.flush();
+        String[] tokens = line.split(","); //$NON-NLS-1$
+        LocalDate localDate = LocalDate.parse(tokens[0], DATEFORMATTER);
+        long price = Values.Quote.factorize(Double.parseDouble(tokens[1]));
+        return new LatestSecurityPrice(localDate, price);
     }
 }