From dd4b89f80e539817597df41c2dfcfd437b2e5621 Mon Sep 17 00:00:00 2001
From: Chimbori <hello@chimbori.com>
Date: Sat, 15 Jul 2023 17:35:56 -0700
Subject: [PATCH] Move article-extraction related helpers to the `articles`
 package.

---
 .../kotlin/com/chimbori/crux/articles/ArticleExtractor.kt | 5 -----
 .../ImageHelpers.kt => articles/ExtractImages.kt}         | 4 ++--
 .../crux/{extractors => articles}/ExtractionHelpers.kt    | 2 +-
 .../crux/{extractors => articles}/PostprocessHelpers.kt   | 2 +-
 .../crux/{extractors => articles}/PreprocessHelpers.kt    | 2 +-
 .../kotlin/com/chimbori/crux/plugins/ArticleExtractor.kt  | 8 ++++----
 6 files changed, 9 insertions(+), 14 deletions(-)
 rename src/main/kotlin/com/chimbori/crux/{extractors/ImageHelpers.kt => articles/ExtractImages.kt} (95%)
 rename src/main/kotlin/com/chimbori/crux/{extractors => articles}/ExtractionHelpers.kt (99%)
 rename src/main/kotlin/com/chimbori/crux/{extractors => articles}/PostprocessHelpers.kt (99%)
 rename src/main/kotlin/com/chimbori/crux/{extractors => articles}/PreprocessHelpers.kt (98%)

diff --git a/src/main/kotlin/com/chimbori/crux/articles/ArticleExtractor.kt b/src/main/kotlin/com/chimbori/crux/articles/ArticleExtractor.kt
index 86501280..56129e3d 100644
--- 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/src/main/kotlin/com/chimbori/crux/extractors/ImageHelpers.kt b/src/main/kotlin/com/chimbori/crux/articles/ExtractImages.kt
similarity index 95%
rename from src/main/kotlin/com/chimbori/crux/extractors/ImageHelpers.kt
rename to src/main/kotlin/com/chimbori/crux/articles/ExtractImages.kt
index a28d3ecd..8467f3a2 100644
--- a/src/main/kotlin/com/chimbori/crux/extractors/ImageHelpers.kt
+++ b/src/main/kotlin/com/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/src/main/kotlin/com/chimbori/crux/extractors/ExtractionHelpers.kt b/src/main/kotlin/com/chimbori/crux/articles/ExtractionHelpers.kt
similarity index 99%
rename from src/main/kotlin/com/chimbori/crux/extractors/ExtractionHelpers.kt
rename to src/main/kotlin/com/chimbori/crux/articles/ExtractionHelpers.kt
index b2753cc7..3da900e4 100644
--- a/src/main/kotlin/com/chimbori/crux/extractors/ExtractionHelpers.kt
+++ b/src/main/kotlin/com/chimbori/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/src/main/kotlin/com/chimbori/crux/extractors/PostprocessHelpers.kt b/src/main/kotlin/com/chimbori/crux/articles/PostprocessHelpers.kt
similarity index 99%
rename from src/main/kotlin/com/chimbori/crux/extractors/PostprocessHelpers.kt
rename to src/main/kotlin/com/chimbori/crux/articles/PostprocessHelpers.kt
index 25ae2344..0085cb07 100644
--- a/src/main/kotlin/com/chimbori/crux/extractors/PostprocessHelpers.kt
+++ b/src/main/kotlin/com/chimbori/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/src/main/kotlin/com/chimbori/crux/extractors/PreprocessHelpers.kt b/src/main/kotlin/com/chimbori/crux/articles/PreprocessHelpers.kt
similarity index 98%
rename from src/main/kotlin/com/chimbori/crux/extractors/PreprocessHelpers.kt
rename to src/main/kotlin/com/chimbori/crux/articles/PreprocessHelpers.kt
index c854d62e..fedf1f79 100644
--- a/src/main/kotlin/com/chimbori/crux/extractors/PreprocessHelpers.kt
+++ b/src/main/kotlin/com/chimbori/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
index e09f9c4e..eabe98c7 100644
--- 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