Move article-extraction related helpers to the articles package.

chimbori · Jul 16, 2023 · dd4b89f · dd4b89f
1 parent ed45b89
commit dd4b89f
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 14 deletions.
diff --git a/src/main/kotlin/com/chimbori/crux/articles/ArticleExtractor.kt b/src/main/kotlin/com/chimbori/crux/articles/ArticleExtractor.kt
@@ -1,22 +1,17 @@
 package com.chimbori.crux.articles
 
 import com.chimbori.crux.common.estimatedReadingTimeMinutes
-import com.chimbori.crux.extractors.PostprocessHelpers
-import com.chimbori.crux.extractors.PreprocessHelpers
 import com.chimbori.crux.extractors.extractAmpUrl
 import com.chimbori.crux.extractors.extractCanonicalUrl
 import com.chimbori.crux.extractors.extractDescription
 import com.chimbori.crux.extractors.extractFaviconUrl
 import com.chimbori.crux.extractors.extractFeedUrl
 import com.chimbori.crux.extractors.extractImageUrl
-import com.chimbori.crux.extractors.extractImages
 import com.chimbori.crux.extractors.extractKeywords
 import com.chimbori.crux.extractors.extractSiteName
 import com.chimbori.crux.extractors.extractThemeColor
 import com.chimbori.crux.extractors.extractTitle
 import com.chimbori.crux.extractors.extractVideoUrl
-import com.chimbori.crux.extractors.getNodes
-import com.chimbori.crux.extractors.getWeight
 import okhttp3.HttpUrl
 import org.jsoup.Jsoup
 import org.jsoup.nodes.Document

diff --git a/.../chimbori/crux/extractors/ImageHelpers.kt → ...m/chimbori/crux/articles/ExtractImages.kt b/.../chimbori/crux/extractors/ImageHelpers.kt → ...m/chimbori/crux/articles/ExtractImages.kt
@@ -1,6 +1,6 @@
-package com.chimbori.crux.extractors
 
-import com.chimbori.crux.articles.Article
+package com.chimbori.crux.articles
+
 import com.chimbori.crux.common.Log
 import com.chimbori.crux.common.isAdImage
 import okhttp3.HttpUrl

diff --git a/...bori/crux/extractors/ExtractionHelpers.kt → ...imbori/crux/articles/ExtractionHelpers.kt b/...bori/crux/extractors/ExtractionHelpers.kt → ...imbori/crux/articles/ExtractionHelpers.kt
@@ -1,4 +1,4 @@
-package com.chimbori.crux.extractors
+package com.chimbori.crux.articles
 
 import com.chimbori.crux.common.countMatches
 import java.util.*

diff --git a/...ori/crux/extractors/PostprocessHelpers.kt → ...mbori/crux/articles/PostprocessHelpers.kt b/...ori/crux/extractors/PostprocessHelpers.kt → ...mbori/crux/articles/PostprocessHelpers.kt
@@ -1,4 +1,4 @@
-package com.chimbori.crux.extractors
+package com.chimbori.crux.articles
 
 import com.chimbori.crux.common.Log
 import com.chimbori.crux.common.Log.printAndRemove

diff --git a/...bori/crux/extractors/PreprocessHelpers.kt → ...imbori/crux/articles/PreprocessHelpers.kt b/...bori/crux/extractors/PreprocessHelpers.kt → ...imbori/crux/articles/PreprocessHelpers.kt
@@ -1,4 +1,4 @@
-package com.chimbori.crux.extractors
+package com.chimbori.crux.articles
 
 import com.chimbori.crux.common.Log
 import java.util.Locale

diff --git a/src/main/kotlin/com/chimbori/crux/plugins/ArticleExtractor.kt b/src/main/kotlin/com/chimbori/crux/plugins/ArticleExtractor.kt
@@ -6,10 +6,10 @@ import com.chimbori.crux.api.Resource
 import com.chimbori.crux.common.estimatedReadingTimeMs
 import com.chimbori.crux.common.fetchFromUrl
 import com.chimbori.crux.common.isLikelyArticle
-import com.chimbori.crux.extractors.PostprocessHelpers
-import com.chimbori.crux.extractors.PreprocessHelpers
-import com.chimbori.crux.extractors.getNodes
-import com.chimbori.crux.extractors.getWeight
+import com.chimbori.crux.articles.PostprocessHelpers
+import com.chimbori.crux.articles.PreprocessHelpers
+import com.chimbori.crux.articles.getNodes
+import com.chimbori.crux.articles.getWeight
 import okhttp3.HttpUrl
 import okhttp3.OkHttpClient
 import org.jsoup.nodes.Element