diff --git a/bbcli/services/contents_services.py b/bbcli/services/contents_services.py index f8a9a62dc1dae1ce3e6fee494635491eda1b4fda..68cd7b072e6c58af5c39a25f44b8a8cc3834e4ef 100644 --- a/bbcli/services/contents_services.py +++ b/bbcli/services/contents_services.py @@ -2,7 +2,7 @@ import json import os from typing import Dict, List import requests -import magic +import mimetypes from bbcli.utils.URL_builder import Builder, URL_builder from bbcli.services.utils.content_builder import ContentBuilder from bbcli.entities.content_builder_entitites import FileContent, GradingOptions, StandardOptions, FileOptions, WeblinkOptions @@ -124,13 +124,15 @@ def create_file(session: requests.Session, course_id: str, parent_id: str, title file_dst: str, file_options: FileOptions, standard_options: StandardOptions) -> Dict: uploaded_file = upload_file(session, file_dst) - mime = magic.Magic(mime=True) - mime_type = mime.from_file(file_dst) with open(file_dst, 'rb') as f: file_name = os.path.basename(f.name) + mime_type = mimetypes.guess_type(f.name) - file_content = FileContent(uploaded_file['id'], file_name, mime_type) + if mime_type: + file_content = FileContent(uploaded_file['id'], file_name, mime_type[0]) + else: + click.Abort() data = content_builder\ .add_parent_id(parent_id)\ diff --git a/requirements.txt b/requirements.txt index a49ebfa402d0ee8621634c35572f2f3bf239b94d..a12ea15db2741f2a3f7fc760e455c8d7c82ce1c1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,7 +8,6 @@ beautifulsoup4==4.10.0 lxml==4.8.0 anytree==2.8.0 html2text==2020.1.16 -python-magic==0.4.25 python-dateutil==2.8.2 tabulate==0.8.9 pwinput==1.0.2 diff --git a/setup.py b/setup.py index 907832fc263100ab086855eb13665657ac1e0dfe..044ebb068fceddb95effe5b50bb384ed6389aacc 100644 --- a/setup.py +++ b/setup.py @@ -19,7 +19,6 @@ requires = [ 'shellingham', 'anytree', 'html2text', - 'python-magic', 'python-dateutil', 'tabulate==0.8.9', 'pwinput',