[components] For mozilla-mobile/android-components#191 - Adds JSON pa…

…rsers UltraBlame original commit: 874d8a6147ff8a2bb785249a51af2b7d7b009598
marco-c · May 31, 2024 · 1096653 · 1096653
1 parent 808e238
commit 1096653
Show file tree

Hide file tree

Showing 4 changed files with 3,924 additions and 72 deletions.
diff --git a/.../browser/search/src/main/java/mozilla/components/browser/search/SearchSuggestionClient.kt b/.../browser/search/src/main/java/mozilla/components/browser/search/SearchSuggestionClient.kt
@@ -7,22 +7,6 @@ browser
 .
 search
 import
-kotlinx
-.
-coroutines
-.
-experimental
-.
-async
-import
-kotlinx
-.
-coroutines
-.
-experimental
-.
-Deferred
-import
 mozilla
 .
 components
@@ -33,7 +17,7 @@ search
 .
 parser
 .
-googleParser
+defaultParser
 typealias
 SearchSuggestionFetcher
 =
@@ -99,7 +83,7 @@ suggestionsURL
 .
 let
 {
-googleParser
+defaultParser
 (
 it
 )

diff --git a/...browser/search/src/main/java/mozilla/components/browser/search/parser/SuggestionParser.kt b/...browser/search/src/main/java/mozilla/components/browser/search/parser/SuggestionParser.kt
@@ -9,11 +9,28 @@ search
 .
 parser
 import
+mozilla
+.
+components
+.
+browser
+.
+search
+.
+SearchEngine
+import
 org
 .
 json
 .
 JSONArray
+import
+org
+.
+json
+.
+JSONObject
+private
 fun
 JSONArray
 .
@@ -115,11 +132,18 @@ List
 <
 String
 >
-val
-googleParser
+private
+fun
+fromArrayResult
+(
+resultsIndex
+:
+Int
+)
 :
 Parser
-=
+{
+return
 {
 input
 -
@@ -131,7 +155,7 @@ input
 .
 getJSONArray
 (
-1
+resultsIndex
 )
 .
 asSequence
@@ -154,3 +178,187 @@ toList
 (
 )
 }
+}
+private
+fun
+fromObjectResult
+(
+resultsKey
+:
+String
+)
+:
+Parser
+{
+return
+{
+input
+-
+>
+JSONObject
+(
+input
+)
+.
+getJSONArray
+(
+resultsKey
+)
+.
+asSequence
+(
+)
+.
+map
+{
+it
+as
+?
+String
+}
+.
+filterNotNull
+(
+)
+.
+toList
+(
+)
+}
+}
+private
+fun
+qwantParserBuilder
+(
+)
+:
+Parser
+{
+return
+{
+input
+-
+>
+JSONObject
+(
+input
+)
+.
+getJSONObject
+(
+"
+data
+"
+)
+.
+getJSONArray
+(
+"
+items
+"
+)
+.
+asSequence
+(
+)
+.
+map
+{
+it
+as
+?
+JSONObject
+}
+.
+map
+{
+it
+?
+.
+getString
+(
+"
+value
+"
+)
+}
+.
+filterNotNull
+(
+)
+.
+toList
+(
+)
+}
+}
+val
+defaultParser
+=
+fromArrayResult
+(
+1
+)
+val
+azerdictParser
+=
+fromObjectResult
+(
+"
+suggestions
+"
+)
+val
+daumParser
+=
+fromObjectResult
+(
+"
+items
+"
+)
+val
+qwantParser
+=
+qwantParserBuilder
+(
+)
+fun
+selectParser
+(
+searchEngine
+:
+SearchEngine
+)
+:
+Parser
+=
+when
+(
+searchEngine
+.
+name
+)
+{
+"
+Azerdict
+"
+-
+>
+azerdictParser
+"
+"
+-
+>
+daumParser
+"
+Qwant
+"
+-
+>
+qwantParser
+else
+-
+>
+defaultParser
+}