Переглянути джерело

refactor(icon): unexport a bunch of symbols

jvoisin 11 місяців тому
батько
коміт
57bd384951
2 змінених файлів з 22 додано та 22 видалено
  1. 8 8
      internal/reader/icon/checker.go
  2. 14 14
      internal/reader/icon/finder.go

+ 8 - 8
internal/reader/icon/checker.go

@@ -13,19 +13,19 @@ import (
 	"miniflux.app/v2/internal/storage"
 )
 
-type IconChecker struct {
+type iconChecker struct {
 	store *storage.Storage
 	feed  *model.Feed
 }
 
-func NewIconChecker(store *storage.Storage, feed *model.Feed) *IconChecker {
-	return &IconChecker{
+func NewIconChecker(store *storage.Storage, feed *model.Feed) *iconChecker {
+	return &iconChecker{
 		store: store,
 		feed:  feed,
 	}
 }
 
-func (c *IconChecker) fetchAndStoreIcon() {
+func (c *iconChecker) fetchAndStoreIcon() {
 	requestBuilder := fetcher.NewRequestBuilder()
 	requestBuilder.WithUserAgent(c.feed.UserAgent, config.Opts.HTTPClientUserAgent())
 	requestBuilder.WithCookie(c.feed.Cookie)
@@ -37,8 +37,8 @@ func (c *IconChecker) fetchAndStoreIcon() {
 	requestBuilder.IgnoreTLSErrors(c.feed.AllowSelfSignedCertificates)
 	requestBuilder.DisableHTTP2(c.feed.DisableHTTP2)
 
-	iconFinder := NewIconFinder(requestBuilder, c.feed.SiteURL, c.feed.IconURL)
-	if icon, err := iconFinder.FindIcon(); err != nil {
+	iconFinder := newIconFinder(requestBuilder, c.feed.SiteURL, c.feed.IconURL)
+	if icon, err := iconFinder.findIcon(); err != nil {
 		slog.Debug("Unable to find feed icon",
 			slog.Int64("feed_id", c.feed.ID),
 			slog.String("website_url", c.feed.SiteURL),
@@ -71,7 +71,7 @@ func (c *IconChecker) fetchAndStoreIcon() {
 	}
 }
 
-func (c *IconChecker) CreateFeedIconIfMissing() {
+func (c *iconChecker) CreateFeedIconIfMissing() {
 	if c.store.HasFeedIcon(c.feed.ID) {
 		slog.Debug("Feed icon already exists",
 			slog.Int64("feed_id", c.feed.ID),
@@ -82,6 +82,6 @@ func (c *IconChecker) CreateFeedIconIfMissing() {
 	c.fetchAndStoreIcon()
 }
 
-func (c *IconChecker) UpdateOrCreateFeedIcon() {
+func (c *iconChecker) UpdateOrCreateFeedIcon() {
 	c.fetchAndStoreIcon()
 }

+ 14 - 14
internal/reader/icon/finder.go

@@ -29,28 +29,28 @@ import (
 	"golang.org/x/image/draw"
 )
 
-type IconFinder struct {
+type iconFinder struct {
 	requestBuilder *fetcher.RequestBuilder
 	websiteURL     string
 	feedIconURL    string
 }
 
-func NewIconFinder(requestBuilder *fetcher.RequestBuilder, websiteURL, feedIconURL string) *IconFinder {
-	return &IconFinder{
+func newIconFinder(requestBuilder *fetcher.RequestBuilder, websiteURL, feedIconURL string) *iconFinder {
+	return &iconFinder{
 		requestBuilder: requestBuilder,
 		websiteURL:     websiteURL,
 		feedIconURL:    feedIconURL,
 	}
 }
 
-func (f *IconFinder) FindIcon() (*model.Icon, error) {
+func (f *iconFinder) findIcon() (*model.Icon, error) {
 	slog.Debug("Begin icon discovery process",
 		slog.String("website_url", f.websiteURL),
 		slog.String("feed_icon_url", f.feedIconURL),
 	)
 
 	if f.feedIconURL != "" {
-		if icon, err := f.FetchFeedIcon(); err != nil {
+		if icon, err := f.fetchFeedIcon(); err != nil {
 			slog.Debug("Unable to download icon from feed",
 				slog.String("website_url", f.websiteURL),
 				slog.String("feed_icon_url", f.feedIconURL),
@@ -61,7 +61,7 @@ func (f *IconFinder) FindIcon() (*model.Icon, error) {
 		}
 	}
 
-	if icon, err := f.FetchIconsFromHTMLDocument(); err != nil {
+	if icon, err := f.fetchIconsFromHTMLDocument(); err != nil {
 		slog.Debug("Unable to fetch icons from HTML document",
 			slog.String("website_url", f.websiteURL),
 			slog.Any("error", err),
@@ -70,10 +70,10 @@ func (f *IconFinder) FindIcon() (*model.Icon, error) {
 		return icon, nil
 	}
 
-	return f.FetchDefaultIcon()
+	return f.fetchDefaultIcon()
 }
 
-func (f *IconFinder) FetchDefaultIcon() (*model.Icon, error) {
+func (f *iconFinder) fetchDefaultIcon() (*model.Icon, error) {
 	slog.Debug("Fetching default icon",
 		slog.String("website_url", f.websiteURL),
 	)
@@ -83,7 +83,7 @@ func (f *IconFinder) FetchDefaultIcon() (*model.Icon, error) {
 		return nil, fmt.Errorf(`icon: unable to join root URL and path: %w`, err)
 	}
 
-	icon, err := f.DownloadIcon(iconURL)
+	icon, err := f.downloadIcon(iconURL)
 	if err != nil {
 		return nil, err
 	}
@@ -91,7 +91,7 @@ func (f *IconFinder) FetchDefaultIcon() (*model.Icon, error) {
 	return icon, nil
 }
 
-func (f *IconFinder) FetchFeedIcon() (*model.Icon, error) {
+func (f *iconFinder) fetchFeedIcon() (*model.Icon, error) {
 	slog.Debug("Fetching feed icon",
 		slog.String("website_url", f.websiteURL),
 		slog.String("feed_icon_url", f.feedIconURL),
@@ -102,10 +102,10 @@ func (f *IconFinder) FetchFeedIcon() (*model.Icon, error) {
 		return nil, fmt.Errorf(`icon: unable to convert icon URL to absolute URL: %w`, err)
 	}
 
-	return f.DownloadIcon(iconURL)
+	return f.downloadIcon(iconURL)
 }
 
-func (f *IconFinder) FetchIconsFromHTMLDocument() (*model.Icon, error) {
+func (f *iconFinder) fetchIconsFromHTMLDocument() (*model.Icon, error) {
 	slog.Debug("Searching icons from HTML document",
 		slog.String("website_url", f.websiteURL),
 	)
@@ -145,7 +145,7 @@ func (f *IconFinder) FetchIconsFromHTMLDocument() (*model.Icon, error) {
 			return nil, fmt.Errorf(`icon: unable to convert icon URL to absolute URL: %w`, err)
 		}
 
-		if icon, err := f.DownloadIcon(iconURL); err != nil {
+		if icon, err := f.downloadIcon(iconURL); err != nil {
 			slog.Debug("Unable to download icon from HTML document",
 				slog.String("website_url", f.websiteURL),
 				slog.String("icon_url", iconURL),
@@ -163,7 +163,7 @@ func (f *IconFinder) FetchIconsFromHTMLDocument() (*model.Icon, error) {
 	return nil, nil
 }
 
-func (f *IconFinder) DownloadIcon(iconURL string) (*model.Icon, error) {
+func (f *iconFinder) downloadIcon(iconURL string) (*model.Icon, error) {
 	slog.Debug("Downloading icon",
 		slog.String("website_url", f.websiteURL),
 		slog.String("icon_url", iconURL),