southfox/miniflux
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Rewrite imports

Browse source
This commit is contained in:
Frédéric Guillot 2017-12-12 21:48:13 -08:00
parent 9b1128d56d
commit 84d912c979
103 changed files with 245 additions and 241 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
README.md
View file

@ -1,6 +1,6 @@
Miniflux 2 Miniflux 2
========== ==========
[![Build Status](https://travis-ci.org/miniflux/miniflux2.svg?branch=master)](https://travis-ci.org/miniflux/miniflux2) [![Build Status](https://travis-ci.org/miniflux/miniflux.svg?branch=master)](https://travis-ci.org/miniflux/miniflux)
[![Documentation Status](https://readthedocs.org/projects/miniflux/badge/?version=latest)](https://docs.miniflux.net/) [![Documentation Status](https://readthedocs.org/projects/miniflux/badge/?version=latest)](https://docs.miniflux.net/)
Miniflux is a minimalist and opinionated feed reader: Miniflux is a minimalist and opinionated feed reader:
@ -14,7 +14,7 @@ Miniflux is a minimalist and opinionated feed reader:
It's simple, fast, lightweight and super easy to install. It's simple, fast, lightweight and super easy to install.
Miniflux 2 is a rewrite of Miniflux 1.x in Golang. Miniflux 2 is a rewrite of [Miniflux 1.x](https://github.com/miniflux/miniflux-legacy) in Golang.
Notes Notes
----- -----

2
errors/errors.go
View file

@ -7,7 +7,7 @@ package errors
import ( import (
"fmt" "fmt"
"github.com/miniflux/miniflux2/locale" "github.com/miniflux/miniflux/locale"
) )
// LocalizedError represents an error than could be translated to another language. // LocalizedError represents an error than could be translated to another language.

2
http/client.go
View file

@ -12,7 +12,7 @@ import (
"net/url" "net/url"
"time" "time"
"github.com/miniflux/miniflux2/helper" "github.com/miniflux/miniflux/helper"
) )
const userAgent = "Miniflux <https://miniflux.net/>" const userAgent = "Miniflux <https://miniflux.net/>"

2
integration/instapaper/instapaper.go
View file

@ -8,7 +8,7 @@ import (
"fmt" "fmt"
"net/url" "net/url"
"github.com/miniflux/miniflux2/http" "github.com/miniflux/miniflux/http"
) )
// Client represents an Instapaper client. // Client represents an Instapaper client.

6
integration/integration.go
View file

@ -7,9 +7,9 @@ package integration
import ( import (
"log" "log"
"github.com/miniflux/miniflux2/integration/instapaper" "github.com/miniflux/miniflux/integration/instapaper"
"github.com/miniflux/miniflux2/integration/pinboard" "github.com/miniflux/miniflux/integration/pinboard"
"github.com/miniflux/miniflux2/model" "github.com/miniflux/miniflux/model"
) )
// SendEntry send the entry to the activated providers. // SendEntry send the entry to the activated providers.

2
integration/pinboard/pinboard.go
View file

@ -8,7 +8,7 @@ import (
"fmt" "fmt"
"net/url" "net/url"
"github.com/miniflux/miniflux2/http" "github.com/miniflux/miniflux/http"
) )
// Client represents a Pinboard client. // Client represents a Pinboard client.

2
locale/translations.go
View file

@ -1,5 +1,5 @@
// Code generated by go generate; DO NOT EDIT. // Code generated by go generate; DO NOT EDIT.
// 2017-12-12 19:14:08.438401734 -0800 PST m=+0.020484380 // 2017-12-12 21:44:02.672642313 -0800 PST m=+0.027053016
package locale package locale

14
main.go
View file

@ -25,13 +25,13 @@ import (
"strings" "strings"
"time" "time"
"github.com/miniflux/miniflux2/config" "github.com/miniflux/miniflux/config"
"github.com/miniflux/miniflux2/model" "github.com/miniflux/miniflux/model"
"github.com/miniflux/miniflux2/reader/feed" "github.com/miniflux/miniflux/reader/feed"
"github.com/miniflux/miniflux2/scheduler" "github.com/miniflux/miniflux/scheduler"
"github.com/miniflux/miniflux2/server" "github.com/miniflux/miniflux/server"
"github.com/miniflux/miniflux2/storage" "github.com/miniflux/miniflux/storage"
"github.com/miniflux/miniflux2/version" "github.com/miniflux/miniflux/version"
_ "github.com/lib/pq" _ "github.com/lib/pq"
"golang.org/x/crypto/ssh/terminal" "golang.org/x/crypto/ssh/terminal"

BIN
miniflux-test
View file

Binary file not shown.

2
model/theme.go
View file

@ -4,7 +4,7 @@
package model package model
import "github.com/miniflux/miniflux2/errors" import "github.com/miniflux/miniflux/errors"
// Themes returns the list of available themes. // Themes returns the list of available themes.
func Themes() map[string]string { func Themes() map[string]string {

6
reader/atom/atom.go
View file

@ -11,9 +11,9 @@ import (
"strings" "strings"
"time" "time"
"github.com/miniflux/miniflux2/helper" "github.com/miniflux/miniflux/helper"
"github.com/miniflux/miniflux2/model" "github.com/miniflux/miniflux/model"
"github.com/miniflux/miniflux2/reader/date" "github.com/miniflux/miniflux/reader/date"
) )
type atomFeed struct { type atomFeed struct {

4
reader/atom/parser.go
View file

@ -8,8 +8,8 @@ import (
"encoding/xml" "encoding/xml"
"io" "io"
"github.com/miniflux/miniflux2/errors" "github.com/miniflux/miniflux/errors"
"github.com/miniflux/miniflux2/model" "github.com/miniflux/miniflux/model"
"golang.org/x/net/html/charset" "golang.org/x/net/html/charset"
) )

2
reader/atom/parser_test.go
View file

@ -9,7 +9,7 @@ import (
"testing" "testing"
"time" "time"
"github.com/miniflux/miniflux2/errors" "github.com/miniflux/miniflux/errors"
) )
func TestParseAtomSample(t *testing.T) { func TestParseAtomSample(t *testing.T) {

14
reader/feed/handler.go
View file

@ -9,13 +9,13 @@ import (
"log" "log"
"time" "time"
"github.com/miniflux/miniflux2/errors" "github.com/miniflux/miniflux/errors"
"github.com/miniflux/miniflux2/helper" "github.com/miniflux/miniflux/helper"
"github.com/miniflux/miniflux2/http" "github.com/miniflux/miniflux/http"
"github.com/miniflux/miniflux2/model" "github.com/miniflux/miniflux/model"
"github.com/miniflux/miniflux2/reader/icon" "github.com/miniflux/miniflux/reader/icon"
"github.com/miniflux/miniflux2/reader/processor" "github.com/miniflux/miniflux/reader/processor"
"github.com/miniflux/miniflux2/storage" "github.com/miniflux/miniflux/storage"
) )
var ( var (

12
reader/feed/parser.go
View file

@ -12,12 +12,12 @@ import (
"strings" "strings"
"time" "time"
"github.com/miniflux/miniflux2/helper" "github.com/miniflux/miniflux/helper"
"github.com/miniflux/miniflux2/model" "github.com/miniflux/miniflux/model"
"github.com/miniflux/miniflux2/reader/atom" "github.com/miniflux/miniflux/reader/atom"
"github.com/miniflux/miniflux2/reader/json" "github.com/miniflux/miniflux/reader/json"
"github.com/miniflux/miniflux2/reader/rdf" "github.com/miniflux/miniflux/reader/rdf"
"github.com/miniflux/miniflux2/reader/rss" "github.com/miniflux/miniflux/reader/rss"
"golang.org/x/net/html/charset" "golang.org/x/net/html/charset"
) )

8
reader/icon/finder.go
View file

@ -10,10 +10,10 @@ import (
"io/ioutil" "io/ioutil"
"log" "log"
"github.com/miniflux/miniflux2/helper" "github.com/miniflux/miniflux/helper"
"github.com/miniflux/miniflux2/http" "github.com/miniflux/miniflux/http"
"github.com/miniflux/miniflux2/model" "github.com/miniflux/miniflux/model"
"github.com/miniflux/miniflux2/url" "github.com/miniflux/miniflux/url"
"github.com/PuerkitoBio/goquery" "github.com/PuerkitoBio/goquery"
) )

8
reader/json/json.go
View file

@ -9,10 +9,10 @@ import (
"strings" "strings"
"time" "time"
"github.com/miniflux/miniflux2/helper" "github.com/miniflux/miniflux/helper"
"github.com/miniflux/miniflux2/model" "github.com/miniflux/miniflux/model"
"github.com/miniflux/miniflux2/reader/date" "github.com/miniflux/miniflux/reader/date"
"github.com/miniflux/miniflux2/reader/sanitizer" "github.com/miniflux/miniflux/reader/sanitizer"
) )
type jsonFeed struct { type jsonFeed struct {

4
reader/json/parser.go
View file

@ -8,8 +8,8 @@ import (
"encoding/json" "encoding/json"
"io" "io"
"github.com/miniflux/miniflux2/errors" "github.com/miniflux/miniflux/errors"
"github.com/miniflux/miniflux2/model" "github.com/miniflux/miniflux/model"
) )
// Parse returns a normalized feed struct from a JON feed. // Parse returns a normalized feed struct from a JON feed.

2
reader/json/parser_test.go
View file

@ -10,7 +10,7 @@ import (
"testing" "testing"
"time" "time"
"github.com/miniflux/miniflux2/errors" "github.com/miniflux/miniflux/errors"
) )
func TestParseJsonFeed(t *testing.T) { func TestParseJsonFeed(t *testing.T) {

4
reader/opml/handler.go
View file

@ -10,8 +10,8 @@ import (
"io" "io"
"log" "log"
"github.com/miniflux/miniflux2/model" "github.com/miniflux/miniflux/model"
"github.com/miniflux/miniflux2/storage" "github.com/miniflux/miniflux/storage"
) )
// Handler handles the logic for OPML import/export. // Handler handles the logic for OPML import/export.

2
reader/opml/parser.go
View file

@ -8,7 +8,7 @@ import (
"encoding/xml" "encoding/xml"
"io" "io"
"github.com/miniflux/miniflux2/errors" "github.com/miniflux/miniflux/errors"
"golang.org/x/net/html/charset" "golang.org/x/net/html/charset"
) )

2
reader/opml/parser_test.go
View file

@ -8,7 +8,7 @@ import (
"bytes" "bytes"
"testing" "testing"
"github.com/miniflux/miniflux2/errors" "github.com/miniflux/miniflux/errors"
) )
func TestParseOpmlWithoutCategories(t *testing.T) { func TestParseOpmlWithoutCategories(t *testing.T) {

8
reader/processor/processor.go
View file

@ -7,10 +7,10 @@ package processor
import ( import (
"log" "log"
"github.com/miniflux/miniflux2/model" "github.com/miniflux/miniflux/model"
"github.com/miniflux/miniflux2/reader/rewrite" "github.com/miniflux/miniflux/reader/rewrite"
"github.com/miniflux/miniflux2/reader/sanitizer" "github.com/miniflux/miniflux/reader/sanitizer"
"github.com/miniflux/miniflux2/reader/scraper" "github.com/miniflux/miniflux/reader/scraper"
) )
// FeedProcessor handles the processing of feed contents. // FeedProcessor handles the processing of feed contents.

4
reader/rdf/parser.go
View file

@ -8,8 +8,8 @@ import (
"encoding/xml" "encoding/xml"
"io" "io"
"github.com/miniflux/miniflux2/errors" "github.com/miniflux/miniflux/errors"
"github.com/miniflux/miniflux2/model" "github.com/miniflux/miniflux/model"
"golang.org/x/net/html/charset" "golang.org/x/net/html/charset"
) )

2
reader/rdf/parser_test.go
View file

@ -10,7 +10,7 @@ import (
"testing" "testing"
"time" "time"
"github.com/miniflux/miniflux2/errors" "github.com/miniflux/miniflux/errors"
) )
func TestParseRDFSample(t *testing.T) { func TestParseRDFSample(t *testing.T) {

6
reader/rdf/rdf.go
View file

@ -9,9 +9,9 @@ import (
"strings" "strings"
"time" "time"
"github.com/miniflux/miniflux2/helper" "github.com/miniflux/miniflux/helper"
"github.com/miniflux/miniflux2/model" "github.com/miniflux/miniflux/model"
"github.com/miniflux/miniflux2/reader/sanitizer" "github.com/miniflux/miniflux/reader/sanitizer"
) )
type rdfFeed struct { type rdfFeed struct {

2
reader/rewrite/rewriter.go
View file

@ -7,7 +7,7 @@ package rewrite
import ( import (
"strings" "strings"
"github.com/miniflux/miniflux2/url" "github.com/miniflux/miniflux/url"
) )
// Rewriter modify item contents with a set of rewriting rules. // Rewriter modify item contents with a set of rewriting rules.

4
reader/rss/parser.go
View file

@ -8,8 +8,8 @@ import (
"encoding/xml" "encoding/xml"
"io" "io"
"github.com/miniflux/miniflux2/errors" "github.com/miniflux/miniflux/errors"
"github.com/miniflux/miniflux2/model" "github.com/miniflux/miniflux/model"
"golang.org/x/net/html/charset" "golang.org/x/net/html/charset"
) )

2
reader/rss/parser_test.go
View file

@ -9,7 +9,7 @@ import (
"testing" "testing"
"time" "time"
"github.com/miniflux/miniflux2/errors" "github.com/miniflux/miniflux/errors"
) )
func TestParseRss2Sample(t *testing.T) { func TestParseRss2Sample(t *testing.T) {

6
reader/rss/rss.go
View file

@ -12,9 +12,9 @@ import (
"strings" "strings"
"time" "time"
"github.com/miniflux/miniflux2/helper" "github.com/miniflux/miniflux/helper"
"github.com/miniflux/miniflux2/model" "github.com/miniflux/miniflux/model"
"github.com/miniflux/miniflux2/reader/date" "github.com/miniflux/miniflux/reader/date"
) )
type rssFeed struct { type rssFeed struct {

2
reader/sanitizer/sanitizer.go
View file

@ -10,7 +10,7 @@ import (
"io" "io"
"strings" "strings"
"github.com/miniflux/miniflux2/url" "github.com/miniflux/miniflux/url"
"golang.org/x/net/html" "golang.org/x/net/html"
) )

6
reader/scraper/scraper.go
View file

@ -11,9 +11,9 @@ import (
"strings" "strings"
"github.com/PuerkitoBio/goquery" "github.com/PuerkitoBio/goquery"
"github.com/miniflux/miniflux2/http" "github.com/miniflux/miniflux/http"
"github.com/miniflux/miniflux2/reader/readability" "github.com/miniflux/miniflux/reader/readability"
"github.com/miniflux/miniflux2/url" "github.com/miniflux/miniflux/url"
) )
// Fetch download a web page a returns relevant contents. // Fetch download a web page a returns relevant contents.

10
reader/subscription/finder.go
View file

@ -11,11 +11,11 @@ import (
"log" "log"
"time" "time"
"github.com/miniflux/miniflux2/errors" "github.com/miniflux/miniflux/errors"
"github.com/miniflux/miniflux2/helper" "github.com/miniflux/miniflux/helper"
"github.com/miniflux/miniflux2/http" "github.com/miniflux/miniflux/http"
"github.com/miniflux/miniflux2/reader/feed" "github.com/miniflux/miniflux/reader/feed"
"github.com/miniflux/miniflux2/url" "github.com/miniflux/miniflux/url"
"github.com/PuerkitoBio/goquery" "github.com/PuerkitoBio/goquery"
) )

2
scheduler/scheduler.go
View file

@ -8,7 +8,7 @@ import (
"log" "log"
"time" "time"
"github.com/miniflux/miniflux2/storage" "github.com/miniflux/miniflux/storage"
) )
// NewScheduler starts a new scheduler that push jobs to a pool of workers. // NewScheduler starts a new scheduler that push jobs to a pool of workers.

7
scheduler/worker.go
View file

@ -5,13 +5,14 @@
package scheduler package scheduler
import ( import (
"github.com/miniflux/miniflux2/model"
"github.com/miniflux/miniflux2/reader/feed"
"log" "log"
"time" "time"
"github.com/miniflux/miniflux/model"
"github.com/miniflux/miniflux/reader/feed"
) )
// A Worker refresh a feed in the background. // Worker refreshes a feed in the background.
type Worker struct { type Worker struct {
id int id int
feedHandler *feed.Handler feedHandler *feed.Handler

4
scheduler/worker_pool.go
View file

@ -5,8 +5,8 @@
package scheduler package scheduler
import ( import (
"github.com/miniflux/miniflux2/model" "github.com/miniflux/miniflux/model"
"github.com/miniflux/miniflux2/reader/feed" "github.com/miniflux/miniflux/reader/feed"
) )
// WorkerPool handle a pool of workers. // WorkerPool handle a pool of workers.

4
server/api/controller/category.go
View file

@ -7,8 +7,8 @@ package api
import ( import (
"errors" "errors"
"github.com/miniflux/miniflux2/server/api/payload" "github.com/miniflux/miniflux/server/api/payload"
"github.com/miniflux/miniflux2/server/core" "github.com/miniflux/miniflux/server/core"
) )
// CreateCategory is the API handler to create a new category. // CreateCategory is the API handler to create a new category.

4
server/api/controller/controller.go
View file

@ -5,8 +5,8 @@
package api package api
import ( import (
"github.com/miniflux/miniflux2/reader/feed" "github.com/miniflux/miniflux/reader/feed"
"github.com/miniflux/miniflux2/storage" "github.com/miniflux/miniflux/storage"
) )
// Controller holds all handlers for the API. // Controller holds all handlers for the API.

6
server/api/controller/entry.go
View file

@ -7,9 +7,9 @@ package api
import ( import (
"errors" "errors"
"github.com/miniflux/miniflux2/model" "github.com/miniflux/miniflux/model"
"github.com/miniflux/miniflux2/server/api/payload" "github.com/miniflux/miniflux/server/api/payload"
"github.com/miniflux/miniflux2/server/core" "github.com/miniflux/miniflux/server/core"
) )
// GetEntry is the API handler to get a single feed entry. // GetEntry is the API handler to get a single feed entry.

4
server/api/controller/feed.go
View file

@ -7,8 +7,8 @@ package api
import ( import (
"errors" "errors"
"github.com/miniflux/miniflux2/server/api/payload" "github.com/miniflux/miniflux/server/api/payload"
"github.com/miniflux/miniflux2/server/core" "github.com/miniflux/miniflux/server/core"
) )
// CreateFeed is the API handler to create a new feed. // CreateFeed is the API handler to create a new feed.

7
server/api/controller/subscription.go
View file

@ -7,9 +7,10 @@ package api
import ( import (
"errors" "errors"
"fmt" "fmt"
"github.com/miniflux/miniflux2/reader/subscription"
"github.com/miniflux/miniflux2/server/api/payload" "github.com/miniflux/miniflux/reader/subscription"
"github.com/miniflux/miniflux2/server/core" "github.com/miniflux/miniflux/server/api/payload"
"github.com/miniflux/miniflux/server/core"
) )
// GetSubscriptions is the API handler to find subscriptions. // GetSubscriptions is the API handler to find subscriptions.

4
server/api/controller/user.go
View file

@ -7,8 +7,8 @@ package api
import ( import (
"errors" "errors"
"github.com/miniflux/miniflux2/server/api/payload" "github.com/miniflux/miniflux/server/api/payload"
"github.com/miniflux/miniflux2/server/core" "github.com/miniflux/miniflux/server/core"
) )
// CreateUser is the API handler to create a new user. // CreateUser is the API handler to create a new user.

2
server/api/payload/payload.go
View file

@ -9,7 +9,7 @@ import (
"fmt" "fmt"
"io" "io"
"github.com/miniflux/miniflux2/model" "github.com/miniflux/miniflux/model"
) )
// EntriesResponse represents the response sent when fetching entries. // EntriesResponse represents the response sent when fetching entries.

8
server/core/context.go
View file

@ -8,10 +8,10 @@ import (
"log" "log"
"net/http" "net/http"
"github.com/miniflux/miniflux2/model" "github.com/miniflux/miniflux/model"
"github.com/miniflux/miniflux2/server/middleware" "github.com/miniflux/miniflux/server/middleware"
"github.com/miniflux/miniflux2/server/route" "github.com/miniflux/miniflux/server/route"
"github.com/miniflux/miniflux2/storage" "github.com/miniflux/miniflux/storage"
"github.com/gorilla/mux" "github.com/gorilla/mux"
) )

10
server/core/handler.go
View file

@ -9,11 +9,11 @@ import (
"net/http" "net/http"
"time" "time"
"github.com/miniflux/miniflux2/helper" "github.com/miniflux/miniflux/helper"
"github.com/miniflux/miniflux2/locale" "github.com/miniflux/miniflux/locale"
"github.com/miniflux/miniflux2/server/middleware" "github.com/miniflux/miniflux/server/middleware"
"github.com/miniflux/miniflux2/server/template" "github.com/miniflux/miniflux/server/template"
"github.com/miniflux/miniflux2/storage" "github.com/miniflux/miniflux/storage"
"github.com/gorilla/mux" "github.com/gorilla/mux"
) )

2
server/core/html_response.go
View file

@ -8,7 +8,7 @@ import (
"log" "log"
"net/http" "net/http"
"github.com/miniflux/miniflux2/server/template" "github.com/miniflux/miniflux/server/template"
) )
// HTMLResponse handles HTML responses. // HTMLResponse handles HTML responses.

2
server/core/response.go
View file

@ -8,7 +8,7 @@ import (
"net/http" "net/http"
"time" "time"
"github.com/miniflux/miniflux2/server/template" "github.com/miniflux/miniflux/server/template"
) )
// Response handles HTTP responses. // Response handles HTTP responses.

8
server/fever/fever.go
View file

@ -10,10 +10,10 @@ import (
"strings" "strings"
"time" "time"
"github.com/miniflux/miniflux2/integration" "github.com/miniflux/miniflux/integration"
"github.com/miniflux/miniflux2/model" "github.com/miniflux/miniflux/model"
"github.com/miniflux/miniflux2/server/core" "github.com/miniflux/miniflux/server/core"
"github.com/miniflux/miniflux2/storage" "github.com/miniflux/miniflux/storage"
) )
type baseResponse struct { type baseResponse struct {

2
server/middleware/basic_auth.go
View file

@ -9,7 +9,7 @@ import (
"log" "log"
"net/http" "net/http"
"github.com/miniflux/miniflux2/storage" "github.com/miniflux/miniflux/storage"
) )
// BasicAuthMiddleware is the middleware for HTTP Basic authentication. // BasicAuthMiddleware is the middleware for HTTP Basic authentication.

2
server/middleware/fever.go
View file

@ -9,7 +9,7 @@ import (
"log" "log"
"net/http" "net/http"
"github.com/miniflux/miniflux2/storage" "github.com/miniflux/miniflux/storage"
) )
// FeverMiddleware is the middleware that handles Fever API. // FeverMiddleware is the middleware that handles Fever API.

6
server/middleware/session.go
View file

@ -9,9 +9,9 @@ import (
"log" "log"
"net/http" "net/http"
"github.com/miniflux/miniflux2/model" "github.com/miniflux/miniflux/model"
"github.com/miniflux/miniflux2/server/route" "github.com/miniflux/miniflux/server/route"
"github.com/miniflux/miniflux2/storage" "github.com/miniflux/miniflux/storage"
"github.com/gorilla/mux" "github.com/gorilla/mux"
) )

4
server/middleware/token.go
View file

@ -9,8 +9,8 @@ import (
"log" "log"
"net/http" "net/http"
"github.com/miniflux/miniflux2/model" "github.com/miniflux/miniflux/model"
"github.com/miniflux/miniflux2/storage" "github.com/miniflux/miniflux/storage"
) )
// TokenMiddleware represents a token middleware. // TokenMiddleware represents a token middleware.

24
server/routes.go
View file

@ -7,19 +7,19 @@ package server
import ( import (
"net/http" "net/http"
"github.com/miniflux/miniflux2/scheduler" "github.com/miniflux/miniflux/scheduler"
"github.com/miniflux/miniflux2/config" "github.com/miniflux/miniflux/config"
"github.com/miniflux/miniflux2/locale" "github.com/miniflux/miniflux/locale"
"github.com/miniflux/miniflux2/reader/feed" "github.com/miniflux/miniflux/reader/feed"
"github.com/miniflux/miniflux2/reader/opml" "github.com/miniflux/miniflux/reader/opml"
api_controller "github.com/miniflux/miniflux2/server/api/controller" api_controller "github.com/miniflux/miniflux/server/api/controller"
"github.com/miniflux/miniflux2/server/core" "github.com/miniflux/miniflux/server/core"
"github.com/miniflux/miniflux2/server/fever" "github.com/miniflux/miniflux/server/fever"
"github.com/miniflux/miniflux2/server/middleware" "github.com/miniflux/miniflux/server/middleware"
"github.com/miniflux/miniflux2/server/template" "github.com/miniflux/miniflux/server/template"
ui_controller "github.com/miniflux/miniflux2/server/ui/controller" ui_controller "github.com/miniflux/miniflux/server/ui/controller"
"github.com/miniflux/miniflux2/storage" "github.com/miniflux/miniflux/storage"
"github.com/gorilla/mux" "github.com/gorilla/mux"
) )

8
server/server.go
View file

@ -11,12 +11,12 @@ import (
"time" "time"
"github.com/gorilla/mux" "github.com/gorilla/mux"
"github.com/miniflux/miniflux2/scheduler" "github.com/miniflux/miniflux/scheduler"
"golang.org/x/crypto/acme/autocert" "golang.org/x/crypto/acme/autocert"
"github.com/miniflux/miniflux2/config" "github.com/miniflux/miniflux/config"
"github.com/miniflux/miniflux2/reader/feed" "github.com/miniflux/miniflux/reader/feed"
"github.com/miniflux/miniflux2/storage" "github.com/miniflux/miniflux/storage"
) )
// NewServer returns a new HTTP server. // NewServer returns a new HTTP server.

2
server/static/bin.go
View file

@ -1,5 +1,5 @@
// Code generated by go generate; DO NOT EDIT. // Code generated by go generate; DO NOT EDIT.
// 2017-12-11 22:04:47.832384663 -0800 PST m=+0.014706233 // 2017-12-12 21:44:02.652999925 -0800 PST m=+0.007410628
package static package static

2
server/static/css.go
View file

@ -1,5 +1,5 @@
// Code generated by go generate; DO NOT EDIT. // Code generated by go generate; DO NOT EDIT.
// 2017-12-11 22:04:47.835872498 -0800 PST m=+0.018194068 // 2017-12-12 21:44:02.654843418 -0800 PST m=+0.009254121
package static package static

2
server/static/js.go
View file

@ -1,5 +1,5 @@
// Code generated by go generate; DO NOT EDIT. // Code generated by go generate; DO NOT EDIT.
// 2017-12-11 22:04:47.840119593 -0800 PST m=+0.022441163 // 2017-12-12 21:44:02.656535482 -0800 PST m=+0.010946185
package static package static

2
server/template/common.go
View file

@ -1,5 +1,5 @@
// Code generated by go generate; DO NOT EDIT. // Code generated by go generate; DO NOT EDIT.
// 2017-12-12 19:14:08.437349475 -0800 PST m=+0.019432121 // 2017-12-12 21:44:02.670455816 -0800 PST m=+0.024866519
package template package template

3
server/template/helper/elapsed.go
View file

@ -5,9 +5,10 @@
package helper package helper
import ( import (
"github.com/miniflux/miniflux2/locale"
"math" "math"
"time" "time"
"github.com/miniflux/miniflux/locale"
) )
// Texts to be translated if necessary. // Texts to be translated if necessary.

3
server/template/helper/elapsed_test.go
View file

@ -6,9 +6,10 @@ package helper
import ( import (
"fmt" "fmt"
"github.com/miniflux/miniflux2/locale"
"testing" "testing"
"time" "time"
"github.com/miniflux/miniflux/locale"
) )
func TestElapsedTime(t *testing.T) { func TestElapsedTime(t *testing.T) {

14
server/template/template.go
View file

@ -13,13 +13,13 @@ import (
"strings" "strings"
"time" "time"
"github.com/miniflux/miniflux2/config" "github.com/miniflux/miniflux/config"
"github.com/miniflux/miniflux2/errors" "github.com/miniflux/miniflux/errors"
"github.com/miniflux/miniflux2/locale" "github.com/miniflux/miniflux/locale"
"github.com/miniflux/miniflux2/server/route" "github.com/miniflux/miniflux/server/route"
"github.com/miniflux/miniflux2/server/template/helper" "github.com/miniflux/miniflux/server/template/helper"
"github.com/miniflux/miniflux2/server/ui/filter" "github.com/miniflux/miniflux/server/ui/filter"
"github.com/miniflux/miniflux2/url" "github.com/miniflux/miniflux/url"
"github.com/gorilla/mux" "github.com/gorilla/mux"
) )

2
server/template/views.go
View file

@ -1,5 +1,5 @@
// Code generated by go generate; DO NOT EDIT. // Code generated by go generate; DO NOT EDIT.
// 2017-12-12 19:14:08.427613446 -0800 PST m=+0.009696092 // 2017-12-12 21:44:02.658745181 -0800 PST m=+0.013155884
package template package template

4
server/ui/controller/about.go
View file

@ -5,8 +5,8 @@
package controller package controller
import ( import (
"github.com/miniflux/miniflux2/server/core" "github.com/miniflux/miniflux/server/core"
"github.com/miniflux/miniflux2/version" "github.com/miniflux/miniflux/version"
) )
// AboutPage shows the about page. // AboutPage shows the about page.

6
server/ui/controller/category.go
View file

@ -8,9 +8,9 @@ import (
"errors" "errors"
"log" "log"
"github.com/miniflux/miniflux2/model" "github.com/miniflux/miniflux/model"
"github.com/miniflux/miniflux2/server/core" "github.com/miniflux/miniflux/server/core"
"github.com/miniflux/miniflux2/server/ui/form" "github.com/miniflux/miniflux/server/ui/form"
) )
// ShowCategories shows the page with all categories. // ShowCategories shows the page with all categories.

14
server/ui/controller/controller.go
View file

@ -5,13 +5,13 @@
package controller package controller
import ( import (
"github.com/miniflux/miniflux2/config" "github.com/miniflux/miniflux/config"
"github.com/miniflux/miniflux2/model" "github.com/miniflux/miniflux/model"
"github.com/miniflux/miniflux2/reader/feed" "github.com/miniflux/miniflux/reader/feed"
"github.com/miniflux/miniflux2/reader/opml" "github.com/miniflux/miniflux/reader/opml"
"github.com/miniflux/miniflux2/scheduler" "github.com/miniflux/miniflux/scheduler"
"github.com/miniflux/miniflux2/server/core" "github.com/miniflux/miniflux/server/core"
"github.com/miniflux/miniflux2/storage" "github.com/miniflux/miniflux/storage"
) )
type tplParams map[string]interface{} type tplParams map[string]interface{}

14
server/ui/controller/entry.go
View file

@ -8,14 +8,14 @@ import (
"errors" "errors"
"log" "log"
"github.com/miniflux/miniflux2/reader/sanitizer" "github.com/miniflux/miniflux/reader/sanitizer"
"github.com/miniflux/miniflux2/integration" "github.com/miniflux/miniflux/integration"
"github.com/miniflux/miniflux2/model" "github.com/miniflux/miniflux/model"
"github.com/miniflux/miniflux2/reader/scraper" "github.com/miniflux/miniflux/reader/scraper"
"github.com/miniflux/miniflux2/server/core" "github.com/miniflux/miniflux/server/core"
"github.com/miniflux/miniflux2/server/ui/payload" "github.com/miniflux/miniflux/server/ui/payload"
"github.com/miniflux/miniflux2/storage" "github.com/miniflux/miniflux/storage"
) )
// FetchContent downloads the original HTML page and returns relevant contents. // FetchContent downloads the original HTML page and returns relevant contents.

6
server/ui/controller/feed.go
View file

@ -8,9 +8,9 @@ import (
"errors" "errors"
"log" "log"
"github.com/miniflux/miniflux2/model" "github.com/miniflux/miniflux/model"
"github.com/miniflux/miniflux2/server/core" "github.com/miniflux/miniflux/server/core"
"github.com/miniflux/miniflux2/server/ui/form" "github.com/miniflux/miniflux/server/ui/form"
) )
// RefreshAllFeeds refresh all feeds in the background. // RefreshAllFeeds refresh all feeds in the background.

4
server/ui/controller/history.go
View file

@ -5,8 +5,8 @@
package controller package controller
import ( import (
"github.com/miniflux/miniflux2/model" "github.com/miniflux/miniflux/model"
"github.com/miniflux/miniflux2/server/core" "github.com/miniflux/miniflux/server/core"
) )
// ShowHistoryPage renders the page with all read entries. // ShowHistoryPage renders the page with all read entries.

2
server/ui/controller/icon.go
View file

@ -7,7 +7,7 @@ package controller
import ( import (
"time" "time"
"github.com/miniflux/miniflux2/server/core" "github.com/miniflux/miniflux/server/core"
) )
// ShowIcon shows the feed icon. // ShowIcon shows the feed icon.

4
server/ui/controller/integrations.go
View file

@ -8,8 +8,8 @@ import (
"crypto/md5" "crypto/md5"
"fmt" "fmt"
"github.com/miniflux/miniflux2/server/core" "github.com/miniflux/miniflux/server/core"
"github.com/miniflux/miniflux2/server/ui/form" "github.com/miniflux/miniflux/server/ui/form"
) )
// ShowIntegrations renders the page with all external integrations. // ShowIntegrations renders the page with all external integrations.

4
server/ui/controller/login.go
View file

@ -9,8 +9,8 @@ import (
"net/http" "net/http"
"time" "time"
"github.com/miniflux/miniflux2/server/core" "github.com/miniflux/miniflux/server/core"
"github.com/miniflux/miniflux2/server/ui/form" "github.com/miniflux/miniflux/server/ui/form"
"github.com/tomasen/realip" "github.com/tomasen/realip"
) )

8
server/ui/controller/oauth2.go
View file

@ -8,10 +8,10 @@ import (
"log" "log"
"net/http" "net/http"
"github.com/miniflux/miniflux2/config" "github.com/miniflux/miniflux/config"
"github.com/miniflux/miniflux2/model" "github.com/miniflux/miniflux/model"
"github.com/miniflux/miniflux2/server/core" "github.com/miniflux/miniflux/server/core"
"github.com/miniflux/miniflux2/server/oauth2" "github.com/miniflux/miniflux/server/oauth2"
"github.com/tomasen/realip" "github.com/tomasen/realip"
) )

2
server/ui/controller/opml.go
View file

@ -7,7 +7,7 @@ package controller
import ( import (
"log" "log"
"github.com/miniflux/miniflux2/server/core" "github.com/miniflux/miniflux/server/core"
) )
// Export generates the OPML file. // Export generates the OPML file.

6
server/ui/controller/proxy.go
View file

@ -11,9 +11,9 @@ import (
"log" "log"
"time" "time"
"github.com/miniflux/miniflux2/helper" "github.com/miniflux/miniflux/helper"
"github.com/miniflux/miniflux2/http" "github.com/miniflux/miniflux/http"
"github.com/miniflux/miniflux2/server/core" "github.com/miniflux/miniflux/server/core"
) )
// ImageProxy fetch an image from a remote server and sent it back to the browser. // ImageProxy fetch an image from a remote server and sent it back to the browser.

2
server/ui/controller/session.go
View file

@ -7,7 +7,7 @@ package controller
import ( import (
"log" "log"
"github.com/miniflux/miniflux2/server/core" "github.com/miniflux/miniflux/server/core"
) )
// ShowSessions shows the list of active sessions. // ShowSessions shows the list of active sessions.

8
server/ui/controller/settings.go
View file

@ -7,10 +7,10 @@ package controller
import ( import (
"log" "log"
"github.com/miniflux/miniflux2/locale" "github.com/miniflux/miniflux/locale"
"github.com/miniflux/miniflux2/model" "github.com/miniflux/miniflux/model"
"github.com/miniflux/miniflux2/server/core" "github.com/miniflux/miniflux/server/core"
"github.com/miniflux/miniflux2/server/ui/form" "github.com/miniflux/miniflux/server/ui/form"
) )
// ShowSettings shows the settings page. // ShowSettings shows the settings page.

4
server/ui/controller/static.go
View file

@ -9,8 +9,8 @@ import (
"log" "log"
"time" "time"
"github.com/miniflux/miniflux2/server/core" "github.com/miniflux/miniflux/server/core"
"github.com/miniflux/miniflux2/server/static" "github.com/miniflux/miniflux/server/static"
) )
// Stylesheet renders the CSS. // Stylesheet renders the CSS.

8
server/ui/controller/subscription.go
View file

@ -7,10 +7,10 @@ package controller
import ( import (
"log" "log"
"github.com/miniflux/miniflux2/model" "github.com/miniflux/miniflux/model"
"github.com/miniflux/miniflux2/reader/subscription" "github.com/miniflux/miniflux/reader/subscription"
"github.com/miniflux/miniflux2/server/core" "github.com/miniflux/miniflux/server/core"
"github.com/miniflux/miniflux2/server/ui/form" "github.com/miniflux/miniflux/server/ui/form"
) )
// Bookmarklet prefill the form to add a subscription from the URL provided by the bookmarklet. // Bookmarklet prefill the form to add a subscription from the URL provided by the bookmarklet.

4
server/ui/controller/unread.go
View file

@ -5,8 +5,8 @@
package controller package controller
import ( import (
"github.com/miniflux/miniflux2/model" "github.com/miniflux/miniflux/model"
"github.com/miniflux/miniflux2/server/core" "github.com/miniflux/miniflux/server/core"
) )
// ShowUnreadPage render the page with all unread entries. // ShowUnreadPage render the page with all unread entries.

6
server/ui/controller/user.go
View file

@ -8,9 +8,9 @@ import (
"errors" "errors"
"log" "log"
"github.com/miniflux/miniflux2/model" "github.com/miniflux/miniflux/model"
"github.com/miniflux/miniflux2/server/core" "github.com/miniflux/miniflux/server/core"
"github.com/miniflux/miniflux2/server/ui/form" "github.com/miniflux/miniflux/server/ui/form"
) )
// ShowUsers shows the list of users. // ShowUsers shows the list of users.

4
server/ui/filter/image_proxy_filter.go
View file

@ -8,8 +8,8 @@ import (
"encoding/base64" "encoding/base64"
"strings" "strings"
"github.com/miniflux/miniflux2/server/route" "github.com/miniflux/miniflux/server/route"
"github.com/miniflux/miniflux2/url" "github.com/miniflux/miniflux/url"
"github.com/PuerkitoBio/goquery" "github.com/PuerkitoBio/goquery"
"github.com/gorilla/mux" "github.com/gorilla/mux"

2
server/ui/form/auth.go
View file

@ -7,7 +7,7 @@ package form
import ( import (
"net/http" "net/http"
"github.com/miniflux/miniflux2/errors" "github.com/miniflux/miniflux/errors"
) )
// AuthForm represents the authentication form. // AuthForm represents the authentication form.

4
server/ui/form/category.go
View file

@ -7,8 +7,8 @@ package form
import ( import (
"net/http" "net/http"
"github.com/miniflux/miniflux2/errors" "github.com/miniflux/miniflux/errors"
"github.com/miniflux/miniflux2/model" "github.com/miniflux/miniflux/model"
) )
// CategoryForm represents a feed form in the UI // CategoryForm represents a feed form in the UI

4
server/ui/form/feed.go
View file

@ -8,8 +8,8 @@ import (
"net/http" "net/http"
"strconv" "strconv"
"github.com/miniflux/miniflux2/errors" "github.com/miniflux/miniflux/errors"
"github.com/miniflux/miniflux2/model" "github.com/miniflux/miniflux/model"
) )
// FeedForm represents a feed form in the UI // FeedForm represents a feed form in the UI

2
server/ui/form/integration.go
View file

@ -7,7 +7,7 @@ package form
import ( import (
"net/http" "net/http"
"github.com/miniflux/miniflux2/model" "github.com/miniflux/miniflux/model"
) )
// IntegrationForm represents user integration settings form. // IntegrationForm represents user integration settings form.

4
server/ui/form/settings.go
View file

@ -7,8 +7,8 @@ package form
import ( import (
"net/http" "net/http"
"github.com/miniflux/miniflux2/errors" "github.com/miniflux/miniflux/errors"
"github.com/miniflux/miniflux2/model" "github.com/miniflux/miniflux/model"
) )
// SettingsForm represents the settings form. // SettingsForm represents the settings form.

2
server/ui/form/subscription.go
View file

@ -8,7 +8,7 @@ import (
"net/http" "net/http"
"strconv" "strconv"
"github.com/miniflux/miniflux2/errors" "github.com/miniflux/miniflux/errors"
) )
// SubscriptionForm represents the subscription form. // SubscriptionForm represents the subscription form.

4
server/ui/form/user.go
View file

@ -7,8 +7,8 @@ package form
import ( import (
"net/http" "net/http"
"github.com/miniflux/miniflux2/errors" "github.com/miniflux/miniflux/errors"
"github.com/miniflux/miniflux2/model" "github.com/miniflux/miniflux/model"
) )
// UserForm represents the user form. // UserForm represents the user form.

2
server/ui/payload/payload.go
View file

@ -9,7 +9,7 @@ import (
"fmt" "fmt"
"io" "io"
"github.com/miniflux/miniflux2/model" "github.com/miniflux/miniflux/model"
) )
// DecodeEntryStatusPayload unserialize JSON request to update entry statuses. // DecodeEntryStatusPayload unserialize JSON request to update entry statuses.

2
sql/sql.go
View file

@ -1,5 +1,5 @@
// Code generated by go generate; DO NOT EDIT. // Code generated by go generate; DO NOT EDIT.
// 2017-12-12 19:14:08.420562729 -0800 PST m=+0.002645375 // 2017-12-12 21:44:02.647917692 -0800 PST m=+0.002328395
package sql package sql

4
storage/category.go
View file

@ -10,8 +10,8 @@ import (
"fmt" "fmt"
"time" "time"
"github.com/miniflux/miniflux2/helper" "github.com/miniflux/miniflux/helper"
"github.com/miniflux/miniflux2/model" "github.com/miniflux/miniflux/model"
) )
// AnotherCategoryExists checks if another category exists with the same title. // AnotherCategoryExists checks if another category exists with the same title.

2
storage/enclosure.go
View file

@ -7,7 +7,7 @@ package storage
import ( import (
"fmt" "fmt"
"github.com/miniflux/miniflux2/model" "github.com/miniflux/miniflux/model"
) )
// GetEnclosures returns all attachments for the given entry. // GetEnclosures returns all attachments for the given entry.

4
storage/entry.go
View file

@ -10,8 +10,8 @@ import (
"log" "log"
"time" "time"
"github.com/miniflux/miniflux2/helper" "github.com/miniflux/miniflux/helper"
"github.com/miniflux/miniflux2/model" "github.com/miniflux/miniflux/model"
"github.com/lib/pq" "github.com/lib/pq"
) )

4
storage/entry_query_builder.go
View file

@ -11,8 +11,8 @@ import (
"github.com/lib/pq" "github.com/lib/pq"
"github.com/miniflux/miniflux2/helper" "github.com/miniflux/miniflux/helper"
"github.com/miniflux/miniflux2/model" "github.com/miniflux/miniflux/model"
) )
// EntryQueryBuilder builds a SQL query to fetch entries. // EntryQueryBuilder builds a SQL query to fetch entries.

4
storage/feed.go
View file

@ -10,8 +10,8 @@ import (
"fmt" "fmt"
"time" "time"
"github.com/miniflux/miniflux2/helper" "github.com/miniflux/miniflux/helper"
"github.com/miniflux/miniflux2/model" "github.com/miniflux/miniflux/model"
) )
// FeedExists checks if the given feed exists. // FeedExists checks if the given feed exists.

4
storage/icon.go
View file

@ -10,8 +10,8 @@ import (
"strings" "strings"
"time" "time"
"github.com/miniflux/miniflux2/helper" "github.com/miniflux/miniflux/helper"
"github.com/miniflux/miniflux2/model" "github.com/miniflux/miniflux/model"
) )
// HasIcon checks if the given feed has an icon. // HasIcon checks if the given feed has an icon.

2
storage/integration.go
View file

@ -8,7 +8,7 @@ import (
"database/sql" "database/sql"
"fmt" "fmt"
"github.com/miniflux/miniflux2/model" "github.com/miniflux/miniflux/model"
) )
// UserByFeverToken returns a user by using the Fever API token. // UserByFeverToken returns a user by using the Fever API token.

4
storage/job.go
View file

@ -8,8 +8,8 @@ import (
"fmt" "fmt"
"time" "time"
"github.com/miniflux/miniflux2/helper" "github.com/miniflux/miniflux/helper"
"github.com/miniflux/miniflux2/model" "github.com/miniflux/miniflux/model"
) )
const maxParsingError = 3 const maxParsingError = 3

2
storage/migration.go
View file

@ -9,7 +9,7 @@ import (
"log" "log"
"strconv" "strconv"
"github.com/miniflux/miniflux2/sql" "github.com/miniflux/miniflux/sql"
) )
const schemaVersion = 8 const schemaVersion = 8

4
storage/session.go
View file

@ -8,8 +8,8 @@ import (
"database/sql" "database/sql"
"fmt" "fmt"
"github.com/miniflux/miniflux2/helper" "github.com/miniflux/miniflux/helper"
"github.com/miniflux/miniflux2/model" "github.com/miniflux/miniflux/model"
) )
// Sessions returns the list of sessions for the given user. // Sessions returns the list of sessions for the given user.

Some files were not shown because too many files have changed in this diff Show more