Subversion Repositories spk

Rev

Rev 203 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 203 Rev 224
Line 171... Line 171...
171
			++pos;
171
			++pos;
172
			if ( pos < this->listView1->Items->Count )
172
			if ( pos < this->listView1->Items->Count )
173
			{
173
			{
174
				m_pCurrentItem = this->listView1->Items[pos];
174
				m_pCurrentItem = this->listView1->Items[pos];
175
				if ( m_bDownloader )
175
				if ( m_bDownloader )
176
					m_pDownloadPackage = m_pPackages->findAvailablePackage(_S(Convert::ToString(m_pCurrentItem->Tag)));
176
					m_pDownloadPackage = m_pPackages->findAvailablePackage(_WS(Convert::ToString(m_pCurrentItem->Tag)));
177
				else
177
				else
178
					m_pPackage = m_pPackages->GetPackageAt(Convert::ToInt32(m_pCurrentItem->Tag));
178
					m_pPackage = m_pPackages->GetPackageAt(Convert::ToInt32(m_pCurrentItem->Tag));
179
			}
179
			}
180
 
180
 
181
			if ( m_pCurrentItem && (m_pPackage || m_pDownloadPackage) )
181
			if ( m_pCurrentItem && (m_pPackage || m_pDownloadPackage) )
Line 209... Line 209...
209
			++pos;
209
			++pos;
210
			if ( pos < this->listView1->Items->Count )
210
			if ( pos < this->listView1->Items->Count )
211
			{
211
			{
212
				m_pCurrentItem = this->listView1->Items[pos];
212
				m_pCurrentItem = this->listView1->Items[pos];
213
				if ( m_bDownloader )
213
				if ( m_bDownloader )
214
					m_pDownloadPackage = m_pPackages->findAvailablePackage(_S(Convert::ToString(m_pCurrentItem->Tag)));
214
					m_pDownloadPackage = m_pPackages->findAvailablePackage(_WS(Convert::ToString(m_pCurrentItem->Tag)));
215
				else
215
				else
216
					m_pPackage = m_pPackages->GetPackageAt(Convert::ToInt32(m_pCurrentItem->Tag));
216
					m_pPackage = m_pPackages->GetPackageAt(Convert::ToInt32(m_pCurrentItem->Tag));
217
			}
217
			}
218
 
218
 
219
			if ( m_pCurrentItem && (m_pPackage || m_pDownloadPackage) )
219
			if ( m_pCurrentItem && (m_pPackage || m_pDownloadPackage) )
Line 589... Line 589...
589
				 }
589
				 }
590
			 }
590
			 }
591
private: System::Void backgroundWorker1_DoWork(System::Object^  sender, System::ComponentModel::DoWorkEventArgs^  e) {
591
private: System::Void backgroundWorker1_DoWork(System::Object^  sender, System::ComponentModel::DoWorkEventArgs^  e) {
592
			 // for each server
592
			 // for each server
593
			 String ^bestServer = "";
593
			 String ^bestServer = "";
594
			 Utils::String bestVersion = "0.00";
594
			 Utils::WString bestVersion = L"0.00";
595
			 String ^bestFile = "";
595
			 String ^bestFile = "";
596
 
596
 
597
			 for(auto itr = _lAddress->begin(); itr != _lAddress->end(); itr++)
597
			 for(auto itr = _lAddress->begin(); itr != _lAddress->end(); itr++)
598
			 {
598
			 {
599
				 if ( backgroundWorker1->CancellationPending )
599
				 if ( backgroundWorker1->CancellationPending )
Line 643... Line 643...
643
 
643
 
644
						// we have the file, parse data
644
						// we have the file, parse data
645
						cli::array<String ^> ^lines = m_sData->Split('\n');
645
						cli::array<String ^> ^lines = m_sData->Split('\n');
646
						if ( lines )
646
						if ( lines )
647
						{
647
						{
648
							 Utils::String version;
648
							 Utils::WString version;
649
							 Utils::String file;
649
							 Utils::WString file;
650
							 for ( int i = 0; i < lines->Length; i++ )
650
							 for ( int i = 0; i < lines->Length; i++ )
651
							 {
651
							 {
652
								 Utils::String l = _S(lines[i]).remove(9).remove('\r');
652
								 Utils::WString l = _WS(lines[i]).remove(9).remove('\r');
653
								 //if ( !l.IsIn(":") ) continue;
653
								 //if ( !l.IsIn(":") ) continue;
654
								 Utils::String first = l.token(":", 1);
654
								 Utils::WString first = l.token(L":", 1);
655
								 if ( first.Compare("Version") )
655
								 if ( first.Compare(L"Version") )
656
									 version = l.tokens(":", 2).removeFirstSpace();
656
									 version = l.tokens(L":", 2).removeFirstSpace();
657
								 else if ( first.Compare("File") )
657
								 else if ( first.Compare(L"File") )
658
									 file = l.tokens(":", 2).removeFirstSpace();
658
									 file = l.tokens(L":", 2).removeFirstSpace();
659
							 }
659
							 }
660
 
660
 
661
							 if ( !version.empty() && !file.empty() )
661
							 if ( !version.empty() && !file.empty() )
662
							 {
662
							 {
663
								 int error = this->CheckFile(address + "/" + _US(file));
663
								 int error = this->CheckFile(address + "/" + _US(file));
Line 765... Line 765...
765
				if ( backgroundWorker2->CancellationPending )
765
				if ( backgroundWorker2->CancellationPending )
766
					return;
766
					return;
767
 
767
 
768
				System::String ^dir = GetDestiantion();
768
				System::String ^dir = GetDestiantion();
769
				dir += "\\Downloads";
769
				dir += "\\Downloads";
770
				String ^file = dir + "\\" + _US(CFileIO(_S(m_pCurrentItem->SubItems[5]->Text)).filename().remove('\r').remove(9));
770
				String ^file = dir + "\\" + _US(CFileIO(_WS(m_pCurrentItem->SubItems[5]->Text)).filename().remove('\r').remove(9));
771
 
771
 
772
				__int64 maxSize = res->ContentLength;
772
				__int64 maxSize = res->ContentLength;
773
				__int64 curSize = 0;
773
				__int64 curSize = 0;
774
 
774
 
775
				System::IO::FileStream ^writeStream = nullptr;
775
				System::IO::FileStream ^writeStream = nullptr;
Line 842... Line 842...
842
			}
842
			}
843
			else
843
			else
844
			{
844
			{
845
				System::String ^dir = GetDestiantion();
845
				System::String ^dir = GetDestiantion();
846
				dir += "\\Downloads";
846
				dir += "\\Downloads";
847
				String ^file = dir + "\\" + _US(CFileIO(_S(m_pCurrentItem->SubItems[5]->Text)).filename().remove('\r').remove(9));
847
				String ^file = dir + "\\" + _US(CFileIO(_WS(m_pCurrentItem->SubItems[5]->Text)).filename().remove('\r').remove(9));
848
 
848
 
849
				 if ( IO::File::Exists(file) )
849
				 if ( IO::File::Exists(file) )
850
				 {
850
				 {
851
					 m_pCurrentItem->SubItems[3]->Text = "Ready to Install";
851
					 m_pCurrentItem->SubItems[3]->Text = "Ready to Install";
852
					 m_pCurrentItem->SubItems[5]->Text = file;
852
					 m_pCurrentItem->SubItems[5]->Text = file;