Skip to content

Commit

Permalink
Erro ao Compilar no Linux e Problema ao Logar Erros, por falta uso de…
Browse files Browse the repository at this point in the history 
… Índice não existente (#9)

* do not use String.Format
* be linux friendly
  • Loading branch information
@lucassabreu
lucassabreu authored Jun 28, 2019
1 parent d93fa6b commit 0f8bffd
Show file tree
Hide file tree
Showing 8 changed files with 132 additions and 172 deletions.
20 changes: 3 additions & 17 deletions LattesExtractor/Controller/CurriculumVitaeProcessorController.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,7 @@ private void ProcessCurriculumVitae(CurriculoEntry curriculoEntry, ManualResetEv
curriculoEntry.NomeProfessor = curriculumVitae.DADOSGERAIS.NOMECOMPLETO;

var professorDAOService = new ProfessorDAOService(new LattesDatabase());
Logger.Debug(String.Format(
"Iniciando processamento currículo {0} do Professor {1}...",
curriculoEntry.NumeroCurriculo,
curriculumVitae.DADOSGERAIS.NOMECOMPLETO
));
Logger.Debug($"Iniciando processamento currículo {curriculoEntry.NumeroCurriculo} do Professor {curriculumVitae.DADOSGERAIS.NOMECOMPLETO}...");

if (professorDAOService.ProcessCurriculumVitaeXML(curriculumVitae, curriculoEntry))
{
Expand All @@ -86,23 +82,13 @@ private void ProcessCurriculumVitae(CurriculoEntry curriculoEntry, ManualResetEv
}
catch (Exception ex)
{
Logger.Error(String.Format(
"Erro durante a leitura do XML {0}: {1}\n{2}",
curriculoEntry.NumeroCurriculo,
ex.Message,
ex.StackTrace
));
Logger.Error($"Erro durante a leitura do XML {curriculoEntry.NumeroCurriculo}: {ex.Message}\n{ex.StackTrace}");

int sequencia = 1;
while (ex.InnerException != null)
{
ex = ex.InnerException;
Logger.Error(String.Format(
"Excessão Interna [{0}]: {1}\n{2}",
sequencia++,
ex.Message,
ex.StackTrace
));
Logger.Error($"Excessão Interna [{sequencia++}]: {ex.Message}\n{ex.StackTrace}");
}
}
finally
Expand Down
31 changes: 10 additions & 21 deletions LattesExtractor/Controller/DownloadFromRestServiceCurriculumVitaeController.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public void DownloadUpdatedCurriculums(ManualResetEvent doneEvent)
{
doneEvent.Set();
}
Logger.Info(String.Format("Download terminou"));
Logger.Info("Download terminou");
}
}

Expand Down Expand Up @@ -100,40 +100,33 @@ private void DownloadCurriculumVitae(RetryMessage retryMessage, ManualResetEvent

if (response.CodRhCript == null || response.CodRhCript.Trim().Length == 0)
{
Logger.Error(String.Format(
"Não foi possível baixar o currículo de número {0}",
curriculumVitae.NumeroCurriculo
));
Logger.Error($"Não foi possível baixar o currículo de número {curriculumVitae.NumeroCurriculo}");
return;
}

curriculumVitae.NomeProfessor = response.Document.NomeCompleto;

if (NeedsToBeUpdated(curriculumVitae, response) == false)
{
Logger.Info(String.Format("Currículo {0} - {1} já esta atualizado.", curriculumVitae.NumeroCurriculo, curriculumVitae.NomeProfessor));
Logger.Info($"Currículo {curriculumVitae.NumeroCurriculo} - {curriculumVitae.NomeProfessor} já esta atualizado.");
return;
}

DownloadXml(curriculumVitae, response, wc);

if (curriculumVitae.NomeProfessor == null || curriculumVitae.NomeProfessor.Trim().Length == 0)
{
Logger.Info(String.Format("Curriculo {0} baixado", curriculumVitae.NumeroCurriculo));
Logger.Info($"Curriculo {curriculumVitae.NumeroCurriculo} baixado");
return;
}

Logger.Info(String.Format("Curriculo {0} - {1} baixado", curriculumVitae.NumeroCurriculo, curriculumVitae.NomeProfessor));
Logger.Info($"Curriculo {curriculumVitae.NumeroCurriculo} - {curriculumVitae.NomeProfessor} baixado");
}
catch (WebException exception)
{
Logger.Error(String.Format(
"Erro ao realizar requisão do Currículo {2} (Tentativas Sobrando {3}): {0}\n{1}",
exception.Message,
exception.StackTrace,
curriculumVitae.NumeroCurriculo,
retryMessage.PendingRetries
));
Logger.Error(
$"Erro ao realizar requisão do Currículo {curriculumVitae.NumeroCurriculo} (Tentativas Sobrando {retryMessage.PendingRetries}): {exception.Message}\n{exception.StackTrace}"
);
retryMessage.PendingRetries--;
if (retryMessage.PendingRetries > 0)
{
Expand All @@ -156,11 +149,7 @@ private void DownloadCurriculumVitae(RetryMessage retryMessage, ManualResetEvent
private void DownloadXml(CurriculoEntry curriculumVitae, MetadataResponse response, WebClient wc)
{
var link = String.Format(_urlDownloadXml, response.CodRhCript);
Logger.Debug(String.Format(
"Currículo {0} marcado para download ({1})...",
curriculumVitae.NumeroCurriculo,
link
));
Logger.Debug($"Currículo {curriculumVitae.NumeroCurriculo} marcado para download ({link})...");
var stream = wc.OpenRead(link);

if (File.Exists(_lattesModule.GetCurriculumVitaeFileName(curriculumVitae.NumeroCurriculo)))
Expand Down Expand Up @@ -197,7 +186,7 @@ private bool NeedsToBeUpdated(CurriculoEntry curriculumVitae, MetadataResponse r
}

var dataAtualizacaoLattes = DateTime.ParseExact(
String.Format("{0} {1}", response.Document.DataAtualizacao, horaAtualizacao),
$"{response.Document.DataAtualizacao} {horaAtualizacao}",
"ddMMyyyy %Hmmss",
null
);
Expand Down
18 changes: 5 additions & 13 deletions LattesExtractor/Controller/DownloadFromWebServiceCurriculumVitaeController.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public void DownloadUpdatedCurriculums(ManualResetEvent doneEvent)
finally
{
doneEvent.Set();
Logger.Info(String.Format("Download terminou"));
Logger.Info("Download terminou");
}
}

Expand All @@ -53,10 +53,7 @@ private void DownloadCurriculumVitae(CurriculoEntry curriculumVitae)
{
if (curriculumVitae.NumeroCurriculo == null || curriculumVitae.NumeroCurriculo.Trim().Length == 0)
{
Logger.Error(String.Format(
"O número do curríuculo Lattes do professor {0} não foi encontrado",
curriculumVitae.NomeProfessor
));
Logger.Error($"O número do curríuculo Lattes do professor {curriculumVitae.NomeProfessor} não foi encontrado");
return;
}

Expand Down Expand Up @@ -88,20 +85,15 @@ private void DownloadCurriculumVitae(CurriculoEntry curriculumVitae)

if (curriculumVitae.NomeProfessor == null || curriculumVitae.NomeProfessor.Trim().Length == 0)
{
Logger.Info(String.Format("Curriculo {0} baixado", curriculumVitae.NumeroCurriculo));
Logger.Info($"Curriculo {curriculumVitae.NumeroCurriculo} baixado");
return;
}

Logger.Info(String.Format("Curriculo {0} - {1} baixado", curriculumVitae.NumeroCurriculo, curriculumVitae.NomeProfessor));
Logger.Info($"Curriculo {curriculumVitae.NumeroCurriculo} - {curriculumVitae.NomeProfessor} baixado");
}
catch (Exception exception)
{
Logger.Error(String.Format(
"Erro ao buscar o currículo {0}, mensagem: {1}\n{2}",
curriculumVitae.NumeroCurriculo,
exception.Message,
exception.StackTrace
));
Logger.Error($"Erro ao buscar o currículo {curriculumVitae.NumeroCurriculo}, mensagem: {exception.Message}\n{exception.StackTrace}");
}
}
}
Expand Down
11 changes: 3 additions & 8 deletions LattesExtractor/Controller/ImportCurriculumVitaeFromFolderController.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,13 @@ public void LoadCurriculums(ManualResetEvent doneEvent)
{
if (!Directory.Exists(_importFolder))
{
Logger.Info(String.Format("Pasta de trabalho não foi encontrado ({0})", _importFolder));
Logger.Info($"Pasta de trabalho não foi encontrado ({_importFolder})");
return;
}

if (Directory.GetFiles(_importFolder).Length == 0)
{
throw new Exception(String.Format("Não foram encontrados currículos na pasta {0} !", _importFolder));
throw new Exception($"Não foram encontrados currículos na pasta {_importFolder} !");
}

var unzipDoneEvent = new ManualResetEvent(false);
Expand Down Expand Up @@ -100,12 +100,7 @@ private void UnzipAndCopy(ManualResetEvent doneEvent, string filename, Curriculo
}
catch (ZipException exception)
{
Logger.Error(String.Format(
"Erro ao importar currículo {2}: {0}\n{1}",
exception.Message,
exception.StackTrace,
curriculumVitae.NumeroCurriculo
));
Logger.Error($"Erro ao importar currículo {curriculumVitae.NumeroCurriculo}: {exception.Message}\n{exception.StackTrace}");
}
finally
{
Expand Down
Loading

0 comments on commit 0f8bffd

Please sign in to comment.