Commit fd0d9a34 authored by Jan Köster's avatar Jan Köster
Browse files

test

parent 398b0e6d
Loading
Loading
Loading
Loading
+2 −0
Changes for editor/config.yaml: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -20,3 +20,5 @@ WEBEDIT:
      CLIENTNAME: "blogi-editor"
      CLIENTSECRET: "changeme"
      DOMAIN: "localhost"
  MEDIADB:
    URL: "https://mediadb:8080"
 No newline at end of file
+10 −2
Changes for plugins/media/media.cpp: 10 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -1363,9 +1363,13 @@ namespace blogi {
                } catch(std::exception &e) {
                    json_object_object_add(response, "status", json_object_new_string("error"));
                    json_object_object_add(response, "message", json_object_new_string(e.what()));
                } catch(const char *e) {
                    json_object_object_add(response, "status", json_object_new_string("error"));
                    json_object_object_add(response, "message", json_object_new_string(e ? e : "Unknown C-string error"));
                } catch(...) {
                    std::cerr << "media JsonApi media_list_albums: unknown non-std exception" << std::endl;
                    json_object_object_add(response, "status", json_object_new_string("error"));
                    json_object_object_add(response, "message", json_object_new_string("Unknown error"));
                    json_object_object_add(response, "message", json_object_new_string("Unknown non-std exception in media_list_albums"));
                }
            } else if(strcmp(command, "media_list_media") == 0){
                json_object *jaid = nullptr;
@@ -1397,9 +1401,13 @@ namespace blogi {
                } catch(std::exception &e) {
                    json_object_object_add(response, "status", json_object_new_string("error"));
                    json_object_object_add(response, "message", json_object_new_string(e.what()));
                } catch(const char *e) {
                    json_object_object_add(response, "status", json_object_new_string("error"));
                    json_object_object_add(response, "message", json_object_new_string(e ? e : "Unknown C-string error"));
                } catch(...) {
                    std::cerr << "media JsonApi media_list_media: unknown non-std exception" << std::endl;
                    json_object_object_add(response, "status", json_object_new_string("error"));
                    json_object_object_add(response, "message", json_object_new_string("Unknown error"));
                    json_object_object_add(response, "message", json_object_new_string("Unknown non-std exception in media_list_media"));
                }
            } else if(strcmp(command, "media_create_preview") == 0){
                json_object *jmid = nullptr, *jw = nullptr, *jh = nullptr;