Merge pull request #21 from JexPY/hotfix/dataFromUrl

Hotfix/data from url

Author: JexPY

.gitignore

@@ -8,7 +8,6 @@ certbot/letsecrypt/
 key.json
 docker-compose.yml
 nginx/sites/app.conf
-static/
 __pycache__/
  *.pyc
  .pytest_cache

api/app/.env-example

@@ -1,5 +1,6 @@
 # SERVER
 API_URL=http://localhost/
+# several separate with ,
 FILE_MANAGER_BEARER_TOKEN=very_secret,any_more_secret_tokens
 # several separate with ,
 CORS_ORIGINS=http://localhost,http://ff.etomer.io
@@ -55,12 +56,13 @@ QR_IMAGE_LOCAL_PATH=static/qr/
 
 # IMAGES
 IMAGE_CONVERTING_PREFERED_FORMAT=webp
-THUMBNAIL_MAX_WIDHT=320
+IMAGE_AllOWED_FILE_FORMAT=png,jpeg,jpg,webp
 # make thumbnails or nah True/False
 IMAGE_THUMBNAIL=True
+THUMBNAIL_MAX_WIDHT=320
 # suported:pillow-simd,ffmpeg
 # default:pillow-simd
-IMAGE_OPTIMIZATION_USING=ffmpeg
+IMAGE_OPTIMIZATION_USING=pillow-simd
 
 
 # VIDEOS

api/app/main.py

@@ -51,6 +51,7 @@ def root(
         result['cpu_average_load'] = os.getloadavg()
     return result
 
+
 # File size validates NGINX
 @app.post("/image", tags=["image"])
 async def upload_image_file(
@@ -63,6 +64,7 @@ async def upload_image_file(
     OAuth2AuthorizationCodeBearer = Depends(validate_token)):
     return handle_upload_image_file(True if thumbnail == 'True' else False, file)
 
+
 @app.post("/images", tags=["image"])
 async def upload_image_files(
         thumbnail: Optional[str] = Query(
@@ -81,6 +83,7 @@ async def upload_image_files(
     )
     return handle_multiple_image_file_uploads(files, fileAmount, True if thumbnail == 'True' else False)
 
+
 @app.get("/image", tags=["image"])
 async def get_image(
     image: str = Query(...,
@@ -96,6 +99,7 @@ async def get_image(
         ):
     return response_image_file(image, image_type)
 
+
 @app.post("/qrImage", tags=["image"])
 async def text_to_generate_qr_image(
     qr_text: str = Query(
@@ -138,20 +142,6 @@ async def image_from_url(
     OAuth2AuthorizationCodeBearer = Depends(validate_token)):
     return handle_download_data_from_url(image_url, True if thumbnail == 'True' else False, file_type='image')
 
-@app.get("/videoUrl", tags=["from url"])
-async def video_from_url(
-    video_url: str = Query(
-        None,
-        description = "Pass valid video url to upload",
-        min_length  = 5
-    ),
-    optimize: Optional[str] = Query(
-        os.environ.get('VIDEO_OPTIMIZE'),
-        description='True/False depending your needs default is {}'.format(os.environ.get('VIDEO_OPTIMIZE')),
-        regex='^(True|False)$'
-        ),
-    OAuth2AuthorizationCodeBearer = Depends(validate_token)):
-    return handle_download_data_from_url(video_url, True if optimize == 'True' else False, file_type='video')
 
 @app.get("/imageUrls", tags=["from url"])
 async def images_from_urls(
@@ -167,4 +157,20 @@ async def images_from_urls(
             status_code=status.HTTP_413_REQUEST_ENTITY_TOO_LARGE,
             detail='Amount of files must not be more than {}'.format(os.environ.get('MULTIPLE_FILE_UPLOAD_LIMIT'))
     )
-    return handle_multiple_image_file_downloads(image_urls, fileAmount)
+    return handle_multiple_image_file_downloads(image_urls, fileAmount)
+
+
+@app.get("/videoUrl", tags=["from url"])
+async def video_from_url(
+    video_url: str = Query(
+        None,
+        description = "Pass valid video url to upload",
+        min_length  = 5
+    ),
+    optimize: Optional[str] = Query(
+        os.environ.get('VIDEO_OPTIMIZE'),
+        description='True/False depending your needs default is {}'.format(os.environ.get('VIDEO_OPTIMIZE')),
+        regex='^(True|False)$'
+        ),
+    OAuth2AuthorizationCodeBearer = Depends(validate_token)):
+    return handle_download_data_from_url(video_url, False, True if optimize == 'True' else False, file_type='video')

api/app/services/serveUploadedFiles.py

@@ -61,6 +61,7 @@ def handle_upload_image_file(thumbnail, upload_file: None, raw_data_file = None)
                 imagePaths['thumbnail'] = os.environ.get('API_URL') + os.environ.get('IMAGE_THUMBNAIL_LOCAL_PATH') + imagePaths['thumbnail'] if imagePaths.get('thumbnail') else None
 
             imagePaths['storage'] = os.environ.get('PREFERED_STORAGE')
+            imagePaths['file_name'] = imagePaths['original'].split('/')[-1]
             return imagePaths
         else:
             raise HTTPException(status_code=status.HTTP_503_SERVICE_UNAVAILABLE, detail='The file format not supported')
@@ -106,6 +107,7 @@ def handle_upload_video_file(optimize, upload_file: None, raw_data_file = None):
                     videoPaths['optimized'] = os.environ.get('API_URL') + os.environ.get('VIDEO_OPTIMIZED_LOCAL_PATH') + videoPaths['optimized'] if videoPaths.get('optimized') else None
 
                 videoPaths['storage'] = os.environ.get('PREFERED_STORAGE')
+                videoPaths['file_name'] = videoPaths['original'].split('/')[-1]
 
                 return videoPaths
         else:

api/app/static/pictures/original/afba38beae434b9fb4691bf8559947aa.png

@@ -25,9 +25,11 @@ Long story short, I needed microservice that would manage the files, so I ended
 
 Here's what features FF has at this time:
 * Uploading image file/files
+* Downloading image file/files, from any image url
 * Image file/files optimization/converting using Pillow-SIMD or FFMPEG
   - You can have both installed or you can choose any of engines depending your needs 
 * Uploading video file
+* Downloading video file, from any video url
 * Video file optimization/converting using FFMPEG
   - change in .env INSTALL_FFMPEG=false to INSTALL_FFMPEG=true
   - Then run 
@@ -87,7 +89,7 @@ docker-compose up
         ```
       - p.s You can create as much tokens as you want just separate them with ,
 
-![](api/app/static/pictures/original/ef79f4dd65974d268e5ca2013a54edf.png?raw=true)
+![](api/app/static/pictures/original/afba38beae434b9fb4691bf8559947aa.png?raw=true)
 
 ### Installation for docker swarm
 - If you’re trying things out on a local development environment, you can put your engine into swarm mode with docker swarm init.