Merge pull request #56 from mmmnmnm/arcsi-stops-error

Arcsi stops error

Author: gammaw

arcsi/api/item.py

@@ -84,6 +84,7 @@ def view_item(id):
 
 @arcsi.route("/item", methods=["POST"])
 def add_item():
+    no_error = True
     if request.is_json:
         return make_response(
             jsonify("Only accepts multipart/form-data for now, sorry"), 503, headers
@@ -141,7 +142,7 @@ def add_item():
         db.session.flush()
 
         if request.files:
-            process_media(request.files, new_item)
+            no_error = process_media(request.files, new_item)
 
             # TODO some mp3 error
             # TODO Maybe I used vanilla mp3 not from azuracast
@@ -150,8 +151,10 @@ def add_item():
             # item_length = item_audio_obj.info.length
 
         db.session.commit()
-
-        return make_response(jsonify(item_details_schema.dump(new_item)), 200, headers,)
+        if no_error:
+            return make_response(jsonify(item_details_schema.dump(new_item)), 200, headers,)
+        else:
+            return "Some error happened, check server logs for details. Note that your media may have been uploaded (to DO and/or Azurcast)."
 
 
 @arcsi.route("item/<id>/listen", methods=["GET"])
@@ -187,6 +190,7 @@ def delete_item(id):
 
 @arcsi.route("/item/<id>", methods=["POST"])
 def edit_item(id):
+    no_error = True
     item_query = Item.query.filter_by(id=id)
     item = item_query.first_or_404()
     # work around ImmutableDict type
@@ -236,9 +240,12 @@ def edit_item(id):
         db.session.flush()
 
         if request.files:
-            process_media(request.files, item)
+            no_error = process_media(request.files, item)
 
         db.session.commit()
-        return make_response(
-            jsonify(item_details_partial_schema.dump(item)), 200, headers
-        )
+        if no_error:
+            return make_response(
+                jsonify(item_details_partial_schema.dump(item)), 200, headers
+            )
+        return "Some error happened, check server logs for details. Note that your media may have been uploaded (to DO and/or Azurcast)."
+            

arcsi/api/utils.py

@@ -67,6 +67,9 @@ def broadcast_audio(audio_file_path, item, image_file_path):
         if episode_playlist:
             # TODO change all other episode airing to false
             item.airing = True
+            return True
+    return False
+
 
 
 def process_audio(play_file, item, image_file_path):
@@ -76,6 +79,7 @@ def process_audio(play_file, item, image_file_path):
     Get the extension from file sent to API.
     To get the extension we use rsplit w/ maxsplit=1 to make sure we always get the extension even if there is another dot in the filename.
     '''
+    no_error = True 
     play_file_name = "{}.{}".format(normalise("-".join([item.shows[0].name, item.name])), play_file.filename.rsplit(".", 1)[1])
     if play_file.filename != "":
         play_file_path = media_path(
@@ -91,13 +95,13 @@ def process_audio(play_file, item, image_file_path):
             # TODO fallback img arcsi default img
 
             # ughhhh........
-            broadcast_audio(play_file_path, item, image_file_path)
+            no_error = broadcast_audio(play_file_path, item, image_file_path)
 
         if item.archive_lahmastore:
             # disdain
             archive_audio(play_file_path, item)
 
-        return play_file_path
+        return no_error
 
 
 def process_image(image_file, item):
@@ -128,11 +132,13 @@ def process_image(image_file, item):
 
 
 def process_media(request_files, item):
+    no_error = True
     if request_files["image_file"]:
         image_file_path = process_image(request_files["image_file"], item)
     if request_files["play_file"]:
         if image_file_path:
-            audio_file_path = process_audio(
+            no_error = process_audio(
                 request_files["play_file"], item, image_file_path
             )
+    return no_error
 

arcsi/handler/upload.py

@@ -160,6 +160,9 @@ def upload(self,):
                         remaining_byte -= chunk_byte
                         start += chunk_byte
                         app.logger.debug("chunk posted! {} bytes remaining".format(remaining_byte))
+                    else: 
+                        app.logger.debug("Azuracast response error code: {}, body: {}".format(req.status_code, req.text))
+                        return False #exit while loop when error
                 except requests.exceptions.RequestException as e:
                     # max 30 retries
                     if retry >= 30:
@@ -216,7 +219,7 @@ def assign_playlist(self,):
                 if not wiped:
                     app.logger.info("Couldn't wipe playlist")
                     return False
-            app.logger.info("Playlist wiped")
+                app.logger.info("Playlist wiped")
             payload = {
                 "do": "playlist",
                 "files": [self.play_file_name],
@@ -228,10 +231,10 @@ def assign_playlist(self,):
                 headers=self.config["headers"],
                 json=payload,
             )
-            if r.ok:
+            if r.ok and not self.empty_playlist():
                 app.logger.info("Add to playlist request successful")
                 return True
-            app.logger.info("Add to playlist didn't succeed")
+            app.logger.debug("Add to playlist didn't succeed")
             app.logger.debug("Add to playlist request returned {}".format(r.status_code))
             app.logger.debug("Request response \n {}".format(r.content))
             return False

docker-compose.yml

@@ -33,7 +33,7 @@
         entrypoint: sh -c 'sleep 60; /app/entrypoint.sh'
 
       db:
-        image: postgres:10
+        image: postgres:12
         restart: always
         volumes:
             - ./pg-data/postgres:/var/lib/postgresql/data

entrypoint.sh

@@ -1,3 +1,3 @@
 #!/bin/sh
 python3 -m flask db upgrade
-gunicorn --worker-tmp-dir /dev/shm -w 2 --worker-class=gthread --threads 2 -b 0.0.0.0:5666 --log-file /app/aguni.log --log-level info "arcsi:create_app('../config.py')"
+gunicorn --worker-tmp-dir /dev/shm -w 2 --worker-class=gthread --threads 2 -b 0.0.0.0:5666 --log-file /app/aguni.log --log-level debug "arcsi:create_app('../config.py')"