From 585aa1a19bc5b4b225811f26d7574d0ea518e4f9 Mon Sep 17 00:00:00 2001 From: Andrew Davidson Date: Fri, 5 Jan 2018 12:12:14 -0500 Subject: [PATCH] Revert "Undoing structural changes... need to do something less complex" This reverts commit 1f477041e0f6841c99c5627d432b887ded439fde. --- Dockerfile.in | 22 +++ LICENSE | 201 ++++++++++++++++++++++++ Makefile | 172 ++++++++++++++++++++ build/build.sh | 40 +++++ build/test.sh | 52 ++++++ main.go => cmd/pocketarchive/main.go | 1 - {bookmark => pkg/bookmark}/bookmark.go | 0 {cmd => pkg/cmd}/cmd.go | 0 sql/sql.go => pkg/database/database.sql | 0 {ingest => pkg/ingest}/ingest.go | 0 pkg/version/version.go | 21 +++ pocketarchive.go | 172 -------------------- schema.sql | 15 +- 13 files changed, 521 insertions(+), 175 deletions(-) create mode 100644 Dockerfile.in create mode 100644 LICENSE create mode 100644 Makefile create mode 100755 build/build.sh create mode 100755 build/test.sh rename main.go => cmd/pocketarchive/main.go (99%) rename {bookmark => pkg/bookmark}/bookmark.go (100%) rename {cmd => pkg/cmd}/cmd.go (100%) rename sql/sql.go => pkg/database/database.sql (100%) rename {ingest => pkg/ingest}/ingest.go (100%) create mode 100644 pkg/version/version.go delete mode 100644 pocketarchive.go diff --git a/Dockerfile.in b/Dockerfile.in new file mode 100644 index 0000000..e040952 --- /dev/null +++ b/Dockerfile.in @@ -0,0 +1,22 @@ +# Copyright 2016 The Kubernetes Authors. +# +# 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. + +FROM ARG_FROM + +MAINTAINER Tim Hockin + +ADD bin/ARG_ARCH/ARG_BIN /ARG_BIN + +USER nobody:nobody +ENTRYPOINT ["/ARG_BIN"] diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..8dada3e --- /dev/null +++ b/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "{}" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright {yyyy} {name of copyright owner} + + 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. diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..e9173f2 --- /dev/null +++ b/Makefile @@ -0,0 +1,172 @@ +# Copyright 2016 The Kubernetes Authors. +# +# 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. + +# The binary to build (just the basename). +BIN := pocketarchive + +# This repo's root import path (under GOPATH). +PKG := gitlab.amd.im/amdavidson/pocketarchive + +# Where to push the docker image. +REGISTRY ?= thockin + +# Which architecture to build - see $(ALL_ARCH) for options. +ARCH ?= amd64 + +# This version-strategy uses git tags to set the version string +VERSION := $(shell git describe --tags --always --dirty) +# +# This version-strategy uses a manual value to set the version string +#VERSION := 1.2.3 + +### +### These variables should not need tweaking. +### + +SRC_DIRS := cmd pkg # directories which hold app source (not vendored) + +ALL_ARCH := amd64 arm arm64 ppc64le + +# Set default base image dynamically for each arch +ifeq ($(ARCH),amd64) + BASEIMAGE?=alpine +endif +ifeq ($(ARCH),arm) + BASEIMAGE?=armel/busybox +endif +ifeq ($(ARCH),arm64) + BASEIMAGE?=aarch64/busybox +endif +ifeq ($(ARCH),ppc64le) + BASEIMAGE?=ppc64le/busybox +endif + +IMAGE := $(REGISTRY)/$(BIN)-$(ARCH) + +BUILD_IMAGE ?= golang:1.9-alpine + +# If you want to build all binaries, see the 'all-build' rule. +# If you want to build all containers, see the 'all-container' rule. +# If you want to build AND push all containers, see the 'all-push' rule. +all: build + +build-%: + @$(MAKE) --no-print-directory ARCH=$* build + +container-%: + @$(MAKE) --no-print-directory ARCH=$* container + +push-%: + @$(MAKE) --no-print-directory ARCH=$* push + +all-build: $(addprefix build-, $(ALL_ARCH)) + +all-container: $(addprefix container-, $(ALL_ARCH)) + +all-push: $(addprefix push-, $(ALL_ARCH)) + +build: bin/$(ARCH)/$(BIN) + +bin/$(ARCH)/$(BIN): build-dirs + @echo "building: $@" + @docker run \ + -ti \ + --rm \ + -u $$(id -u):$$(id -g) \ + -v "$$(pwd)/.go:/go" \ + -v "$$(pwd):/go/src/$(PKG)" \ + -v "$$(pwd)/bin/$(ARCH):/go/bin" \ + -v "$$(pwd)/bin/$(ARCH):/go/bin/$$(go env GOOS)_$(ARCH)" \ + -v "$$(pwd)/.go/std/$(ARCH):/usr/local/go/pkg/linux_$(ARCH)_static" \ + -w /go/src/$(PKG) \ + $(BUILD_IMAGE) \ + /bin/sh -c " \ + ARCH=$(ARCH) \ + VERSION=$(VERSION) \ + PKG=$(PKG) \ + ./build/build.sh \ + " + +# Example: make shell CMD="-c 'date > datefile'" +shell: build-dirs + @echo "launching a shell in the containerized build environment" + @docker run \ + -ti \ + --rm \ + -u $$(id -u):$$(id -g) \ + -v "$$(pwd)/.go:/go" \ + -v "$$(pwd):/go/src/$(PKG)" \ + -v "$$(pwd)/bin/$(ARCH):/go/bin" \ + -v "$$(pwd)/bin/$(ARCH):/go/bin/$$(go env GOOS)_$(ARCH)" \ + -v "$$(pwd)/.go/std/$(ARCH):/usr/local/go/pkg/linux_$(ARCH)_static" \ + -w /go/src/$(PKG) \ + $(BUILD_IMAGE) \ + /bin/sh $(CMD) + +DOTFILE_IMAGE = $(subst :,_,$(subst /,_,$(IMAGE))-$(VERSION)) + +container: .container-$(DOTFILE_IMAGE) container-name +.container-$(DOTFILE_IMAGE): bin/$(ARCH)/$(BIN) Dockerfile.in + @sed \ + -e 's|ARG_BIN|$(BIN)|g' \ + -e 's|ARG_ARCH|$(ARCH)|g' \ + -e 's|ARG_FROM|$(BASEIMAGE)|g' \ + Dockerfile.in > .dockerfile-$(ARCH) + @docker build -t $(IMAGE):$(VERSION) -f .dockerfile-$(ARCH) . + @docker images -q $(IMAGE):$(VERSION) > $@ + +container-name: + @echo "container: $(IMAGE):$(VERSION)" + +push: .push-$(DOTFILE_IMAGE) push-name +.push-$(DOTFILE_IMAGE): .container-$(DOTFILE_IMAGE) +ifeq ($(findstring gcr.io,$(REGISTRY)),gcr.io) + @gcloud docker -- push $(IMAGE):$(VERSION) +else + @docker push $(IMAGE):$(VERSION) +endif + @docker images -q $(IMAGE):$(VERSION) > $@ + +push-name: + @echo "pushed: $(IMAGE):$(VERSION)" + +version: + @echo $(VERSION) + +test: build-dirs + @docker run \ + -ti \ + --rm \ + -u $$(id -u):$$(id -g) \ + -v "$$(pwd)/.go:/go" \ + -v "$$(pwd):/go/src/$(PKG)" \ + -v "$$(pwd)/bin/$(ARCH):/go/bin" \ + -v "$$(pwd)/.go/std/$(ARCH):/usr/local/go/pkg/linux_$(ARCH)_static" \ + -w /go/src/$(PKG) \ + $(BUILD_IMAGE) \ + /bin/sh -c " \ + ./build/test.sh $(SRC_DIRS) \ + " + +build-dirs: + @mkdir -p bin/$(ARCH) + @mkdir -p .go/src/$(PKG) .go/pkg .go/bin .go/std/$(ARCH) + +clean: container-clean bin-clean + +container-clean: + rm -rf .container-* .dockerfile-* .push-* + +bin-clean: + rm -rf .go bin diff --git a/build/build.sh b/build/build.sh new file mode 100755 index 0000000..d56981b --- /dev/null +++ b/build/build.sh @@ -0,0 +1,40 @@ +#!/bin/sh + +# Copyright 2016 The Kubernetes Authors. +# +# 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. + +set -o errexit +set -o nounset +set -o pipefail + +if [ -z "${PKG}" ]; then + echo "PKG must be set" + exit 1 +fi +if [ -z "${ARCH}" ]; then + echo "ARCH must be set" + exit 1 +fi +if [ -z "${VERSION}" ]; then + echo "VERSION must be set" + exit 1 +fi + +export CGO_ENABLED=0 +export GOARCH="${ARCH}" + +go install \ + -installsuffix "static" \ + -ldflags "-X ${PKG}/pkg/version.VERSION=${VERSION}" \ + ./... diff --git a/build/test.sh b/build/test.sh new file mode 100755 index 0000000..49b36a1 --- /dev/null +++ b/build/test.sh @@ -0,0 +1,52 @@ +#!/bin/sh + +# Copyright 2016 The Kubernetes Authors. +# +# 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. + +set -o errexit +set -o nounset +set -o pipefail + +export CGO_ENABLED=0 + +TARGETS=$(for d in "$@"; do echo ./$d/...; done) + +echo "Running tests:" +go test -i -installsuffix "static" ${TARGETS} +go test -installsuffix "static" ${TARGETS} +echo + +echo -n "Checking gofmt: " +ERRS=$(find "$@" -type f -name \*.go | xargs gofmt -l 2>&1 || true) +if [ -n "${ERRS}" ]; then + echo "FAIL - the following files need to be gofmt'ed:" + for e in ${ERRS}; do + echo " $e" + done + echo + exit 1 +fi +echo "PASS" +echo + +echo -n "Checking go vet: " +ERRS=$(go vet ${TARGETS} 2>&1 || true) +if [ -n "${ERRS}" ]; then + echo "FAIL" + echo "${ERRS}" + echo + exit 1 +fi +echo "PASS" +echo diff --git a/main.go b/cmd/pocketarchive/main.go similarity index 99% rename from main.go rename to cmd/pocketarchive/main.go index f9e6bf0..fe802a3 100644 --- a/main.go +++ b/cmd/pocketarchive/main.go @@ -1,5 +1,4 @@ package pocketarchive -t import ( "fmt" diff --git a/bookmark/bookmark.go b/pkg/bookmark/bookmark.go similarity index 100% rename from bookmark/bookmark.go rename to pkg/bookmark/bookmark.go diff --git a/cmd/cmd.go b/pkg/cmd/cmd.go similarity index 100% rename from cmd/cmd.go rename to pkg/cmd/cmd.go diff --git a/sql/sql.go b/pkg/database/database.sql similarity index 100% rename from sql/sql.go rename to pkg/database/database.sql diff --git a/ingest/ingest.go b/pkg/ingest/ingest.go similarity index 100% rename from ingest/ingest.go rename to pkg/ingest/ingest.go diff --git a/pkg/version/version.go b/pkg/version/version.go new file mode 100644 index 0000000..1064717 --- /dev/null +++ b/pkg/version/version.go @@ -0,0 +1,21 @@ +/* +Copyright 2016 The Kubernetes Authors. + +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. +*/ + +package version + +// VERSION is the app-global version string, which should be substituted with a +// real value during build. +var VERSION = "UNKNOWN" diff --git a/pocketarchive.go b/pocketarchive.go deleted file mode 100644 index 43d38ce..0000000 --- a/pocketarchive.go +++ /dev/null @@ -1,172 +0,0 @@ -package main - -import ( - "database/sql" - "encoding/xml" - "fmt" - _ "github.com/mattn/go-sqlite3" - "io/ioutil" - "net/http" - "os" - "strings" -) - -// Make up some data structures into which we can put our feed. - -// Bookmark defines the fundamental structure of the items to be archived. -type Bookmark struct { - // Required - Title string `xml:"title"` - Link string `xml:"link"` - GUID string `xml:"guid"` - // Optional - PubDate string `xml:"pubDate"` - Comments string `xml:"comments"` -} - -// Feed defines the structure of the RSS feed exported from Pocket -type Feed struct { - XMLName xml.Name `xml:"rss"` - Version string `xml:"version,attr"` - // Required - Title string `xml:"channel>title"` - Link string `xml:"channel>link"` - Description string `xml:"channel>description"` - // Optional - PubDate string `xml:"channel>pubDate"` - BookmarkList []Bookmark `xml:"channel>item"` -} - -// getDB opens a DB object and returns a usable DB instance -func getDB(path string) (*sql.DB, error) { - var fillDB bool - _, err := os.Stat(path) - if err != nil { - fmt.Println("Database does not exist, creating and applying schema") - fillDB = true - } else { - fillDB = false - } - - db, err := sql.Open("sqlite3", path) - if err != nil { - fmt.Println("Could not open database") - panic(err) - } - - if fillDB { - file, err := ioutil.ReadFile("./schema.sql") - if err != nil { - fmt.Println("database empty, but cold not read schema file") - panic(err) - } - requests := strings.Split(string(file), ";") - - for _, request := range requests { - _, err := db.Exec(request) - if err != nil { - fmt.Println("Could not execute:", request) - panic(err) - } - } - } - - return db, nil -} - -func ingestJobExists(url string, db *sql.DB) bool { - var count int - - err := db.QueryRow("SELECT count() FROM ingest where URL=?", url).Scan(&count) - if err != nil { - fmt.Println("Could not check ingest table for URL") - panic(err) - } - - if count > 0 { - return true - } - - return false -} - -func bookmarkExists(url string, db *sql.DB) bool { - var count int - - err := db.QueryRow("SELECT count() FROM bookmarks where URL=?", url).Scan(&count) - if err != nil { - fmt.Println("Could not check database for url") - panic(err) - } - - if count > 0 { - return true - } - - return false -} - -func ingestURL(url string, db *sql.DB) sql.Result { - if ingestJobExists(url, db) { - fmt.Println("URL exists in ingest queue") - row, err := db.Exec("SELECT * FROM ingest WHERE URL=?", url) - if err != nil { - fmt.Println("Could not get job from ingest queue") - panic(err) - } - return row - } - - row, err := db.Exec("INSERT INTO ingest(url) VALUES (?)", url) - if err != nil { - fmt.Println("Could not execute insert query") - panic(err) - } - - return row -} - -func main() { - fmt.Println("Launching Pocket Archive...") - - fmt.Println("Getting archive data from Pocket...") - - // Pull data from RSS feed. - archiveURL := "https://getpocket.com/users/amdavidson/feed/read" - - resp, err := http.Get(archiveURL) - if err != nil { - fmt.Println("Could not get archived urls") - panic(err) - } - - defer resp.Body.Close() - body, err := ioutil.ReadAll(resp.Body) - - // Parse the feed - f := Feed{} - err = xml.Unmarshal(body, &f) - if err != nil { - fmt.Println("Could not parse feed") - panic(err) - } - - db, err := getDB("./bookmarks.db") - if err != nil { - fmt.Println("Could not open or create db") - panic(err) - } - defer db.Close() - - for _, bookmark := range f.BookmarkList { - if bookmarkExists(bookmark.GUID, db) == false { - fmt.Printf("New bookmark url %s\n", bookmark.GUID) - ingestURL(bookmark.GUID, db) - } else { - fmt.Printf("Already know about %s\n", bookmark.GUID) - } - } - - fmt.Println("Pocket Archive exiting.") - -} diff --git a/schema.sql b/schema.sql index 68a0c40..075462d 100644 --- a/schema.sql +++ b/schema.sql @@ -1,3 +1,14 @@ -CREATE TABLE bookmarks (url text not null primary key); -CREATE TABLE ingest (url text not null primary key); +CREATE TABLE bookmarks ( + url text not null primary key, + UUID text, + title text, + content text, + bookmarkDate text, + unread bool, + tags text +); + +CREATE TABLE ingest ( + url text not null primary key +);