Merge pull request #20 from ranahaani/main

version 0.2.3

gnews/gnews.py

@@ -1,6 +1,7 @@
 import os
 
 import feedparser
+import requests
 from bs4 import BeautifulSoup as Soup
 from dotenv import load_dotenv
 
@@ -89,17 +90,19 @@ def _clean(self, html):
         return text
 
     def _process(self, item):
+        url = item.get("link", "")
+        url = requests.head(url).headers.get('location', url)
         item = {
             'title': item.get("title", ""),
             'description': self._clean(item.get("description", "")),
             'published date': item.get("published", ""),
-            'url': item.get("link", ""),
+            'url': url,
             'publisher': item.get("source", " ")
         }
         return item
 
     def get_news(self, key):
-        if key != '':
+        if key:
             key = "%20".join(key.split(" "))
             url = self.BASE_URL + '/search?q={}'.format(key) + self._ceid()
             return list(map(self._process, feedparser.parse(url).entries[:self._max_results]))
@@ -118,13 +121,13 @@ def get_news_by_topic(self, topic: str):
         return list(map(self._process, feedparser.parse(url).entries[:self._max_results]))
 
     def get_news_by_location(self, location: str):
-        if not location:
+        if location:
+            url = self.BASE_URL + '/headlines/section/geo/' + location + '?' + self._ceid()
+            return list(map(self._process, feedparser.parse(url).entries[:self._max_results]))
+        else:
             print("Enter a valid location.")
             return []
 
-        url = self.BASE_URL + '/headlines/section/geo/' + location + '?' + self._ceid()
-        return list(map(self._process, feedparser.parse(url).entries[:self._max_results]))
-
     def store_in_mongodb(self, news):
         """MongoDB cluster needs to be created first - https://www.mongodb.com/cloud/atlas/register"""
         load_dotenv()

requirements.txt

@@ -3,4 +3,5 @@ bs4~=0.0.1
 beautifulsoup4~=4.9.3
 pymongo~=3.12.0
 dnspython~=1.16.0
-python-dotenv~=0.19.0
+python-dotenv~=0.19.0
+requests==2.26.0

setup.py

@@ -8,7 +8,7 @@
 
 setup(
     name='gnews',
-    version='0.2.2',
+    version='0.2.3',
     author="Muhammad Abdullah",
     author_email="ranahaani@gmail.com",
     description=' Provide an API to search for articles on Google News and returns a usable JSON response.',