Fix comments relative to PR #34

Author: DerouineauNicolas

backend/StreamServerApp/database_utils.py

@@ -324,11 +324,6 @@ def prepare_video(video_full_path, video_path, video_dir, remote_url):
             'ov_subtitles_remote_path': ov_subtitles_remote_path}
 
 
-def populate_db_from_remote_server(remotePath, ListOfVideos):
-    """ # tobeDone
-       ListOfVideos could be provided through an API Call
-    """
-
 
 def get_video_type_and_info(video_path):
     """ # Uses subliminal to parse information from filename.

backend/StreamServerApp/media_processing.py

@@ -26,7 +26,7 @@ def convert_subtitles_to_webvtt(input_file, output_file):
 
     """
     cmd = ["ffmpeg", "-n", "-sub_charenc", "UTF-8", "-i", input_file, output_file]
-    if(os.path.isfile(output_file) is False):
+    if not os.path.isfile(output_file):
         run_ffmpeg_process(cmd)
 
 
@@ -43,7 +43,7 @@ def extract_subtitle(input_file, output_file):
 
     """
     cmd = ["ffmpeg", "-n", "-sub_charenc", "UTF-8", "-i", input_file, "-map", "0:s:0", output_file]
-    if(os.path.isfile(output_file) is False):
+    if not os.path.isfile(output_file):
         run_ffmpeg_process(cmd)
 
 
@@ -68,7 +68,7 @@ def transmux_to_mp4(input_file, output_file, with_audio_reencode=False):
         cmd = ["ffmpeg", "-i", input_file,
                 "-codec", "copy", "-movflags", "+faststart", output_file]
 
-    if(os.path.isfile(output_file) is False):
+    if not os.path.isfile(output_file):
         run_ffmpeg_process(cmd)
 
 
@@ -88,5 +88,5 @@ def generate_thumbnail(input_file, duration, output_file):
     """
     cmd = ["ffmpeg", "-ss", str(duration/2.0), "-i", input_file, "-an", "-vf", "scale=320:-1",
                             "-vframes", "1", output_file]
-    if(os.path.isfile(output_file) is False):
+    if not os.path.isfile(output_file):
         run_ffmpeg_process(cmd)

backend/StreamServerApp/subtitles.py

@@ -10,7 +10,7 @@
 def init_cache():
     """ # init cache for subtitles database query and stuff.
     """
-    if(os.path.isfile('cachefile.dbm.db') is False):
+    if not os.path.isfile('cachefile.dbm.db'):
         print("Create subtitles cache data")
         region.configure('dogpile.cache.dbm', arguments={
             'filename': 'cachefile.dbm'}, replace_existing_backend=True)

backend/StreamServerApp/urls.py

@@ -11,7 +11,6 @@
 router.register(r'videos', videos.VideoViewSet, basename='videos')
 router.register(r'series', videos.SeriesViewSet, basename='series')
 router.register(r'movies', videos.MoviesViewSet, basename='movies')
-# router.register(r'history', accounts.HistoryViewSet, basename='history')
 
 
 urlpatterns = [

backend/StreamingServer/settings.py

@@ -64,7 +64,7 @@
 VIDEO_ROOT = os.path.join(BASE_DIR, 'Videos/')
 
 
-if (VERBOSE_OUTPUT is True):
+if VERBOSE_OUTPUT:
     customstdout = subprocess.PIPE
     customstderr = subprocess.PIPE
 else:

frontend/src/components/login/login.js

@@ -3,35 +3,30 @@ import { Link, Redirect } from "react-router-dom";
 import axios from 'axios';
 import { Card, Form, Input, Button, Error } from "./AuthForm";
 import { useAuth } from "../context/auth";
+import { client } from '../../api/djangoAPI';
 import '../Modal.css'
 
 function Login({toggleModalBox, setDisplayModal}) {
   const [isLoggedIn, setLoggedIn] = useState(false);
   const [isError, setIsError] = useState(false);
   const [username, setUserName] = useState("");
   const [password, setPassword] = useState("");
-  const email=""
   const { setAuthTokens } = useAuth();
 
-  function postLogin() {
-    const http = axios.create({
-      baseURL: process.env.REACT_APP_DJANGO_API,
-      responseType: 'json',
-    });
-    http.post("/rest-auth/login/", {
-      username,
-      password,
-      email,
-    }).then(result => {
-      if (result.status === 200) {
-        setAuthTokens(result.data);
-        setLoggedIn(true);
-      } else {
-        setIsError(true);
-      }
-    }).catch(e => {
+  async function postLogin() {
+    const param = {
+      'username': username,
+      'password': password,
+      'email': "",
+
+    };
+    const response = await client.postRequest("/rest-auth/login", null, param);
+    if (response.status === 200) {
+      setAuthTokens(response.data);
+      setLoggedIn(true);
+    } else {
       setIsError(true);
-    });
+    }
   }
 
   function search(event) {

frontend/src/components/login/signup.js

@@ -3,6 +3,7 @@ import { Link, Redirect } from "react-router-dom";
 import axios from 'axios';
 import { Card, Form, Input, Button, Error } from "./AuthForm";
 import { useAuth } from "../context/auth";
+import { client } from '../../api/djangoAPI';
 
 function Signup({toggleModalBox, setDisplayModal}) {
   const [isLoggedIn, setLoggedIn] = useState(false);
@@ -13,25 +14,20 @@ function Signup({toggleModalBox, setDisplayModal}) {
   const email = ""
   const { setAuthTokens } = useAuth();
 
-  function postSignup() {
-    const http = axios.create({
-      baseURL: process.env.REACT_APP_DJANGO_API,
-      responseType: 'json',
-    });
-    http.post("/rest-auth/registration/", {
-      username,
-      password1,
-      password2,
-    }).then(result => {
-      if (result.status === 201) {
-        setAuthTokens(result.data);
-        setLoggedIn(true);
-      } else {
-        setIsError(true);
-      }
-    }).catch(e => {
+  async function postSignup() {
+    const param = {
+      'username': username,
+      'password1': password1,
+      'password2': password2,
+
+    };
+    const response = await client.postRequest("/rest-auth/registration", null, param);
+    if (response.status === 201) {
+      setAuthTokens(response.data);
+      setLoggedIn(true);
+    } else {
       setIsError(true);
-    });
+    }
   }
 
   function search(event) {