Merge branch 'master' into pr/9

Author: dale-wahl

itunes_app_scraper/scraper.py

@@ -25,13 +25,13 @@ class AppStoreScraper:
 	can be found at https://github.com/facundoolano/app-store-scraper.
 	"""
 
-	def get_app_ids_for_query(self, term, num=50, page=1, country="nl", lang="nl", timeout=None):
+	def get_app_ids_for_query(self, term, num=50, page=1, country="nl", lang="nl", timeout=None, timeout=None):
 		"""
 		Retrieve suggested app IDs for search query
 
 		:param str term:  Search query
-		:param int num:  Amount of items to return per page, default 50
-		:param int page:  Amount of pages to return
+		:param int|None num:  Amount of items to return per page, default 50
+		:param int|None page:  Amount of pages to return
 		:param str country:  Two-letter country code of store to search in,
 		                     default 'nl'
 		:param str lang:  Language code to search with, default 'nl'
@@ -45,7 +45,10 @@ def get_app_ids_for_query(self, term, num=50, page=1, country="nl", lang="nl", t
 		url = "https://search.itunes.apple.com/WebObjects/MZStore.woa/wa/search?clientApplication=Software&media=software&term="
 		url += quote_plus(term)
 
-		amount = int(num) * int(page)
+		if num is None or page is None:
+			amount = None
+		else:
+			amount = int(num) * int(page)
 
 		country = self.get_store_id_for_country(country)
 		headers = {
@@ -99,6 +102,7 @@ def get_app_ids_for_collection(self, collection="", category="", num=50, country
 		return result["resultIds"]
 
 	def get_apps_for_developer(self, developer_id, country="nl", lang="", timeout=None):
+	def get_app_ids_for_developer(self, developer_id, country="nl", lang="", timeout=None):
 		"""
 		Retrieve Apps linked to given developer
 

scraper_test.py

@@ -48,3 +48,14 @@ def test_country_code_does_not_exist():
     scraper = AppStoreScraper()
     with pytest.raises(AppStoreException, match="Country code not found for XZ"):
         scraper.get_store_id_for_country('xz')
+
+def test_query_multiple_pages():
+    query = "game"
+    scraper = AppStoreScraper()
+    results = set()
+    for page in range(1,4):
+        page_results = scraper.get_app_ids_for_query(query, country="us", lang="en", page=page)
+        if page_results:
+            [results.add(x) for x in page_results]
+            assert len(results) > (page-1)*50
+    print(f"Total results for query {query}: {len(results)}")