|
@@ -252,8 +252,6 @@ desc_file_download_finished(bool success) {
|
|
|
////////////////////////////////////////////////////////////////////
|
|
////////////////////////////////////////////////////////////////////
|
|
|
void P3DPackage::
|
|
void P3DPackage::
|
|
|
got_desc_file(TiXmlDocument *doc, bool freshly_downloaded) {
|
|
got_desc_file(TiXmlDocument *doc, bool freshly_downloaded) {
|
|
|
- nout << "got desc file\n";
|
|
|
|
|
-
|
|
|
|
|
TiXmlElement *xpackage = doc->FirstChildElement("package");
|
|
TiXmlElement *xpackage = doc->FirstChildElement("package");
|
|
|
TiXmlElement *uncompressed_archive = NULL;
|
|
TiXmlElement *uncompressed_archive = NULL;
|
|
|
TiXmlElement *compressed_archive = NULL;
|
|
TiXmlElement *compressed_archive = NULL;
|
|
@@ -286,8 +284,6 @@ got_desc_file(TiXmlDocument *doc, bool freshly_downloaded) {
|
|
|
component = component->NextSiblingElement("component");
|
|
component = component->NextSiblingElement("component");
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- nout << "got " << _components.size() << " components\n";
|
|
|
|
|
-
|
|
|
|
|
// Verify all of the components.
|
|
// Verify all of the components.
|
|
|
bool all_components_ok = true;
|
|
bool all_components_ok = true;
|
|
|
Components::iterator ci;
|
|
Components::iterator ci;
|
|
@@ -383,8 +379,6 @@ compressed_archive_download_finished(bool success) {
|
|
|
////////////////////////////////////////////////////////////////////
|
|
////////////////////////////////////////////////////////////////////
|
|
|
void P3DPackage::
|
|
void P3DPackage::
|
|
|
uncompress_archive() {
|
|
uncompress_archive() {
|
|
|
- nout << "uncompressing " << _compressed_archive.get_filename() << "\n";
|
|
|
|
|
-
|
|
|
|
|
string source_pathname = _package_dir + "/" + _compressed_archive.get_filename();
|
|
string source_pathname = _package_dir + "/" + _compressed_archive.get_filename();
|
|
|
string target_pathname = _package_dir + "/" + _uncompressed_archive.get_filename();
|
|
string target_pathname = _package_dir + "/" + _uncompressed_archive.get_filename();
|
|
|
|
|
|
|
@@ -517,8 +511,6 @@ uncompress_archive() {
|
|
|
////////////////////////////////////////////////////////////////////
|
|
////////////////////////////////////////////////////////////////////
|
|
|
void P3DPackage::
|
|
void P3DPackage::
|
|
|
extract_archive() {
|
|
extract_archive() {
|
|
|
- nout << "extracting " << _uncompressed_archive.get_filename() << "\n";
|
|
|
|
|
-
|
|
|
|
|
string source_pathname = _package_dir + "/" + _uncompressed_archive.get_filename();
|
|
string source_pathname = _package_dir + "/" + _uncompressed_archive.get_filename();
|
|
|
P3DMultifileReader reader;
|
|
P3DMultifileReader reader;
|
|
|
if (!reader.extract(source_pathname, _package_dir,
|
|
if (!reader.extract(source_pathname, _package_dir,
|
|
@@ -529,7 +521,6 @@ extract_archive() {
|
|
|
return;
|
|
return;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- nout << "done extracting\n";
|
|
|
|
|
report_done(true);
|
|
report_done(true);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -556,8 +547,6 @@ report_progress(double progress) {
|
|
|
////////////////////////////////////////////////////////////////////
|
|
////////////////////////////////////////////////////////////////////
|
|
|
void P3DPackage::
|
|
void P3DPackage::
|
|
|
report_done(bool success) {
|
|
report_done(bool success) {
|
|
|
- nout << "report_done(" << success << "), "
|
|
|
|
|
- << _callbacks.size() << " callbacks\n";
|
|
|
|
|
if (success) {
|
|
if (success) {
|
|
|
_ready = true;
|
|
_ready = true;
|
|
|
_failed = false;
|
|
_failed = false;
|