oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-09-30 19:22:14 +00:00
Code Wiki Activity

Minor cleanups and logging changes

Browse source
This commit is contained in:
sfan5 2025-07-14 22:42:59 +02:00
parent 77dd86a79c
commit 3cb8ce69d2
8 changed files with 37 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/server.cpp
View file

@ -2556,6 +2556,7 @@ bool Server::addMediaFile(const std::string &filename,
<< filename << "\"" << std::endl;
return false;
}
// If name is not in a supported format, ignore it
const char *supported_ext[] = {
".png", ".jpg", ".tga",
@ -2594,7 +2595,7 @@ bool Server::addMediaFile(const std::string &filename,
// Put in list
m_media[filename] = MediaInfo(filepath, sha1);
verbosestream << "Server: " << sha1_hex << " is " << filename
<< std::endl;
<< " (" << (filedata.size() >> 10) << "KiB)" << std::endl;
if (filedata_to)
*filedata_to = std::move(filedata);
@ -2752,8 +2753,8 @@ void Server::sendRequestedMedia(session_t peer_id,
auto it = m_media.find(name);
if (it == m_media.end()) {
errorstream<<"Server::sendRequestedMedia(): Client asked for "
<<"unknown file \""<<(name)<<"\""<<std::endl;
warningstream << "Server::sendRequestedMedia(): Client asked for "
"unknown file \"" << name << "\"" << std::endl;
continue;
}
const auto &m = it->second;
@ -2762,7 +2763,7 @@ void Server::sendRequestedMedia(session_t peer_id,
// have duplicate filenames. So we can't check it.
if (!m.no_announce) {
if (!client->markMediaSent(name)) {
infostream << "Server::sendRequestedMedia(): Client asked has "
warningstream << "Server::sendRequestedMedia(): Client has "
"requested \"" << name << "\" before, not sending it again."
<< std::endl;
continue;