tomasz.sowa/winix
1
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

fixed: plugin ticket: when a session expires all files from editticket were removed

Browse Source 
it should be removed only those new added


git-svn-id: svn://ttmath.org/publicrep/winix/trunk@798 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
Tomasz Sowa
2012-01-21 12:29:44 +00:00
parent 4311f06ade
commit c9931da5ba
11 changed files with 174 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
plugins/ticket/createticket.cpp
View File

@@ -136,9 +136,9 @@ PT::Space & CreateTicket::PrepareSpace()
cur->session->plugin_data.Get(ticket_info->plugin_id) );
long dir_id = cur->request->dir_tab.back()->id;
PT::Space & space = session_data->GetSpace(dir_id, session_data->create_space_map);
PT::Space & new_space = session_data->GetNewSpace(dir_id, session_data->create_space_map);
return space;
return new_space;
}
@@ -174,7 +174,8 @@ void CreateTicket::MakeGet()
ticket_info->ticket = &ticket;
ticket_info->item = &cur->request->item;
ticket_info->CopyTicketSpace(meta, *ticket_info->item);
// copy meta info to display correctly new files
ticket_info->CopyTicketSpace(meta, cur->request->item);
}

13
plugins/ticket/editticket.cpp
View File

@@ -144,17 +144,21 @@ PT::Space & EditTicket::PrepareSpace()
bool is_new;
long file_id = cur->request->item.id;
PT::Space & space = session_data->GetSpace(file_id, session_data->edit_space_map, &is_new);
PT::Space & new_space = session_data->GetNewSpace(file_id, session_data->edit_space_map, &is_new);
if( is_new )
{
PT::Space * ticket_space = cur->request->item.meta.FindSpace(L"ticket");
if( ticket_space )
space = *ticket_space;
{
new_space = *ticket_space;
PT::Space & old_space = session_data->GetOldSpace(file_id, session_data->edit_space_map);
old_space = new_space;
}
}
return space;
return new_space;
}
@@ -191,7 +195,8 @@ void EditTicket::MakeGet()
ticket_info->ticket = &ticket;
ticket_info->item = &cur->request->item;
ticket_info->CopyTicketSpace(meta, *ticket_info->item);
// copy meta info to display correctly new files
ticket_info->CopyTicketSpace(meta, cur->request->item);
}

10
plugins/ticket/init.cpp
View File

@@ -2,7 +2,7 @@
* This file is a part of Winix
* and is not publicly distributed
*
* Copyright (c) 2010, Tomasz Sowa
* Copyright (c) 2010-2012, Tomasz Sowa
* All rights reserved.
*
*/
@@ -124,8 +124,12 @@ void CreateSession(PluginInfo & info)
void RemoveSession(PluginInfo & info)
{
delete info.plugin_data_base;
log << log4 << "Ticket: removed ticket plugin data: " << (void*)info.plugin_data_base << logend;
if( info.plugin_data_base )
{
info.plugin_data_base->Clear();
delete info.plugin_data_base;
log << log4 << "Ticket: removed ticket plugin data: " << (void*)info.plugin_data_base << logend;
}
}

134
plugins/ticket/sessiondata.cpp
View File

@@ -7,6 +7,7 @@
*
*/
#include <algorithm>
#include "sessiondata.h"
@@ -19,59 +20,134 @@ SessionData::SessionData()
}
SessionData::~SessionData()
{
RemoveFiles(create_space_map);
RemoveFiles(edit_space_map);
Clear();
}
void SessionData::Clear()
{
RemoveFiles(create_space_map, false);
RemoveFiles(edit_space_map, true);
}
void SessionData::RemoveFiles(SessionData::SpaceMap & space_map)
void SessionData::RemoveFiles(SessionData::SpaceMap & space_map, bool only_stale_files)
{
SpaceMap::iterator i;
if( fun_rm )
{
for(i=space_map.begin() ; i!=space_map.end() ; ++i)
RemoveFiles(i->second);
{
if( only_stale_files )
RemoveAllStaleFiles(i->second.new_space, i->second.old_space);
else
RemoveAllFiles(i->second.new_space);
}
space_map.clear();
}
}
void SessionData::RemoveFiles(PT::Space & space)
void SessionData::RemoveAllFiles(PT::Space & new_space)
{
std::vector<long> new_file_tab;
BuildFileList(new_file_tab, new_space);
for(size_t i=0 ; i<new_file_tab.size() ; ++i)
fun_rm->RemoveItemById(new_file_tab[i]);
}
void SessionData::RemoveAllStaleFiles(PT::Space & new_space, PT::Space & old_space)
{
std::vector<long> new_file_tab;
std::vector<long> old_file_tab;
size_t n = 0;
size_t o = 0;
BuildFileList(new_file_tab, new_space);
BuildFileList(old_file_tab, old_space);
std::sort(new_file_tab.begin(), new_file_tab.end());
std::sort(old_file_tab.begin(), old_file_tab.end());
// removes only those items present on new_file_tab
// but not existing on old_space_tab
while( n < new_file_tab.size() && o < old_file_tab.size() )
{
if( new_file_tab[n] < old_file_tab[o] )
{
fun_rm->RemoveItemById(new_file_tab[n]);
n += 1;
}
else
if( new_file_tab[n] == old_file_tab[o] )
{
n += 1;
o += 1;
}
else
{
o += 1;
}
}
while( n < new_file_tab.size() )
{
fun_rm->RemoveItemById(new_file_tab[n]);
n += 1;
}
}
void SessionData::BuildFileList(std::vector<long> & file_tab, PT::Space & space)
{
file_tab.clear();
for(size_t i=0 ; i<space.spaces.size() ; ++i)
{
PT::Space & sp = *space.spaces[i];
if( sp.name == L"param" )
CheckFile(file_tab, sp);
}
}
void SessionData::CheckFile(std::vector<long> & file_tab, PT::Space & space)
{
for(size_t i=0 ; i<space.spaces.size() ; ++i)
{
PT::Space & subsp = *space.spaces[i];
if( subsp.name == L"file" )
{
// !! wywalic to do osobnej metody
for(size_t a=0 ; a<sp.spaces.size() ; ++a)
std::wstring * file_id_str = subsp.GetValue(L"itemid");
if( file_id_str )
{
PT::Space & subsp = *sp.spaces[a];
if( subsp.name == L"file" )
{
std::wstring * file_id_str = subsp.GetValue(L"itemid");
if( file_id_str )
{
long file_id = Tol(*file_id_str);
fun_rm->RemoveItemById(file_id);
}
}
long file_id = Tol(*file_id_str);
file_tab.push_back(file_id);
}
}
}
}
Ticket & SessionData::GetTicket(long id, SessionData::TicketMap & ticket_map, bool * is_new)
{
std::pair<TicketMap::iterator, bool> res = ticket_map.insert( std::make_pair(id, Ticket()) );
@@ -84,17 +160,27 @@ return res.first->second;
PT::Space & SessionData::GetSpace(long id, SpaceMap & space_map, bool * is_new)
PT::Space & SessionData::GetOldSpace(long id, SpaceMap & space_map, bool * is_new)
{
std::pair<SpaceMap::iterator, bool> res = space_map.insert( std::make_pair(id, PT::Space()) );
std::pair<SpaceMap::iterator, bool> res = space_map.insert( std::make_pair(id, SpacePair()) );
if( is_new )
*is_new = res.second;
return res.first->second;
return res.first->second.old_space;
}
PT::Space & SessionData::GetNewSpace(long id, SpaceMap & space_map, bool * is_new)
{
std::pair<SpaceMap::iterator, bool> res = space_map.insert( std::make_pair(id, SpacePair()) );
if( is_new )
*is_new = res.second;
return res.first->second.new_space;
}
} // namespace

32
plugins/ticket/sessiondata.h
View File

@@ -28,9 +28,21 @@ struct SessionData : public PluginDataBase
SessionData();
~SessionData();
struct SpacePair
{
PT::Space new_space;
PT::Space old_space;
// old_space is used when editing an existing ticket
// current ticket space is copied to old_space
// and when the session expires only new added files
// are deleted
};
virtual void Clear();
typedef std::map<long, Ticket> TicketMap;
typedef std::map<long, PT::Space> SpaceMap;
typedef std::map<long, SpacePair> SpaceMap;
// temporary tickets for 'createticket' function
@@ -54,21 +66,21 @@ struct SessionData : public PluginDataBase
// inserting and returning a new ticket or just returning the ticket if it exists
Ticket & GetTicket(long id, TicketMap & ticket_map, bool * is_new = 0);
// inserting and returning a new space or just returning the space if it exists
PT::Space & GetSpace(long id, SpaceMap & space_map, bool * is_new = 0);
// inserting and returning a new/old space or just returning the space if it exists
PT::Space & GetOldSpace(long id, SpaceMap & space_map, bool * is_new = 0);
PT::Space & GetNewSpace(long id, SpaceMap & space_map, bool * is_new = 0);
// for deleting files
// !! IMPROVE ME: when the program exits there can be a situation that
// fun_rm was finished and then an object of this class exits and call fun_rm
// so we should guarantee that all sessions object are removed first
Fun::Rm * fun_rm;
void RemoveFiles(SpaceMap & space_map);
private:
void RemoveFiles(PT::Space & space);
void RemoveFiles(SpaceMap & space_map, bool only_stale_files);
void RemoveAllFiles(PT::Space & new_space);
void RemoveAllStaleFiles(PT::Space & new_space, PT::Space & old_space);
void BuildFileList(std::vector<long> & file_tab, PT::Space & space);
void CheckFile(std::vector<long> & file_tab, PT::Space & space);
};