mirror/nzbget
1
0
Fork 0
mirror of https://github.com/nzbget/nzbget.git synced 2026-05-18 18:14:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

#130: moved parts from module "Util" into new module "FileSystem"

Browse Source
This commit is contained in:
Andrey Prygunkov
2015-12-22 22:01:03 +01:00
parent 19ce3bf69b
commit 321c7efa41
48 changed files with 1314 additions and 1206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
daemon/queue/QueueEditor.cpp
View File

@@ -29,6 +29,7 @@
#include "Options.h"
#include "Log.h"
#include "Util.h"
#include "FileSystem.h"
#include "QueueCoordinator.h"
#include "PrePostProcessor.h"
#include "HistoryCoordinator.h"
@@ -752,7 +753,7 @@ bool QueueEditor::BuildIdListFromNameList(IdList* idList, NameList* nameList, Do
if (action < DownloadQueue::eaGroupMoveOffset)
{
// file action
BString<1024> filename("%s/%s", fileInfo->GetNzbInfo()->GetName(), Util::BaseFileName(fileInfo->GetFilename()));
BString<1024> filename("%s/%s", fileInfo->GetNzbInfo()->GetName(), FileSystem::BaseFileName(fileInfo->GetFilename()));
if (((!regEx && !strcmp(filename, name)) || (regEx && regEx->Match(filename))) &&
(uniqueIds.find(fileInfo->GetId()) == uniqueIds.end()))
{
@@ -1182,7 +1183,7 @@ void QueueEditor::ReorderFiles(ItemList* itemList)
void QueueEditor::SetNzbParameter(NzbInfo* nzbInfo, const char* paramString)
{
debug("QueueEditor: setting nzb parameter '%s' for '%s'", paramString, Util::BaseFileName(nzbInfo->GetFilename()));
debug("QueueEditor: setting nzb parameter '%s' for '%s'", paramString, FileSystem::BaseFileName(nzbInfo->GetFilename()));
char* str = strdup(paramString);