refactor API

pgdurand · Feb 11, 2022 · 09f3514 · 09f3514
1 parent d01e38f
commit 09f3514
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 6 deletions.
diff --git a/src/bzh/plealog/dbmirror/fetcher/DBMSFile.java b/src/bzh/plealog/dbmirror/fetcher/DBMSFile.java
@@ -92,7 +92,7 @@ public long getEpochStamp() {
     return fTimeStamp;
   }
 
-  public File getFile() {
+  public File getRemoteFile() {
     if (fRepr==null) {
       fRepr = new File(EZFileUtils.terminatePath(remoteDir)+fName);
     }

diff --git a/src/bzh/plealog/dbmirror/fetcher/PAsperaLoader.java b/src/bzh/plealog/dbmirror/fetcher/PAsperaLoader.java
@@ -1,4 +1,4 @@
-/* Copyright (C) 2019 Patrick G. Durand
+/* Copyright (C) 2019-2022 Patrick G. Durand
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU Affero General Public License as published by
@@ -60,6 +60,11 @@ public String getWorkerBaseName() {
 		return ASPC_WORKER;
 	}
 
+  @Override
+  public Log getLogger() {
+    return LOGGER;
+  }
+
   @Override
 	public void closeLoader() {
 	  //nothing to do

diff --git a/src/bzh/plealog/dbmirror/fetcher/PFTPLoader.java b/src/bzh/plealog/dbmirror/fetcher/PFTPLoader.java
@@ -1,4 +1,4 @@
-/* Copyright (C) 2007-2020 Patrick G. Durand
+/* Copyright (C) 2007-2022 Patrick G. Durand
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU Affero General Public License as published by
@@ -87,7 +87,9 @@ public PFTPLoader(int id) {
   public String getLoaderId() {
     return _loaderId;
   }
-
+  public Log getLogger() {
+    return LOGGER;
+  }
   public String getWorkerBaseName() {
 	  return FTP_WORKER;
   }

diff --git a/src/bzh/plealog/dbmirror/fetcher/PHTTPLoader.java b/src/bzh/plealog/dbmirror/fetcher/PHTTPLoader.java
@@ -62,6 +62,11 @@ public boolean readyToDownload() {
     return true;
   }
 
+  @Override
+  public Log getLogger() {
+    return LOGGER;
+  }
+
   @Override
   public boolean prepareLoader(DBServerConfig fsc) {
 	  url_base = fsc.getFTPAternativeProtocol();

diff --git a/src/bzh/plealog/dbmirror/fetcher/PLocalLoader.java b/src/bzh/plealog/dbmirror/fetcher/PLocalLoader.java
@@ -310,7 +310,7 @@ public int copyFiles(List<DBMSFile> files, String destDir, LoaderMonitor monitor
           msg = "Skip already copyied file: " + fName;
         }
         else{
-          input = new FileInputStream(file.getFile());
+          input = new FileInputStream(file.getRemoteFile());
           output = new FileOutputStream(destDir + file.getName());
           fSize = file.getSize();
           Util.copyStream(input, output, Util.DEFAULT_COPY_BUFFER_SIZE, fSize,
@@ -336,7 +336,7 @@ public int copyFiles(List<DBMSFile> files, String destDir, LoaderMonitor monitor
       } catch (Exception e) {
         result = 0;
         LoggerCentral.error(LOGGER,
-            e.getMessage() + ": " + file.getFile().getAbsolutePath());
+            e.getMessage() + ": " + file.getRemoteFile().getAbsolutePath());
         if (monitor != null)
           monitor.doneLoading(fName, LoaderMonitor.STATUS_FAILURE);
         if (_userMonitor != null) {