remove cloud dependencies

Author: aminyazdanpanah

.appveyor.yml

@@ -34,13 +34,7 @@ install:
   - "python -c \"import struct; print(struct.calcsize('P') * 8)\""
   - python -m pip install -U pip
   - python -m easy_install -U setuptools
-#  - pip install -e .[test]
-#  - pip install --upgrade virtualenv
   - pip install -r requirements.txt
-#  - pip install requests
-#  - pip install boto3
-#  - pip install azure-storage-blob
-#  - pip install google-cloud-storage
   - ps: Start-FileDownload $env:ffmpeg_download
 
   - 7z x ffmpeg-20190225-f948082-win64-static.zip

.github/workflows/pythonpackage.yml

@@ -21,10 +21,6 @@ jobs:
       run: |
         python -m pip install --upgrade pip
         pip install -r requirements.txt
-#        pip install requests
-#        pip install boto3
-#        pip install google-cloud-storage
-#        pip install azure-storage-blob
     - name: Install ffmpeg
       run: |
         sudo apt-get update

.travis.yml

@@ -3,10 +3,6 @@ language: python
 before_install:
   - python -m pip install --upgrade pip
   - pip install -r requirements.txt
-#  - pip install requests
-#  - pip install boto3
-#  - pip install google-cloud-storage
-#  - pip install azure-storage-blob
   - >
     [ -f ffmpeg-release/ffmpeg ] || (
         curl -O https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-amd64-static.tar.xz &&

Pipfile

@@ -4,10 +4,6 @@ url = "https://pypi.org/project/python-ffmpeg-video-streaming/"
 verify_ssl = true
 
 [packages]
-requests = "2.22.0"
-boto3 = "1.9.243"
-google-cloud-storage = "1.20.0"
-azure-storage-blob = "2.1.0"
 
 [requires]
-python_version = "3.7"
+python_version = "3.6"

README.md

@@ -9,7 +9,7 @@
 This package uses the **[FFmpeg](https://ffmpeg.org)** to package media content for online streaming such as DASH and HLS. You can also use **[DRM](https://en.wikipedia.org/wiki/Digital_rights_management)** for HLS packaging. There are several options to open a file from clouds and save files to them as well.
 
 - The best way to learn how to use this library is to review ****[the examples](https://github.com/aminyazdanpanah/python-ffmpeg-video-streaming/tree/master/examples)**** and browse the source code.
-- Cloud dependencies are deprecated now and will be removed in a future release. For using clouds such as **[Amazon S3](https://aws.amazon.com/s3)**, **[Google Cloud Storage](https://console.cloud.google.com/storage)**, **[Microsoft Azure Storage](https://azure.microsoft.com/en-us/features/storage-explorer/)**, and a custom cloud, please visit **[this page](https://video.aminyazdanpanah.com/python/start/clouds)**
+- For using clouds such as **[Amazon S3](https://aws.amazon.com/s3)**, **[Google Cloud Storage](https://console.cloud.google.com/storage)**, **[Microsoft Azure Storage](https://azure.microsoft.com/en-us/features/storage-explorer/)**, and a custom cloud, please visit **[this page](https://video.aminyazdanpanah.com/python/start/clouds)**.
 
 **Contents**
 - [Requirements](#requirements)

examples/clouds/google_cloud.py

@@ -60,7 +60,7 @@ def google_cloud(bucket_name, object_name):
         'object_name': object_name,
     }
     upload_options = {
-        'encryption': 'SOME_BASE64_ENCRYPTION',
+        'encryption': 'BASE64_ENCRYPTION',
     }
 
     from_google_cloud = (cloud, download_options, None)

ffmpeg_streaming/clouds.py

@@ -12,19 +12,6 @@
 """
 
 import abc
-import sys
-import tempfile
-
-from os import listdir
-from os.path import isfile, join
-
-import boto3
-import botocore
-import requests
-from azure.storage.blob import BlockBlobService
-from google.cloud import storage
-
-from ffmpeg_streaming.utiles import deprecated
 
 
 class Clouds(abc.ABC):
@@ -37,156 +24,6 @@ def download(self, filename=None, **options):
         pass
 
 
-class Cloud(Clouds):
-    @deprecated
-    def upload_directory(self, directory, **options):
-        field_name = options.pop('field_name', None)
-
-        if field_name is None:
-            raise ValueError('You should specify a field_name')
-
-        method = options.pop('method', 'post')
-        url = options.pop('url', None)
-        upload_files = []
-
-        files = [f for f in listdir(directory) if isfile(join(directory, f))]
-
-        for file in files:
-            full_path_file = directory + file
-            upload_files.append((field_name, open(full_path_file, 'rb')))
-
-        r = requests.request(method, url, files=upload_files, **options)
-
-        if not r.ok:
-            raise RuntimeError('Error uploading file!')
-
-    @deprecated
-    def download(self, filename=None, **options):
-        progress = options.pop('progress', None)
-        method = options.pop('method', 'get')
-        url = options.pop('url', None)
-
-        if url is None:
-            raise ValueError('You should specify an url')
-
-        if filename is None:
-            file = tempfile.NamedTemporaryFile(suffix='_py_ff_vi_st.tmp', delete=False)
-        else:
-            file = open(filename, 'wb')
-
-        with file as f:
-            response = requests.request(method, url, stream=True, **options)
-            total_byte = response.headers.get('content-length')
-
-            if total_byte is None or not callable(progress):
-                f.write(response.content)
-            else:
-                downloaded = 0
-                total_byte = int(total_byte)
-                for data in response.iter_content(chunk_size=4096):
-                    downloaded += len(data)
-                    f.write(data)
-                    percentage = round(100 * downloaded / total_byte)
-                    progress(percentage, downloaded, total_byte)
-                sys.stdout.write('\n')
-
-            return f.name
-
-
-class AWS(Clouds):
-    def __init__(self, **options):
-        self.s3 = boto3.client('s3', options)
-
-    @deprecated
-    def upload_directory(self, directory, **options):
-        bucket_name = options.pop('bucket_name', None)
-        if bucket_name is None:
-            raise ValueError('You should pass a bucket name')
-
-        files = [f for f in listdir(directory) if isfile(join(directory, f))]
-        for file in files:
-            full_path_file = directory + file
-            self.s3.upload_file(full_path_file, bucket_name, file)
-
-    @deprecated
-    def download(self, filename=None, **options):
-        if filename is None:
-            tmp = tempfile.NamedTemporaryFile(suffix='_py_ff_vi_st.tmp', delete=False)
-            filename = tmp.name
-
-        bucket_name = options.pop('bucket_name', None)
-        key = options.pop('key', None)
-        if bucket_name is None or key is None:
-            raise ValueError('You should pass a bucket name and a key')
-
-        try:
-            self.s3.Bucket(bucket_name).download_file(key, filename)
-        except botocore.exceptions.ClientError as e:
-            if e.response['Error']['Code'] == "404":
-                raise RuntimeError("The object does not exist.")
-            else:
-                raise RuntimeError("Could not connect to the server")
-
-        return filename
-
-
-class GoogleCloudStorage(Clouds):
-    def __init__(self, bucket_name, **kwargs):
-        storage_client = storage.Client(**kwargs)
-        self.bucket_name = bucket_name
-        self.bucket = storage_client.get_bucket(bucket_name)
-
-    @deprecated
-    def upload_directory(self, directory, **options):
-        files = [f for f in listdir(directory) if isfile(join(directory, f))]
-
-        for file in files:
-            full_path_file = directory + file
-            blob = self.bucket.blob(self.bucket_name + file, options)
-            blob.upload_from_filename(full_path_file)
-
-    @deprecated
-    def download(self, filename=None, **options):
-        if filename is None:
-            tmp = tempfile.NamedTemporaryFile(suffix='_py_ff_vi_st.tmp', delete=False)
-            filename = tmp.name
-
-        object_name = options.pop('object_name', None)
-        if object_name is None:
-            raise ValueError('You should pass an object name')
-
-        blob = self.bucket.get_blob(object_name, options)
-        blob.download_to_filename(filename)
-
-        return filename
-
-
-class MicrosoftAzure(Clouds):
-    def __init__(self, **options):
-        self.block_blob_service = BlockBlobService(**options)
-
-    @deprecated
-    def upload_directory(self, directory, **options):
-        files = [f for f in listdir(directory) if isfile(join(directory, f))]
-        container = options.pop('container', None)
-        for file in files:
-            full_path_file = directory + file
-            self.block_blob_service.create_blob_from_path(container, file, full_path_file)
-
-    @deprecated
-    def download(self, filename=None, **options):
-        if filename is None:
-            tmp = tempfile.NamedTemporaryFile(suffix='_py_ff_vi_st.tmp', delete=False)
-            filename = tmp.name
-
-        container = options.pop('container', None)
-        blob = options.pop('blob', None)
-
-        self.block_blob_service.get_blob_to_path(container, blob, filename)
-
-        return filename
-
-
 def open_from_cloud(cloud):
     cloud = dict(enumerate(cloud))
 
@@ -227,8 +64,4 @@ def save_to_clouds(clouds, dirname):
 
 __all__ = [
     'Clouds',
-    'Cloud',
-    'AWS',
-    'GoogleCloudStorage',
-    'MicrosoftAzure'
 ]

ffmpeg_streaming/from_clouds.py

@@ -19,8 +19,7 @@
 def progress(line, total_sec):
     time = re.search('(?<=time=)\w+:\w+:\w+', line)
     if time:
-        sec = convert_to_sec(time.group(0))
-        return round(100 * sec / total_sec)
+        return round(100 * convert_to_sec(time.group(0)) / total_sec)
 
 
 def get_duration_sec(line):

ffmpeg_streaming/progress.py

@@ -1,4 +0,0 @@
-requests==2.22.0
-boto3==1.9.243
-google-cloud-storage==1.20.0
-azure-storage-blob==2.1.0