Skip to content

Commit

Permalink
kill bookkeeper
Browse files Browse the repository at this point in the history
  • Loading branch information
@MinaciousGrace
MinaciousGrace committed May 7, 2017
1 parent 7dc71c8 commit 5682c18
Show file tree
Hide file tree
Showing 11 changed files with 2 additions and 886 deletions.
261 changes: 0 additions & 261 deletions src/Bookkeeper.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,261 +0,0 @@
#include "global.h"
#include "Bookkeeper.h"
#include "RageUtil.h"
#include "RageLog.h"
#include "IniFile.h"
#include "GameConstantsAndTypes.h"
#include "SongManager.h"
#include "RageFile.h"
#include "XmlFile.h"
#include "XmlFileUtil.h"
#include <ctime>

Bookkeeper* BOOKKEEPER = NULL; // global and accessible from anywhere in our program

static const RString COINS_DAT = "Save/Coins.xml";

Bookkeeper::Bookkeeper()
{
ClearAll();
ReadFromDisk();
}

Bookkeeper::~Bookkeeper()
{
WriteToDisk();
}

#define WARN_AND_RETURN { LOG->Warn("Error parsing at %s:%d",__FILE__,__LINE__); return; }

void Bookkeeper::ClearAll()
{
m_mapCoinsForHour.clear();
}

bool Bookkeeper::Date::operator<( const Date &rhs ) const
{
if( m_iYear != rhs.m_iYear )
return m_iYear < rhs.m_iYear;
if( m_iDayOfYear != rhs.m_iDayOfYear )
return m_iDayOfYear < rhs.m_iDayOfYear;
return m_iHour < rhs.m_iHour;
}

void Bookkeeper::Date::Set( time_t t )
{
tm ltime;
localtime_r( &t, &ltime );

Set( ltime );
}

void Bookkeeper::Date::Set( tm pTime )
{
m_iHour = pTime.tm_hour;
m_iDayOfYear = pTime.tm_yday;
m_iYear = pTime.tm_year + 1900;
}

void Bookkeeper::LoadFromNode( const XNode *pNode )
{
if( pNode->GetName() != "Bookkeeping" )
{
LOG->Warn( "Error loading bookkeeping: unexpected \"%s\"", pNode->GetName().c_str() );
return;
}

const XNode *pData = pNode->GetChild( "Data" );
if( pData == NULL )
{
LOG->Warn( "Error loading bookkeeping: Data node missing" );
return;
}

FOREACH_CONST_Child( pData, day )
{
Date d;
if( !day->GetAttrValue( "Hour", d.m_iHour ) ||
!day->GetAttrValue( "Day", d.m_iDayOfYear ) ||
!day->GetAttrValue( "Year", d.m_iYear ) )
{
LOG->Warn( "Incomplete date field" );
continue;
}

int iCoins;
day->GetTextValue( iCoins );

m_mapCoinsForHour[d] = iCoins;
}
}

XNode* Bookkeeper::CreateNode() const
{
XNode *xml = new XNode( "Bookkeeping" );

{
XNode* pData = xml->AppendChild("Data");

for( map<Date,int>::const_iterator it = m_mapCoinsForHour.begin(); it != m_mapCoinsForHour.end(); ++it )
{
int iCoins = it->second;
XNode *pDay = pData->AppendChild( "Coins", iCoins );

const Date &d = it->first;
pDay->AppendAttr( "Hour", d.m_iHour );
pDay->AppendAttr( "Day", d.m_iDayOfYear );
pDay->AppendAttr( "Year", d.m_iYear );
}
}

return xml;
}

void Bookkeeper::ReadFromDisk()
{
if( !IsAFile(COINS_DAT) )
return;

XNode xml;
if( !XmlFileUtil::LoadFromFileShowErrors(xml, COINS_DAT) )
return;

LoadFromNode( &xml );
}

void Bookkeeper::WriteToDisk()
{
// Write data. Use SLOW_FLUSH, to help ensure that we don't lose coin data.
RageFile f;
if( !f.Open(COINS_DAT, RageFile::WRITE|RageFile::SLOW_FLUSH) )
{
LOG->Warn( "Couldn't open file \"%s\" for writing: %s", COINS_DAT.c_str(), f.GetError().c_str() );
return;
}

unique_ptr<XNode> xml( CreateNode() );
XmlFileUtil::SaveToFile( xml.get(), f );
}

void Bookkeeper::CoinInserted()
{
Date d;
d.Set( time(NULL) );

++m_mapCoinsForHour[d];
}

// Return the number of coins between [beginning,ending).
int Bookkeeper::GetNumCoinsInRange( map<Date,int>::const_iterator begin, map<Date,int>::const_iterator end ) const
{
int iCoins = 0;

while( begin != end )
{
iCoins += begin->second;
++begin;
}

return iCoins;
}

int Bookkeeper::GetNumCoins( Date beginning, Date ending ) const
{
return GetNumCoinsInRange( m_mapCoinsForHour.lower_bound( beginning ),
m_mapCoinsForHour.lower_bound( ending ) );
}

int Bookkeeper::GetCoinsTotal() const
{
return GetNumCoinsInRange( m_mapCoinsForHour.begin(), m_mapCoinsForHour.end() );
}

void Bookkeeper::GetCoinsLastDays( int coins[NUM_LAST_DAYS] ) const
{
time_t lOldTime = time(NULL);
tm time;
localtime_r( &lOldTime, &time );

time.tm_hour = 0;

for( int i=0; i<NUM_LAST_DAYS; i++ )
{
tm EndTime = AddDays( time, +1 );
coins[i] = GetNumCoins( time, EndTime );
time = GetYesterday( time );
}
}

void Bookkeeper::GetCoinsLastWeeks( int coins[NUM_LAST_WEEKS] ) const
{
time_t lOldTime = time(NULL);
tm time;
localtime_r( &lOldTime, &time );

time = GetNextSunday( time );
time = GetYesterday( time );

for( int w=0; w<NUM_LAST_WEEKS; w++ )
{
tm StartTime = AddDays( time, -DAYS_IN_WEEK );
coins[w] = GetNumCoins( StartTime, time );
time = StartTime;
}
}

/* iDay is days since Jan 1. iYear is eg. 2005. Return the day of the week,
* where 0 is Sunday. */
void Bookkeeper::GetCoinsByDayOfWeek( int coins[DAYS_IN_WEEK] ) const
{
for( int i=0; i<DAYS_IN_WEEK; i++ )
coins[i] = 0;

for( map<Date,int>::const_iterator it = m_mapCoinsForHour.begin(); it != m_mapCoinsForHour.end(); ++it )
{
const Date &d = it->first;
int iDayOfWeek = GetDayInYearAndYear( d.m_iDayOfYear, d.m_iYear ).tm_wday;
coins[iDayOfWeek] += it->second;
}
}

void Bookkeeper::GetCoinsByHour( int coins[HOURS_IN_DAY] ) const
{
memset( coins, 0, sizeof(int) * HOURS_IN_DAY );
for( map<Date,int>::const_iterator it = m_mapCoinsForHour.begin(); it != m_mapCoinsForHour.end(); ++it )
{
const Date &d = it->first;

if( d.m_iHour >= HOURS_IN_DAY )
{
LOG->Warn( "Hour %i >= %i", d.m_iHour, HOURS_IN_DAY );
continue;
}

coins[d.m_iHour] += it->second;
}
}

/*
* (c) 2003-2005 Chris Danford, Glenn Maynard
* All rights reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
* without limitation the rights to use, copy, modify, merge, publish,
* distribute, and/or sell copies of the Software, and to permit persons to
* whom the Software is furnished to do so, provided that the above
* copyright notice(s) and this permission notice appear in all copies of
* the Software and that both the above copyright notice(s) and this
* permission notice appear in supporting documentation.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
* THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS
* INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT
* OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
* OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
* OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
93 changes: 0 additions & 93 deletions src/Bookkeeper.h
View file
Original file line number Diff line number Diff line change
@@ -1,93 +0,0 @@
#ifndef Bookkeeper_H
#define Bookkeeper_H

#include "DateTime.h"
#include <map>
class XNode;

/** @brief Track when coins were put into the machine. */
class Bookkeeper
{
public:
Bookkeeper();
~Bookkeeper();

void ClearAll();

void CoinInserted();

int GetCoinsTotal() const;
void GetCoinsLastDays( int coins[NUM_LAST_DAYS] ) const;
void GetCoinsLastWeeks( int coins[NUM_LAST_WEEKS] ) const;
void GetCoinsByDayOfWeek( int coins[DAYS_IN_WEEK] ) const;
void GetCoinsByHour( int coins[HOURS_IN_DAY] ) const;

void LoadFromNode( const XNode *pNode );
XNode* CreateNode() const;

void ReadFromDisk();
void WriteToDisk();

private:
/** @brief A simple way of handling the date. */
struct Date
{
/**
* @brief The hour of the date.
*
* The value 0 is defined to be midnight. */
int m_iHour;
/**
* @brief The day of the year of the date.
*
* The value 0 is defined to be January 1st. */
int m_iDayOfYear;
/** @brief The year of the date (e.g., 2005). */
int m_iYear;
/** @brief Set up a date with initial values. */
Date() { m_iHour = m_iDayOfYear = m_iYear = 0; }
/**
* @brief Set up a date based on the given time.
* @param time the time to turn into a Date. */
Date( tm time ) { Set(time); }
void Set( time_t t );
void Set( tm pTime );
bool operator<( const Date &rhs ) const;
};
int GetNumCoins( Date beginning, Date ending ) const;
int GetNumCoinsInRange( map<Date,int>::const_iterator begin, map<Date,int>::const_iterator end ) const;

int m_iLastSeenTime;
map<Date,int> m_mapCoinsForHour;
};

extern Bookkeeper* BOOKKEEPER; // global and accessible from anywhere in our program

#endif

/**
* @file
* @author Chris Danford (c) 2003-2004
* @section LICENSE
* All rights reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
* without limitation the rights to use, copy, modify, merge, publish,
* distribute, and/or sell copies of the Software, and to permit persons to
* whom the Software is furnished to do so, provided that the above
* copyright notice(s) and this permission notice appear in all copies of
* the Software and that both the above copyright notice(s) and this
* permission notice appear in supporting documentation.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
* THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS
* INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT
* OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
* OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
* OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
5 changes: 0 additions & 5 deletions src/GameCommand.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -718,11 +718,6 @@ void GameCommand::ApplySelf( const vector<PlayerNumber> &vpns ) const
FOREACH_CONST( RString, m_vsScreensToPrepare, s )
SCREENMAN->PrepareScreen( *s );

if( m_bInsertCredit )
{
StepMania::InsertCredit();
}

if( m_bClearCredits )
StepMania::ClearCredits();

Expand Down
3 changes: 0 additions & 3 deletions src/GameLoop.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -311,9 +311,6 @@ void GameLoop::RunGameLoop()
SCREENMAN->Draw();
}

// If we ended mid-game, finish up.
GAMESTATE->SaveLocalData();

if( ChangeAppPri() )
HOOKS->UnBoostPriority();
}
Expand Down
Loading

0 comments on commit 5682c18

Please sign in to comment.