From bdcfeccf67fb86f4caa5ab84859625a8dbc377dd Mon Sep 17 00:00:00 2001 From: Michael Fross Date: Mon, 7 Aug 2023 10:48:35 -0500 Subject: [PATCH] Small cleanups and code formatting changes --- snap/snapcraft.yaml | 2 +- .../org/fross/quoter/QuoteConsoleOutput.java | 2 +- src/main/java/org/fross/quoter/Symbol.java | 16 ++++++++++------ 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index f05cb13..d41f242 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -1,5 +1,5 @@ name: quoter -version: '5.0.19' +version: '5.0.20' summary: Command line utility to pull stock and index quotes description: | Quoter fetches online stock quotes and index data for easy display on diff --git a/src/main/java/org/fross/quoter/QuoteConsoleOutput.java b/src/main/java/org/fross/quoter/QuoteConsoleOutput.java index fa74c4f..09d6d78 100644 --- a/src/main/java/org/fross/quoter/QuoteConsoleOutput.java +++ b/src/main/java/org/fross/quoter/QuoteConsoleOutput.java @@ -281,7 +281,7 @@ public void displayOutput(FileExporter exporter) { timeStamp = timeStamp.replaceAll("AM", "am"); // Display the time stamp - Output.printColor(Ansi.Color.CYAN, "Data as of " + timeStamp + ". Quotes are delayed."); + Output.printColorln(Ansi.Color.CYAN, "Data as of " + timeStamp + ". Quotes are delayed."); // Display trending data if -t was provided and there is at least one valid symbol if (cli.clTrend == true) { diff --git a/src/main/java/org/fross/quoter/Symbol.java b/src/main/java/org/fross/quoter/Symbol.java index 6a16581..fc79685 100644 --- a/src/main/java/org/fross/quoter/Symbol.java +++ b/src/main/java/org/fross/quoter/Symbol.java @@ -295,14 +295,19 @@ private void getSymbolData(String symb) { } + /** + * setOptionalField(): Handles error conditions for those fields that do not have a valid value from the website + * + * @param htmlPage + * @param key + * @param marketStatus + */ private void setOptionalField(final Document htmlPage, final String key, final MarketStatus marketStatus) { try { final String result = queryPageItem(htmlPage, - marketStatus == MarketStatus.Closed ? - xPathLookup.lookupSymbolClosed(key) : - xPathLookup.lookupSymbolOpen(key) - ); + marketStatus == MarketStatus.Closed ? xPathLookup.lookupSymbolClosed(key) : xPathLookup.lookupSymbolOpen(key)); symbolData.put(key, result.replaceAll("[,%]", "").trim()); + } catch (Exception e) { Output.debugPrintln("Failed to fetch key: " + key + " from page. Setting value as '---'"); symbolData.put(key, "---"); @@ -310,8 +315,7 @@ private void setOptionalField(final Document htmlPage, final String key, final M } private enum MarketStatus { - Open, - Closed + Open, Closed } }