Skip to content

Commit 84d912c

Browse files
fguillotfguillot
committed
Rewrite imports
1 parent 9b1128d commit 84d912c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

103 files changed

+247
-243
lines changed

‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Miniflux 2
22
==========
3-
[![Build Status](https://travis-ci.org/miniflux/miniflux2.svg?branch=master)](https://travis-ci.org/miniflux/miniflux2)
3+
[![Build Status](https://travis-ci.org/miniflux/miniflux.svg?branch=master)](https://travis-ci.org/miniflux/miniflux)
44
[![Documentation Status](https://readthedocs.org/projects/miniflux/badge/?version=latest)](https://docs.miniflux.net/)
55

66
Miniflux is a minimalist and opinionated feed reader:
@@ -14,7 +14,7 @@ Miniflux is a minimalist and opinionated feed reader:
1414

1515
It's simple, fast, lightweight and super easy to install.
1616

17-
Miniflux 2 is a rewrite of Miniflux 1.x in Golang.
17+
Miniflux 2 is a rewrite of [Miniflux 1.x](https://github.com/miniflux/miniflux-legacy) in Golang.
1818

1919
Notes
2020
-----

‎errors/errors.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ package errors
77
import (
88
"fmt"
99

10-
"github.com/miniflux/miniflux2/locale"
10+
"github.com/miniflux/miniflux/locale"
1111
)
1212

1313
// LocalizedError represents an error than could be translated to another language.

‎http/client.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"net/url"
1313
"time"
1414

15-
"github.com/miniflux/miniflux2/helper"
15+
"github.com/miniflux/miniflux/helper"
1616
)
1717

1818
const userAgent = "Miniflux <https://miniflux.net/>"

‎integration/instapaper/instapaper.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"fmt"
99
"net/url"
1010

11-
"github.com/miniflux/miniflux2/http"
11+
"github.com/miniflux/miniflux/http"
1212
)
1313

1414
// Client represents an Instapaper client.

‎integration/integration.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ package integration
77
import (
88
"log"
99

10-
"github.com/miniflux/miniflux2/integration/instapaper"
11-
"github.com/miniflux/miniflux2/integration/pinboard"
12-
"github.com/miniflux/miniflux2/model"
10+
"github.com/miniflux/miniflux/integration/instapaper"
11+
"github.com/miniflux/miniflux/integration/pinboard"
12+
"github.com/miniflux/miniflux/model"
1313
)
1414

1515
// SendEntry send the entry to the activated providers.

‎integration/pinboard/pinboard.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"fmt"
99
"net/url"
1010

11-
"github.com/miniflux/miniflux2/http"
11+
"github.com/miniflux/miniflux/http"
1212
)
1313

1414
// Client represents a Pinboard client.

‎locale/translations.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎main.go

+7-7
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@ import (
2525
"strings"
2626
"time"
2727

28-
"github.com/miniflux/miniflux2/config"
29-
"github.com/miniflux/miniflux2/model"
30-
"github.com/miniflux/miniflux2/reader/feed"
31-
"github.com/miniflux/miniflux2/scheduler"
32-
"github.com/miniflux/miniflux2/server"
33-
"github.com/miniflux/miniflux2/storage"
34-
"github.com/miniflux/miniflux2/version"
28+
"github.com/miniflux/miniflux/config"
29+
"github.com/miniflux/miniflux/model"
30+
"github.com/miniflux/miniflux/reader/feed"
31+
"github.com/miniflux/miniflux/scheduler"
32+
"github.com/miniflux/miniflux/server"
33+
"github.com/miniflux/miniflux/storage"
34+
"github.com/miniflux/miniflux/version"
3535

3636
_ "github.com/lib/pq"
3737
"golang.org/x/crypto/ssh/terminal"

‎miniflux-test

-13.1 MB
Binary file not shown.

‎model/theme.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
package model
66

7-
import "github.com/miniflux/miniflux2/errors"
7+
import "github.com/miniflux/miniflux/errors"
88

99
// Themes returns the list of available themes.
1010
func Themes() map[string]string {

‎reader/atom/atom.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ import (
1111
"strings"
1212
"time"
1313

14-
"github.com/miniflux/miniflux2/helper"
15-
"github.com/miniflux/miniflux2/model"
16-
"github.com/miniflux/miniflux2/reader/date"
14+
"github.com/miniflux/miniflux/helper"
15+
"github.com/miniflux/miniflux/model"
16+
"github.com/miniflux/miniflux/reader/date"
1717
)
1818

1919
type atomFeed struct {

‎reader/atom/parser.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import (
88
"encoding/xml"
99
"io"
1010

11-
"github.com/miniflux/miniflux2/errors"
12-
"github.com/miniflux/miniflux2/model"
11+
"github.com/miniflux/miniflux/errors"
12+
"github.com/miniflux/miniflux/model"
1313

1414
"golang.org/x/net/html/charset"
1515
)

‎reader/atom/parser_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"testing"
1010
"time"
1111

12-
"github.com/miniflux/miniflux2/errors"
12+
"github.com/miniflux/miniflux/errors"
1313
)
1414

1515
func TestParseAtomSample(t *testing.T) {

‎reader/feed/handler.go

+7-7
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ import (
99
"log"
1010
"time"
1111

12-
"github.com/miniflux/miniflux2/errors"
13-
"github.com/miniflux/miniflux2/helper"
14-
"github.com/miniflux/miniflux2/http"
15-
"github.com/miniflux/miniflux2/model"
16-
"github.com/miniflux/miniflux2/reader/icon"
17-
"github.com/miniflux/miniflux2/reader/processor"
18-
"github.com/miniflux/miniflux2/storage"
12+
"github.com/miniflux/miniflux/errors"
13+
"github.com/miniflux/miniflux/helper"
14+
"github.com/miniflux/miniflux/http"
15+
"github.com/miniflux/miniflux/model"
16+
"github.com/miniflux/miniflux/reader/icon"
17+
"github.com/miniflux/miniflux/reader/processor"
18+
"github.com/miniflux/miniflux/storage"
1919
)
2020

2121
var (

‎reader/feed/parser.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ import (
1212
"strings"
1313
"time"
1414

15-
"github.com/miniflux/miniflux2/helper"
16-
"github.com/miniflux/miniflux2/model"
17-
"github.com/miniflux/miniflux2/reader/atom"
18-
"github.com/miniflux/miniflux2/reader/json"
19-
"github.com/miniflux/miniflux2/reader/rdf"
20-
"github.com/miniflux/miniflux2/reader/rss"
15+
"github.com/miniflux/miniflux/helper"
16+
"github.com/miniflux/miniflux/model"
17+
"github.com/miniflux/miniflux/reader/atom"
18+
"github.com/miniflux/miniflux/reader/json"
19+
"github.com/miniflux/miniflux/reader/rdf"
20+
"github.com/miniflux/miniflux/reader/rss"
2121

2222
"golang.org/x/net/html/charset"
2323
)

‎reader/icon/finder.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ import (
1010
"io/ioutil"
1111
"log"
1212

13-
"github.com/miniflux/miniflux2/helper"
14-
"github.com/miniflux/miniflux2/http"
15-
"github.com/miniflux/miniflux2/model"
16-
"github.com/miniflux/miniflux2/url"
13+
"github.com/miniflux/miniflux/helper"
14+
"github.com/miniflux/miniflux/http"
15+
"github.com/miniflux/miniflux/model"
16+
"github.com/miniflux/miniflux/url"
1717

1818
"github.com/PuerkitoBio/goquery"
1919
)

‎reader/json/json.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ import (
99
"strings"
1010
"time"
1111

12-
"github.com/miniflux/miniflux2/helper"
13-
"github.com/miniflux/miniflux2/model"
14-
"github.com/miniflux/miniflux2/reader/date"
15-
"github.com/miniflux/miniflux2/reader/sanitizer"
12+
"github.com/miniflux/miniflux/helper"
13+
"github.com/miniflux/miniflux/model"
14+
"github.com/miniflux/miniflux/reader/date"
15+
"github.com/miniflux/miniflux/reader/sanitizer"
1616
)
1717

1818
type jsonFeed struct {

‎reader/json/parser.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import (
88
"encoding/json"
99
"io"
1010

11-
"github.com/miniflux/miniflux2/errors"
12-
"github.com/miniflux/miniflux2/model"
11+
"github.com/miniflux/miniflux/errors"
12+
"github.com/miniflux/miniflux/model"
1313
)
1414

1515
// Parse returns a normalized feed struct from a JON feed.

‎reader/json/parser_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"testing"
1111
"time"
1212

13-
"github.com/miniflux/miniflux2/errors"
13+
"github.com/miniflux/miniflux/errors"
1414
)
1515

1616
func TestParseJsonFeed(t *testing.T) {

‎reader/opml/handler.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import (
1010
"io"
1111
"log"
1212

13-
"github.com/miniflux/miniflux2/model"
14-
"github.com/miniflux/miniflux2/storage"
13+
"github.com/miniflux/miniflux/model"
14+
"github.com/miniflux/miniflux/storage"
1515
)
1616

1717
// Handler handles the logic for OPML import/export.

‎reader/opml/parser.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"encoding/xml"
99
"io"
1010

11-
"github.com/miniflux/miniflux2/errors"
11+
"github.com/miniflux/miniflux/errors"
1212
"golang.org/x/net/html/charset"
1313
)
1414

‎reader/opml/parser_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"bytes"
99
"testing"
1010

11-
"github.com/miniflux/miniflux2/errors"
11+
"github.com/miniflux/miniflux/errors"
1212
)
1313

1414
func TestParseOpmlWithoutCategories(t *testing.T) {

‎reader/processor/processor.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ package processor
77
import (
88
"log"
99

10-
"github.com/miniflux/miniflux2/model"
11-
"github.com/miniflux/miniflux2/reader/rewrite"
12-
"github.com/miniflux/miniflux2/reader/sanitizer"
13-
"github.com/miniflux/miniflux2/reader/scraper"
10+
"github.com/miniflux/miniflux/model"
11+
"github.com/miniflux/miniflux/reader/rewrite"
12+
"github.com/miniflux/miniflux/reader/sanitizer"
13+
"github.com/miniflux/miniflux/reader/scraper"
1414
)
1515

1616
// FeedProcessor handles the processing of feed contents.

‎reader/rdf/parser.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import (
88
"encoding/xml"
99
"io"
1010

11-
"github.com/miniflux/miniflux2/errors"
12-
"github.com/miniflux/miniflux2/model"
11+
"github.com/miniflux/miniflux/errors"
12+
"github.com/miniflux/miniflux/model"
1313
"golang.org/x/net/html/charset"
1414
)
1515

‎reader/rdf/parser_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"testing"
1111
"time"
1212

13-
"github.com/miniflux/miniflux2/errors"
13+
"github.com/miniflux/miniflux/errors"
1414
)
1515

1616
func TestParseRDFSample(t *testing.T) {

‎reader/rdf/rdf.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import (
99
"strings"
1010
"time"
1111

12-
"github.com/miniflux/miniflux2/helper"
13-
"github.com/miniflux/miniflux2/model"
14-
"github.com/miniflux/miniflux2/reader/sanitizer"
12+
"github.com/miniflux/miniflux/helper"
13+
"github.com/miniflux/miniflux/model"
14+
"github.com/miniflux/miniflux/reader/sanitizer"
1515
)
1616

1717
type rdfFeed struct {

‎reader/rewrite/rewriter.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ package rewrite
77
import (
88
"strings"
99

10-
"github.com/miniflux/miniflux2/url"
10+
"github.com/miniflux/miniflux/url"
1111
)
1212

1313
// Rewriter modify item contents with a set of rewriting rules.

‎reader/rss/parser.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import (
88
"encoding/xml"
99
"io"
1010

11-
"github.com/miniflux/miniflux2/errors"
12-
"github.com/miniflux/miniflux2/model"
11+
"github.com/miniflux/miniflux/errors"
12+
"github.com/miniflux/miniflux/model"
1313

1414
"golang.org/x/net/html/charset"
1515
)

‎reader/rss/parser_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"testing"
1010
"time"
1111

12-
"github.com/miniflux/miniflux2/errors"
12+
"github.com/miniflux/miniflux/errors"
1313
)
1414

1515
func TestParseRss2Sample(t *testing.T) {

‎reader/rss/rss.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ import (
1212
"strings"
1313
"time"
1414

15-
"github.com/miniflux/miniflux2/helper"
16-
"github.com/miniflux/miniflux2/model"
17-
"github.com/miniflux/miniflux2/reader/date"
15+
"github.com/miniflux/miniflux/helper"
16+
"github.com/miniflux/miniflux/model"
17+
"github.com/miniflux/miniflux/reader/date"
1818
)
1919

2020
type rssFeed struct {

‎reader/sanitizer/sanitizer.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"io"
1111
"strings"
1212

13-
"github.com/miniflux/miniflux2/url"
13+
"github.com/miniflux/miniflux/url"
1414

1515
"golang.org/x/net/html"
1616
)

‎reader/scraper/scraper.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ import (
1111
"strings"
1212

1313
"github.com/PuerkitoBio/goquery"
14-
"github.com/miniflux/miniflux2/http"
15-
"github.com/miniflux/miniflux2/reader/readability"
16-
"github.com/miniflux/miniflux2/url"
14+
"github.com/miniflux/miniflux/http"
15+
"github.com/miniflux/miniflux/reader/readability"
16+
"github.com/miniflux/miniflux/url"
1717
)
1818

1919
// Fetch download a web page a returns relevant contents.

‎reader/subscription/finder.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ import (
1111
"log"
1212
"time"
1313

14-
"github.com/miniflux/miniflux2/errors"
15-
"github.com/miniflux/miniflux2/helper"
16-
"github.com/miniflux/miniflux2/http"
17-
"github.com/miniflux/miniflux2/reader/feed"
18-
"github.com/miniflux/miniflux2/url"
14+
"github.com/miniflux/miniflux/errors"
15+
"github.com/miniflux/miniflux/helper"
16+
"github.com/miniflux/miniflux/http"
17+
"github.com/miniflux/miniflux/reader/feed"
18+
"github.com/miniflux/miniflux/url"
1919

2020
"github.com/PuerkitoBio/goquery"
2121
)

‎scheduler/scheduler.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"log"
99
"time"
1010

11-
"github.com/miniflux/miniflux2/storage"
11+
"github.com/miniflux/miniflux/storage"
1212
)
1313

1414
// NewScheduler starts a new scheduler that push jobs to a pool of workers.

0 commit comments

Comments
 (0)