From 5e555fb6ad9528c36e784c615e6d05cc8e92889f Mon Sep 17 00:00:00 2001 From: Mistivia Date: Tue, 16 Sep 2025 02:23:21 +0800 Subject: fix minio compatibility --- rtmpserver.cpp | 2 -- s3_client.cpp | 21 ++++----------------- 2 files changed, 4 insertions(+), 19 deletions(-) diff --git a/rtmpserver.cpp b/rtmpserver.cpp index 313c31f..7b51065 100644 --- a/rtmpserver.cpp +++ b/rtmpserver.cpp @@ -373,8 +373,6 @@ void handle_setdataframe(Client *client, Decoder *dec) throw std::runtime_error("not a publisher"); } - printf( "client paht is %s",client->path.c_str()); - std::string type = amf_load_string(dec); if (type != "onMetaData") { throw std::runtime_error("can only set metadata"); diff --git a/s3_client.cpp b/s3_client.cpp index 220542a..8ef235b 100644 --- a/s3_client.cpp +++ b/s3_client.cpp @@ -93,31 +93,18 @@ void S3Client_clear() { return; } - Aws::Vector objects_to_delete; + std::vector objects_to_delete; for (const auto& obj : list_outcome.GetResult().GetContents()) { auto key = obj.GetKey(); if (key.size() >= 3 && key.substr(key.size() - 3) == ".ts") { - Aws::S3::Model::ObjectIdentifier oid; - oid.SetKey(key); - objects_to_delete.push_back(oid); + objects_to_delete.push_back(key); printf("Marking for delete: %s\n", key.c_str()); } } if (!objects_to_delete.empty()) { - Aws::S3::Model::DeleteObjectsRequest del_req; - del_req.WithBucket(ezlive_config->bucket) - .WithDelete(Aws::S3::Model::Delete().WithObjects(objects_to_delete)); - - auto del_outcome = s3client->DeleteObjects(del_req); - if (!del_outcome.IsSuccess()) { - std::cerr << "DeleteObjects error: " - << del_outcome.GetError().GetMessage() << std::endl; - return; - } else { - std::cout << "Deleted " - << del_outcome.GetResult().GetDeleted().size() - << " objects." << std::endl; + for (auto &x : objects_to_delete) { + S3Client_delete(x.c_str()); } } else { std::cout << "No .ts files found. No need to clear." << std::endl; -- cgit v1.0