actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

more work on the export packages screen

Browse Source
This commit is contained in:
AJ Kelly
2011-08-24 13:14:17 -05:00
parent c238cfe698
commit fc716a77d3
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ScreenOptionsExportPackage.cpp
+8 -4
View File
@@ -11,6 +11,8 @@
#include "SpecialFiles.h" #include "SpecialFiles.h"
#include "ScreenPrompt.h" #include "ScreenPrompt.h"
#include "SongManager.h" #include "SongManager.h"
#include "RageFile.h"
// there should probably be a better way to handle this: -aj // there should probably be a better way to handle this: -aj
#if defined(_WINDOWS) #if defined(_WINDOWS)
#include "archutils/Win32/SpecialDirs.h" #include "archutils/Win32/SpecialDirs.h"
@@ -193,17 +195,17 @@ static RString ReplaceInvalidFileNameChars( RString sOldFileName )
static bool ExportPackage( RString sPackageName, RString sDirToExport, RString &sErrorOut ) static bool ExportPackage( RString sPackageName, RString sDirToExport, RString &sErrorOut )
{ {
// Mount Desktop/ for each OS // Mount Desktop/ for each OS.
RString sDesktopDir = SpecialDirs::GetDesktopDir(); RString sDesktopDir = SpecialDirs::GetDesktopDir();
LOG->Trace( "Desktop dir: %s", sDesktopDir.c_str() ); RString fn = sDesktopDir+sPackageName;
/*
RageFile f; RageFile f;
if( !f.Open(sDesktopDir+sPackageName, RageFile::WRITE) ) if( !f.Open(fn, RageFile::WRITE) )
{ {
sErrorOut = ssprintf( "Couldn't open %s for writing: %s", fn.c_str(), f.GetError().c_str() ); sErrorOut = ssprintf( "Couldn't open %s for writing: %s", fn.c_str(), f.GetError().c_str() );
return false; return false;
} }
/*
RageFileObjZip zip( &f ); RageFileObjZip zip( &f );
zip.Start(); zip.Start();
zip.SetGlobalComment( sComment ); zip.SetGlobalComment( sComment );
@@ -211,6 +213,7 @@ static bool ExportPackage( RString sPackageName, RString sDirToExport, RString &
vector<RString> vs; vector<RString> vs;
GetDirListingRecursive( sDirToExport, "*", vs ); GetDirListingRecursive( sDirToExport, "*", vs );
SMPackageUtil::StripIgnoredSmzipFiles( vs ); SMPackageUtil::StripIgnoredSmzipFiles( vs );
LOG->Trace("Adding files...");
FOREACH( RString, vs, s ) FOREACH( RString, vs, s )
{ {
if( !zip.AddFile( *s ) ) if( !zip.AddFile( *s ) )
@@ -220,6 +223,7 @@ static bool ExportPackage( RString sPackageName, RString sDirToExport, RString &
} }
} }
LOG->Trace("Writing zip...");
if( zip.Finish() == -1 ) if( zip.Finish() == -1 )
{ {
sErrorOut = ssprintf( "Couldn't write to file %s", fn.c_str(), f.GetError().c_str() ); sErrorOut = ssprintf( "Couldn't write to file %s", fn.c_str(), f.GetError().c_str() );