Skip to content

Commit

Permalink
Make Song::HighestMSDOfSkillset only match charts passing filter, if set
Browse files Browse the repository at this point in the history 
Earlier, a bug was caused where "Overall" and other skillset sorts would be
incorrect, as the sort would find the highest MSD chart of *any* from the
current game mode, even those hidden by the filter. This lead to confusing
behavior.

This fix simply replaces the GetChartsOfCurrentGameMode call with a
GetChartsMatchingFilter. (Which falls through to the above if the filter is
not set)
  • Loading branch information
@bluebandit21
bluebandit21 committed Sep 9, 2020
1 parent 50fde44 commit fef0d38
Showing 1 changed file with 32 additions and 24 deletions.
56 changes: 32 additions & 24 deletions src/Etterna/Models/Songs/Song.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,8 @@ Song::LoadFromSongDir(std::string sDir, Calc* calc)
// There was no entry in the cache for this song, or it was out of date.
// Let's load it from a file, then write a cache entry.
if (!NotesLoader::LoadFromDir(sDir, *this, BlacklistedImages)) {
Locator::getLogger()->info("Song {} has no SSC, SM, SMA, DWI, BMS, KSF, or OSU files.", sDir);
Locator::getLogger()->info(
"Song {} has no SSC, SM, SMA, DWI, BMS, KSF, or OSU files.", sDir);

vector<std::string> vs;
FILEMAN->GetDirListingWithMultipleExtensions(
Expand All @@ -343,7 +344,9 @@ Song::LoadFromSongDir(std::string sDir, Calc* calc)
const auto bHasMusic = !vs.empty();

if (!bHasMusic) {
Locator::getLogger()->info("Song {} has no music file either. Ignoring this song directory.", sDir);
Locator::getLogger()->info(
"Song {} has no music file either. Ignoring this song directory.",
sDir);
return false;
}
// Make sure we have a future filename figured out.
Expand All @@ -364,7 +367,7 @@ Song::LoadFromSongDir(std::string sDir, Calc* calc)
FinalizeLoading();

if (!m_bHasMusic) {
Locator::getLogger()->info("Song {} has no music; ignored.", sDir);
Locator::getLogger()->info("Song {} has no music; ignored.", sDir);
return false; // don't load this song
}
return true; // do load this song
Expand Down Expand Up @@ -675,10 +678,10 @@ Song::TidyUpData(bool from_cache, bool /* duringCache */, Calc* calc)
} else // ! HasMusic()
{
m_fMusicLengthSeconds = 100; // guess
/*LOG->UserLog("Song",
GetSongDir(),
"has no music file; guessing at %f seconds",
m_fMusicLengthSeconds);*/
/*LOG->UserLog("Song",
GetSongDir(),
"has no music file; guessing at %f seconds",
m_fMusicLengthSeconds);*/
}
if (m_fMusicLengthSeconds < 0) {
/*LOG->UserLog("Sound file",
Expand Down Expand Up @@ -892,10 +895,10 @@ Song::TidyUpData(bool from_cache, bool /* duringCache */, Calc* calc)
std::string error;
auto* img = RageSurfaceUtils::LoadFile(sPath, error, true);
if (!img) {
/* LOG->UserLog("Graphic file",
sPath,
"couldn't be loaded: %s",
error.c_str());*/
/* LOG->UserLog("Graphic file",
sPath,
"couldn't be loaded: %s",
error.c_str());*/
continue;
}

Expand Down Expand Up @@ -1123,7 +1126,7 @@ void
Song::Save()
{
SONGINDEX->DeleteSongFromDBByDir(GetSongDir());
// LOG->Trace("Song::SaveToSongFile()");
// LOG->Trace("Song::SaveToSongFile()");

ReCalculateRadarValuesAndLastSecond();
TranslateTitles();
Expand All @@ -1141,7 +1144,8 @@ Song::Save()
const auto sNewPath = sOldPath + ".old";

if (!FileCopy(sOldPath, sNewPath)) {
Locator::getLogger()->info("Song file {} couldn't be backed up.", sOldPath);
Locator::getLogger()->info("Song file {} couldn't be backed up.",
sOldPath);
} else {
backedDotOldFileNames.emplace_back(sNewPath);
backedOrigFileNames.emplace_back(sOldPath);
Expand All @@ -1165,7 +1169,7 @@ bool
Song::SaveToSMFile()
{
const auto sPath = SetExtension(GetSongFilePath(), "sm");
// LOG->Trace("Song::SaveToSMFile(%s)", sPath.c_str());
// LOG->Trace("Song::SaveToSMFile(%s)", sPath.c_str());

// If the file exists, make a backup.
if (IsAFile(sPath))
Expand Down Expand Up @@ -1199,7 +1203,7 @@ Song::SaveToSSCFile(const std::string& sPath, bool bSavingCache)
if (!bSavingCache)
path = SetExtension(sPath, "ssc");

// LOG->Trace("Song::SaveToSSCFile('%s')", path.c_str());
// LOG->Trace("Song::SaveToSSCFile('%s')", path.c_str());

// If the file exists, make a backup.
if (!bSavingCache && IsAFile(path)) {
Expand Down Expand Up @@ -1242,9 +1246,11 @@ Song::SaveToSSCFile(const std::string& sPath, bool bSavingCache)
sBackupFile += ssprintf(".old");

if (FileCopy(path, sBackupFile))
Locator::getLogger()->trace("Backed up {} to {}", path, sBackupFile);
Locator::getLogger()->trace(
"Backed up {} to {}", path, sBackupFile);
else
Locator::getLogger()->trace("Failed to back up {} to {}", path, sBackupFile);
Locator::getLogger()->trace(
"Failed to back up {} to {}", path, sBackupFile);
}

// Mark these steps saved to disk.
Expand All @@ -1261,7 +1267,7 @@ Song::SaveToETTFile(const std::string& sPath, bool bSavingCache)
if (!bSavingCache)
path = SetExtension(sPath, "ett");

// LOG->Trace("Song::SaveToETTFile('%s')", path.c_str());
// LOG->Trace("Song::SaveToETTFile('%s')", path.c_str());

// If the file exists, make a backup.
if (!bSavingCache && IsAFile(path))
Expand Down Expand Up @@ -1295,10 +1301,12 @@ Song::SaveToETTFile(const std::string& sPath, bool bSavingCache)
sBackupFile = SetExtension(sBackupFile, sExt);
sBackupFile += ssprintf(".old");

if (FileCopy(path, sBackupFile))
Locator::getLogger()->trace("Backed up {} to {}", path, sBackupFile);
else
Locator::getLogger()->trace("Failed to back up {} to {}", path, sBackupFile);
if (FileCopy(path, sBackupFile))
Locator::getLogger()->trace(
"Backed up {} to {}", path, sBackupFile);
else
Locator::getLogger()->trace(
"Failed to back up {} to {}", path, sBackupFile);
}

// Mark these steps saved to disk.
Expand All @@ -1321,7 +1329,7 @@ bool
Song::SaveToDWIFile()
{
const auto sPath = SetExtension(GetSongFilePath(), "dwi");
// LOG->Trace("Song::SaveToDWIFile(%s)", sPath.c_str());
// LOG->Trace("Song::SaveToDWIFile(%s)", sPath.c_str());

// If the file exists, make a backup.
if (IsAFile(sPath))
Expand Down Expand Up @@ -1665,7 +1673,7 @@ Song::HighestMSDOfSkillset(Skillset skill, float rate) const
CLAMP(rate, 0.7f, 2.f);
auto highest = 0.f;

const auto charts = GetChartsOfCurrentGameMode();
const auto charts = GetChartsMatchingFilter();

for (auto* chart : charts) {
const auto current = chart->GetMSD(rate, skill);
Expand Down

0 comments on commit fef0d38

Please sign in to comment.