Added route for external content. TODO: Add cache and clean code

rtrevinnoc · Feb 7, 2021 · 382459e · 382459e
1 parent c90c24c
commit 382459e
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 9 deletions.
diff --git a/future.py b/future.py
@@ -22,12 +22,12 @@
 #########################################################################
 
 from Monad import *
-import os.path, os, shutil, json, random, sys, socket, re, mimetypes, datetime, lmdb, hnswlib, time, bson, requests, socket, ast, functools, asyncio, concurrent.futures, itertools
+import os.path, os, shutil, json, random, sys, socket, re, mimetypes, datetime, lmdb, hnswlib, time, bson, requests, socket, ast, functools, asyncio, concurrent.futures, itertools, mimetypes
 import numpy as np
 import numexpr as ne
 from flask import (Flask, render_template, request, redirect,
                    send_from_directory, flash, abort, jsonify, escape,
-                   Response)
+                   Response, make_response)
 from forms import *
 # from werkzeug.middleware.proxy_fix import ProxyFix
 from werkzeug.contrib.fixers import ProxyFix
@@ -445,7 +445,7 @@ def answerImages(query: str) -> jsonify:
                     str(int(analyticsPreviousValue.decode("utf-8")) +
                         1).encode("utf-8"))
 
-    images = loadMoreImages(q_vec, 50, 1)
+    images = loadMoreImages(q_vec, 15, 1)
 
     listOfDataFromPeers = asyncio.run(
         getImagesFromPeers(query, q_vec, queryLanguage, numberOfURLs, 1))
@@ -542,7 +542,7 @@ def answerPeerImages(query: str, q_vec: list, queryLanguage: str,
                     str(int(analyticsPreviousValue.decode("utf-8")) +
                         1).encode("utf-8"))
 
-    images = loadMoreImages(q_vec, 50, numberOfPage)
+    images = loadMoreImages(q_vec, 15, numberOfPage)
 
     return {
         "images": images["images"],
@@ -634,7 +634,7 @@ def fetchSearxImages():
         except:
             pass
 
-    return jsonify(result={"images": resultImagesFromSearx})
+    return jsonify(result={"images": resultImagesFromSearx[:15]})
 
 
 @app.route('/_fetchSearxVideos', methods=['GET'])
@@ -687,6 +687,19 @@ def fetchSearxVideos():
     return jsonify(result={"videos": resultVideosFromSearx})
 
 
+@app.route('/_retrieveImage')
+def _retrieveImage():
+    url = request.args.get("url", "", type=str)
+    if url.startswith("//"):
+        url = "http:" + url
+    image = requests.get(url, allow_redirects=True)
+
+    response = make_response(image.content)
+    response.headers.set('Content-Type',
+                         mimetypes.MimeTypes().guess_type(url)[0])
+    return response
+
+
 @app.route('/sw.js', methods=['GET'])
 def sw():
     return send_from_directory(".", "sw.js")

diff --git a/static/js/index_animations.js b/static/js/index_animations.js
@@ -392,7 +392,7 @@ $(function() {
 			searx_response = data.result
 
 			searx_response["images"].reverse().forEach(function(image) {
-				images.prepend('<div class="grid-item"><a href=' + image["parentUrl"] + '><img class="image-item" src="' + image["url"] + '" alt="Not available"></a></div>')
+				images.prepend('<div class="grid-item"><a href=' + image["parentUrl"] + '><img class="image-item" src="/_retrieveImage?url=' + image["url"] + '" alt="Not available"></a></div>')
 			});
 
 			counter += 1
@@ -407,7 +407,7 @@ $(function() {
 			response = data.result
 
 			response["images"].forEach(function(image) {
-				images.append('<div class="grid-item"><a href=' + image["parentUrl"] + '><img class="image-item" src="' + image["url"] + '" alt="Not available"></a></div>')
+				images.append('<div class="grid-item"><a href=' + image["parentUrl"] + '><img class="image-item" src="/_retrieveImage?url=' + image["url"] + '" alt="Not available"></a></div>')
 			});
 
 			counter += 1
@@ -430,7 +430,7 @@ $(function() {
 			searx_response = data.result
 
 			searx_response["videos"].forEach(function(video) {
-				videos.append('<div class="video_item"><div class="video_thumbnail"><a href="' + video["url"] + '"><img src="' + video["thumbnail"] + '" alt=""></a></div><div class="video_description"><p class="link_paragraph"><span class="domain"><a href="' + video["url"] + '">' + video["title"] + '</a></span></p><p class="link_paragraph2"><span class="link"><a href="' + video["url"] + '">' + video["url"] + '</a></span></p><p class="body searchable">' + video['length'] + ' | Uploaded by ' + video["author"] + ' on ' + video['date'] + '.<p></div></div>')
+				videos.append('<div class="video_item"><div class="video_thumbnail"><a href="' + video["url"] + '"><img src="/_retrieveImage?url=' + video["thumbnail"] + '" alt=""></a></div><div class="video_description"><p class="link_paragraph"><span class="domain"><a href="' + video["url"] + '">' + video["title"] + '</a></span></p><p class="link_paragraph2"><span class="link"><a href="' + video["url"] + '">' + video["url"] + '</a></span></p><p class="body searchable">' + video['length'] + ' | Uploaded by ' + video["author"] + ' on ' + video['date'] + '.<p></div></div>')
 			});
 
 			$(".hex").removeClass("rotate")
@@ -543,7 +543,7 @@ $(function() {
 				$('<div class="url_item"><p class="link_paragraph"><span class="domain"><a href="' + url["url"] + '">' + url["header"] + '</a></span></p><p class="link_paragraph2"><span class="link"><a href="' + url["url"] + '">' + url["url"] + '</a></span></p><p class="body searchable">' + url["body"] + '<p></div>').insertBefore("#load_more_items");
 			});
 			//response["images"].forEach(function(image) {
-				//images.append('<div class="grid-item"><a href=' + image["parentUrl"] + '><img class="image-item" src="' + image["url"] + '" alt="Not available"></a></div>')
+				//images.append('<div class="grid-item"><a href=' + image["parentUrl"] + '><img class="image-item" src="/_retrieveImage?url=' + image["url"] + '" alt="Not available"></a></div>')
 			//});
 			current_page = current_page + 1;
 		});