Tratamento do download da lista de sinais

O download da lista, agora, antecede o download e a extração dos pacotes de sinais.

Tratamento do download da lista de sinais
O download da lista, agora, antecede o download e a extração dos pacotes de sinais.
MoraesCaio
1 parent 2fc2bf65
Showing 5 changed files with 34 additions and 17 deletions Show diff stats
.gitignore
AU.csproj
AU.csproj.user
BundlesManager.cs
Program.cs
@@ -19,6 +19,7 @@ $RECYCLE.BIN/
 # pastas a serem ignoradas
 */
+*.zip
 # excecoes, adicionar: !foo/
 !Properties/
@@ -12,7 +12,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <IsWebBootstrapper>true</IsWebBootstrapper>
-    <PublishUrl>C:\Users\Caio Moraes\Documents\AU\release\</PublishUrl>
+    <PublishUrl>C:\Users\CaioMoraes\Documents\AU\release\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Web</InstallFrom>
     <UpdateEnabled>true</UpdateEnabled>
@@ -22,14 +22,14 @@
     <UpdatePeriodically>false</UpdatePeriodically>
     <UpdateRequired>true</UpdateRequired>
     <MapFileExtensions>false</MapFileExtensions>
-    <InstallUrl>http://atualizacao.vlibras.lavid.ufpb.br/windows/</InstallUrl>
-    <UpdateUrl>http://atualizacao.vlibras.lavid.ufpb.br/windows/</UpdateUrl>
+    <InstallUrl>http://150.165.205.193:8080/</InstallUrl>
+    <UpdateUrl>http://150.165.205.193:8080/</UpdateUrl>
     <ProductName>Atualizador VLibras</ProductName>
     <PublisherName>LAVID-UFPB</PublisherName>
     <MinimumRequiredVersion>5.0.0.0</MinimumRequiredVersion>
     <OpenBrowserOnPublish>false</OpenBrowserOnPublish>
     <TrustUrlParameters>true</TrustUrlParameters>
-    <ApplicationRevision>3</ApplicationRevision>
+    <ApplicationRevision>20</ApplicationRevision>
     <ApplicationVersion>5.0.0.%2a</ApplicationVersion>
     <UseApplicationTrust>true</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
@@ -99,7 +99,9 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="BundlesManager.cs" />
+    <Compile Include="BundlesManager.cs">
+      <SubType>Component</SubType>
+    </Compile>
     <Compile Include="Form1.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -154,10 +156,10 @@
       <Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
       <Visible>false</Visible>
     </Content>
-    <Content Include="$(SolutionDir)requisitos\**\*">
+    <!--     <Content Include="$(SolutionDir)requisitos\**\*">
       <Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
       <Visible>false</Visible>
-    </Content>
+    </Content> -->
     <Content Include="icon_vlibras.ico" />
   </ItemGroup>
   <ItemGroup>
 <?xml version="1.0" encoding="Windows-1252"?>
 <Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <PublishUrlHistory>C:\Users\Caio Moraes\Documents\AU\release\|http://150.165.205.137:8000/|\\localhost\testeDeAU\|System.Deployment.Application.SystemNetDownloader.DownloadSingleFile%28DownloadQueueItem next%29\|C:\Users\Caio Moraes\Documents\AU\release\publish.htm\</PublishUrlHistory>
-    <InstallUrlHistory>http://atualizacao.vlibras.lavid.ufpb.br/windows/|http://150.165.205.37/windows/|http://179.185.184.75:8080/|http://179.185.184.75:8080/163.172./|http://150.165.205.137:8080/</InstallUrlHistory>
+    <PublishUrlHistory>C:\Users\CaioMoraes\Documents\AU\release\|C:\Users\Rebecca\Documents\AU\release\|C:\Users\Caio Moraes\Documents\AU\release\|http://150.165.205.137:8000/|\\localhost\testeDeAU\</PublishUrlHistory>
+    <InstallUrlHistory>http://150.165.205.193:8080/|http://177.133.106.152:8089/|http://177.133.106.152:8080/|http://192.168.25.121:8089/|http://192.168.26.121:8089/</InstallUrlHistory>
     <SupportUrlHistory />
-    <UpdateUrlHistory>http://150.165.205.37/windows/|http://179.185.184.75:8080/|http://150.165.205.137:8080/|http://150.165.205.101:8080/|http://179.185.189.177:8080/</UpdateUrlHistory>
+    <UpdateUrlHistory>http://150.165.205.193:8080/|http://177.133.106.152:8089/|http://192.168.25.121:8089/|http://192.168.26.121:8089/|http://127.0.0.1:8000/</UpdateUrlHistory>
     <BootstrapperUrlHistory />
     <ErrorReportUrlHistory />
     <FallbackCulture>pt-BR</FallbackCulture>
@@ -159,11 +159,16 @@ namespace AtualizadorVLibras{
         }*/
         public static void DownloadFileIfNewer(string remote, string local, string fileName){
-            if(RemoteFileExists(remote+fileName) && (!File.Exists(local+fileName) || RemoteIsNewerThanLocal(remote+fileName, local+fileName))){
-                DownloadFileToPath(remote+fileName, local+fileName);
-                if(File.Exists(local+fileName.Remove(fileName.Length-4))){
-                    File.Delete(local+fileName.Remove(fileName.Length-4));
+            try{
+                if(RemoteFileExists(remote+fileName) && (!File.Exists(local+fileName) || RemoteIsNewerThanLocal(remote+fileName, local+fileName))){
+                    DownloadFileToPath(remote+fileName, local+fileName);
+                    if(File.Exists(local+fileName.Remove(fileName.Length-4))){
+                        File.Delete(local+fileName.Remove(fileName.Length-4));
+                    }
                 }
+            }catch(Exception e){
+                Console.WriteLine("Aconteceu um erro no download: "+e);
+                Console.ReadKey();
             }
         }
         public static void ExtractZip(string remote, string local, string extractPath, string fileName){
@@ -37,8 +37,10 @@ namespace AtualizadorVLibras
         {
             //ENDEREÇO DE ONDE SERÃO BAIXADOS OS PACOTES (.ZIP) DE SINAIS (1.ZIP, 2.ZIP E ETC...)
             //string url = @"http://atualizacao.vlibras.lavid.ufpb.br/windows/";
-            //string url = @"http://127.0.0.1:8000/";
-            string url = @"http://192.168.25.121:8089/";
+            //string url = @"http://127.0.0.1:8000/"; //localhost
+            //string url = @"http://192.168.25.121:8089/"; //local: notebook bk
+            string url = @"http://150.165.205.148:8080/";
+            //string url = @"http://177.133.106.152:8089/";
             //string url = @"http://179.185.184.75:8080/";
             string dirAtual = Directory.GetCurrentDirectory();
@@ -234,6 +236,14 @@ namespace AtualizadorVLibras
             //DOWNLOAD DOS SINAIS
+            Console.WriteLine("Baixando lista de sinais");
+            try{
+	            BundlesManager.DownloadListaSinais(url);
+            }catch(Exception e){
+            	Console.WriteLine("Erro no download da lista de sinais.\n{0}\nAperte alguma tecla para continuar.",e);
+            	Console.ReadKey();
+            }
+
             //BAIXA OS ZIPS DOS SINAIS (1.ZIP, 2.ZIP E ETC...)
             extractPath = @"..\Bundles\";
             int qtdDeBundles = 0;
@@ -251,7 +261,6 @@ namespace AtualizadorVLibras
             Console.WriteLine("Extraindo pacote de sinais.");
             //try{
             BundlesManager.ExtractBundlesPackagesOverWrite(url, rootPath, extractPath, qtdDeBundles);
-            BundlesManager.DownloadListaSinais(url);
             /*}catch(Exception e){
                 Console.WriteLine("Erro na extração: {0}", e);
                 Console.ReadKey();
	@@ -19,6 +19,7 @@ $RECYCLE.BIN/		@@ -19,6 +19,7 @@ $RECYCLE.BIN/
19		19
20	# pastas a serem ignoradas	20	# pastas a serem ignoradas
21	*/	21	*/
		22	+*.zip
22	# excecoes, adicionar: !foo/	23	# excecoes, adicionar: !foo/
23	!Properties/	24	!Properties/
24		25