From d5838b67340ca83dcc32f6d1775c183188ec5e7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Guillot?= Date: Mon, 20 Nov 2017 19:17:04 -0800 Subject: [PATCH] Move feed parsers packages in reader package --- reader/{feed => }/atom/atom.go | 2 +- reader/{feed => }/atom/parser.go | 0 reader/{feed => }/atom/parser_test.go | 0 reader/{feed => }/date/parser.go | 0 reader/feed/parser.go | 8 ++++---- reader/{feed => }/json/json.go | 2 +- reader/{feed => }/json/parser.go | 0 reader/{feed => }/json/parser_test.go | 0 reader/{feed => }/rdf/parser.go | 0 reader/{feed => }/rdf/parser_test.go | 0 reader/{feed => }/rdf/rdf.go | 0 reader/{feed => }/rss/parser.go | 0 reader/{feed => }/rss/parser_test.go | 0 reader/{feed => }/rss/rss.go | 2 +- 14 files changed, 7 insertions(+), 7 deletions(-) rename reader/{feed => }/atom/atom.go (98%) rename reader/{feed => }/atom/parser.go (100%) rename reader/{feed => }/atom/parser_test.go (100%) rename reader/{feed => }/date/parser.go (100%) rename reader/{feed => }/json/json.go (98%) rename reader/{feed => }/json/parser.go (100%) rename reader/{feed => }/json/parser_test.go (100%) rename reader/{feed => }/rdf/parser.go (100%) rename reader/{feed => }/rdf/parser_test.go (100%) rename reader/{feed => }/rdf/rdf.go (100%) rename reader/{feed => }/rss/parser.go (100%) rename reader/{feed => }/rss/parser_test.go (100%) rename reader/{feed => }/rss/rss.go (99%) diff --git a/reader/feed/atom/atom.go b/reader/atom/atom.go similarity index 98% rename from reader/feed/atom/atom.go rename to reader/atom/atom.go index 2035a4e5..47c1df14 100644 --- a/reader/feed/atom/atom.go +++ b/reader/atom/atom.go @@ -13,7 +13,7 @@ import ( "github.com/miniflux/miniflux2/helper" "github.com/miniflux/miniflux2/model" - "github.com/miniflux/miniflux2/reader/feed/date" + "github.com/miniflux/miniflux2/reader/date" "github.com/miniflux/miniflux2/reader/processor" "github.com/miniflux/miniflux2/reader/sanitizer" ) diff --git a/reader/feed/atom/parser.go b/reader/atom/parser.go similarity index 100% rename from reader/feed/atom/parser.go rename to reader/atom/parser.go diff --git a/reader/feed/atom/parser_test.go b/reader/atom/parser_test.go similarity index 100% rename from reader/feed/atom/parser_test.go rename to reader/atom/parser_test.go diff --git a/reader/feed/date/parser.go b/reader/date/parser.go similarity index 100% rename from reader/feed/date/parser.go rename to reader/date/parser.go diff --git a/reader/feed/parser.go b/reader/feed/parser.go index d94d72b8..a28cf2de 100644 --- a/reader/feed/parser.go +++ b/reader/feed/parser.go @@ -14,10 +14,10 @@ import ( "github.com/miniflux/miniflux2/helper" "github.com/miniflux/miniflux2/model" - "github.com/miniflux/miniflux2/reader/feed/atom" - "github.com/miniflux/miniflux2/reader/feed/json" - "github.com/miniflux/miniflux2/reader/feed/rdf" - "github.com/miniflux/miniflux2/reader/feed/rss" + "github.com/miniflux/miniflux2/reader/atom" + "github.com/miniflux/miniflux2/reader/json" + "github.com/miniflux/miniflux2/reader/rdf" + "github.com/miniflux/miniflux2/reader/rss" "golang.org/x/net/html/charset" ) diff --git a/reader/feed/json/json.go b/reader/json/json.go similarity index 98% rename from reader/feed/json/json.go rename to reader/json/json.go index e4473f4f..cd6a1c8c 100644 --- a/reader/feed/json/json.go +++ b/reader/json/json.go @@ -11,7 +11,7 @@ import ( "github.com/miniflux/miniflux2/helper" "github.com/miniflux/miniflux2/model" - "github.com/miniflux/miniflux2/reader/feed/date" + "github.com/miniflux/miniflux2/reader/date" "github.com/miniflux/miniflux2/reader/processor" "github.com/miniflux/miniflux2/reader/sanitizer" ) diff --git a/reader/feed/json/parser.go b/reader/json/parser.go similarity index 100% rename from reader/feed/json/parser.go rename to reader/json/parser.go diff --git a/reader/feed/json/parser_test.go b/reader/json/parser_test.go similarity index 100% rename from reader/feed/json/parser_test.go rename to reader/json/parser_test.go diff --git a/reader/feed/rdf/parser.go b/reader/rdf/parser.go similarity index 100% rename from reader/feed/rdf/parser.go rename to reader/rdf/parser.go diff --git a/reader/feed/rdf/parser_test.go b/reader/rdf/parser_test.go similarity index 100% rename from reader/feed/rdf/parser_test.go rename to reader/rdf/parser_test.go diff --git a/reader/feed/rdf/rdf.go b/reader/rdf/rdf.go similarity index 100% rename from reader/feed/rdf/rdf.go rename to reader/rdf/rdf.go diff --git a/reader/feed/rss/parser.go b/reader/rss/parser.go similarity index 100% rename from reader/feed/rss/parser.go rename to reader/rss/parser.go diff --git a/reader/feed/rss/parser_test.go b/reader/rss/parser_test.go similarity index 100% rename from reader/feed/rss/parser_test.go rename to reader/rss/parser_test.go diff --git a/reader/feed/rss/rss.go b/reader/rss/rss.go similarity index 99% rename from reader/feed/rss/rss.go rename to reader/rss/rss.go index d685a3ea..2c63514b 100644 --- a/reader/feed/rss/rss.go +++ b/reader/rss/rss.go @@ -14,7 +14,7 @@ import ( "github.com/miniflux/miniflux2/helper" "github.com/miniflux/miniflux2/model" - "github.com/miniflux/miniflux2/reader/feed/date" + "github.com/miniflux/miniflux2/reader/date" "github.com/miniflux/miniflux2/reader/processor" "github.com/miniflux/miniflux2/reader/sanitizer" )