Version 2.0 added

Satyam-Bhalla · Satyam-Bhalla · commit 9940d8506684 · 2018-09-09T22:49:37.000+05:30
diff --git a/News Fetcher/__init__.py b/News Fetcher/__init__.py
@@ -1,6 +1,7 @@
 from newsme.nm import NewsMe
 from flask import Flask, redirect, url_for, request, render_template
 import requests
+import re
 
 app = Flask(__name__)
 
@@ -11,17 +12,32 @@ def index():
 @app.route('/search', methods =['POST'])
 def search():
 	search = request.form['search']
+	msg=""
 	if search == "":
 		return render_template('index.html')
 	else:
-		N = NewsMe(search)
-		headline = []
-		links = []
-		for i in N.headlines():
-			headline.append(i[0])
-			links.append(i[1])
-		no = len(headline)
-		return render_template('search.html',headline=headline,links=links,search=search,no=no) 
+		match = re.search(r'(http[s]?://(?:[a-zA-Z]|[0-9]|[$-_@.&+]|[!*\(\),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+)',search)
+		if match:			
+			N = NewsMe(search)
+			headline = []
+			links = []
+			for i in N.headlines():
+				headline.append(i[0])
+				links.append(i[1])
+				
+			new_match = re.search(r'(http[s]?://(?:[a-zA-Z]|[0-9]|[$-_@.&+]|[!*\(\),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+)',links[1])
+			if new_match:
+				new=""
+			else:
+				if search[-1]== "/":
+    					new=search[0:-1]
+				else:
+					new=search
+
+			return render_template('search.html',headline=headline,links=links,search=search,new=new)
+		else:
+			msg = "Enter valid Url"
+			return render_template("index.html",msg=msg) 
 
 if __name__ == '__main__':
    app.run(debug = True)
diff --git a/News Fetcher/templates/index.html b/News Fetcher/templates/index.html
@@ -2,7 +2,7 @@
 <html>
 	<head>
 		<meta charset="utf-8">
-		<title>NewsME</title>
+		<title>News Fetcher</title>
 		<!--JS links -->
 		<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/js/bootstrap.min.js"></script>
 		<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.0/jquery-ui.min.js"></script>
@@ -21,16 +21,17 @@
 		<div class="container">
 			 <div class="jumbotron">
 			 	<div class="content-wrap text-center">
-				    <h1>NewsME<br><p>Find any current news easily!!</p></h1>
+				    <h1>News Fetcher<br><p>Find any current news easily!!</p></h1>
 				 	<form method="POST" action="/search">
-				    <input id="tags" type="url" name="search" placeholder="https://example.com"autofocus="on" list="defaultURLs">
+				    <input id="tags" type="text" name="search" placeholder="https://example.com"autofocus="on" list="defaultURLs">
 				    <datalist id="defaultURLs">
 				    	<option value="https://timesofindia.indiatimes.com/" label="TimesOfIndia">
 				    	<option value="https://www.tribuneindia.com/" label="TribuneIndia">
 				    </datalist>
 				    <br>
 				    <button id="getResult" class="btn btn-default"><i class="fa fa-search"></i>Search</button>				    
 				    </form>
+				    <h3 style="color: white;">{{msg}}</h3>
 				</div>
 			    <div class="wrap text-center">
 				    <ul>
diff --git a/News Fetcher/templates/search.html b/News Fetcher/templates/search.html
@@ -5,7 +5,7 @@
 	<div class ="wrap text-center">
 		<ul>
 			{% for i in range(20) %}
-			<a style="font-size: 21px;" target="_blank" href="{{search[0:-1]+links[i]}}"><strong>
+			<a style="font-size: 21px;" target="_blank" href="{{new+links[i]}}"><strong>
 			{{headline[i]}}</strong><br></a>
 			{% endfor %}
 		</ul>
