Complete implementation of retrieval of manifest-specified icons

- Incorporate the "header-only" implementation of the Boost.JSON library
  and the Parser class from the `lwnws` NWS weather retrieval
  application for use in parsing retrieved manifest JSON.

Author: dfyockey

Makefile.am

@@ -3,23 +3,26 @@ AUTOMAKE_OPTIONS = subdir-objects
 bin_PROGRAMS = ficonic
 
 ficonic_SOURCES = \
+	src/program_info.h \
 	src/Curler.cpp \
 	src/Curler.h \
 	src/main.cpp \
 	src/ficon.cpp \
 	src/ficon.hpp \
-	src/program_info.h \
+	src/Parser.cpp \
+	src/Parser.hpp \
 	src/IconsRetriever.cpp \
 	src/IconsRetriever.hpp \
+	src/HtmlTagAccessor.cpp \
+	src/HtmlTagAccessor.hpp \
 	src/RootIconsRetriever.cpp \
 	src/RootIconsRetriever.hpp \
 	src/LinkIconsRetriever.cpp \
 	src/LinkIconsRetriever.hpp \
 	src/MetaIconsRetriever.cpp \
 	src/MetaIconsRetriever.hpp \
-	src/HtmlTagAccessor.cpp \
-	src/HtmlTagAccessor.hpp
-	
+	src/PwaIconsRetriever.cpp \
+	src/PwaIconsRetriever.hpp
 
 ficonic_CPPFLAGS =	\
 	-I/usr/include/ImageMagick-6 \

Makefile.in

@@ -0,0 +1,31 @@
+/*
+ * Parser.cpp
+ * - Class Parser method implementation
+ *
+ * Copyright 2022 David Yockey
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include "Parser.hpp"
+
+///// public /////////////////////////////////////////////////////////
+
+boost::json::value Parser::parse(std::string json) {
+	jsonParser.reset();
+	jsonParser.write(json);
+	return jsonParser.release();
+}
+
+

src/Parser.cpp

@@ -0,0 +1,37 @@
+/*
+ * Parser.hpp
+ * - Wrapper class for boost::json::parser
+ *
+ * Copyright 2022 David Yockey
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#ifndef SRC_PARSER_HPP_
+#define SRC_PARSER_HPP_
+
+#include <string>
+#include <boost/json.hpp>
+
+namespace bjs = boost::json;
+
+class Parser {
+private:
+	bjs::parser jsonParser;
+
+public:
+	bjs::value parse(std::string json);
+};
+
+#endif /* SRC_PARSER_HPP_ */

src/Parser.hpp

@@ -29,21 +29,59 @@
  */
 
 #include "PwaIconsRetriever.hpp"
+#include <boost/json/src.hpp>
+
+namespace bjs = boost::json;
 
 ///// private ////////////////////////////////////////////////////////
 
+
+void PwaIconsRetriever::pullManifestIcons(string manifest, string rel, ficonvector& ficons) {
+
+	bjs::value	parsed_manifest = parser.parse(manifest);
+	bjs::array	icons( parsed_manifest.at("icons").as_array() );
+	string		imgurl;
+
+	for (auto icon : icons) {
+		imgurl = icon.at("src").as_string();
+
+		if ( noHttpProtocol(imgurl) ) {
+			imgurl = pulledsite_url + clipLeadingSlash(imgurl);
+		}
+
+		pullIcon(imgurl, rel, ficons);
+	}
+}
+
 void PwaIconsRetriever::procIconTag(nodeItr itr, ficonvector& ficons) {
-	// TODO: Implement procIconTag method
+	itr->parseAttributes();
+	string rel = getAttrText(itr, "rel");
+
+	if (rel == this->rel) {
+		string manifest_url = getAttrText(itr, "href");
+
+		if ( noHttpProtocol(manifest_url) ) {
+			manifest_url = pulledsite_url + clipLeadingSlash(manifest_url);
+		}
+
+		string manifest;
+		Curler::pull(manifest_url, manifest);
+		pullManifestIcons(manifest, rel, ficons);
+	}
 }
 
 ///// public /////////////////////////////////////////////////////////
 
-PwaIconsRetriever::PwaIconsRetriever() : HtmlTagAccessor() {
+PwaIconsRetriever::PwaIconsRetriever() : HtmlTagAccessor(), parser() {
 }
 
 PwaIconsRetriever::~PwaIconsRetriever() {
 }
 
 void PwaIconsRetriever::pull(string url, ficonic::ficonvector& ficons) {
-	// TODO: Implement pull method
+	HtmlTagAccessor::pull(url, html);
+
+	pulledsite_url = Curler::effective_url();
+
+	getIconTags("link", ficons);
 }