Commit 410dc619 authored by MAISSIAT's avatar MAISSIAT
Browse files

Fix #67: rename the project to eo-dataflow-manager

parent 6d3e9ff4
......@@ -8,7 +8,7 @@
# Hist : 2018/11/19 Removing explicit path names
#
from downloader.scheduler.sc.IDataReader import IDataReader
from eo_dataflow_manager.scheduler.sc.IDataReader import IDataReader
import logging
import datetime
......
......@@ -9,7 +9,7 @@ from datetime import datetime, timedelta
from eccodes import *
from downloader.scheduler.sc.IDataReader import IDataReader
from eo_dataflow_manager.scheduler.sc.IDataReader import IDataReader
class GribDataReader(IDataReader):
......
......@@ -7,7 +7,7 @@
#
from downloader.scheduler.sc.IDataReader import IDataReader
from eo_dataflow_manager.scheduler.sc.IDataReader import IDataReader
import logging
import datetime
......
......@@ -4,7 +4,7 @@
#!/usr/bin/env python
from downloader.scheduler.sc.IDataReader import IDataReader
from eo_dataflow_manager.scheduler.sc.IDataReader import IDataReader
import logging
import datetime
......
......@@ -33,7 +33,7 @@ def ListingBuilderFactory(classname, loggerName):
# Try to import the modules "classname"
try:
tmpModule = my_import(
"downloader.scheduler.plugins.ListingBuilder." + classname)
"eo_dataflow_manager.scheduler.plugins.ListingBuilder." + classname)
except ModuleNotFoundError as e:
# Try without appending the "scheduler.sc.ListingBuilder" strings
logging.exception(e)
......@@ -77,10 +77,10 @@ def DataReaderFactory(
# Try to import the modules "classname"
try:
tmpModule = my_import(
"downloader.scheduler.plugins.DataReader." + classname)
"eo_dataflow_manager.scheduler.plugins.DataReader." + classname)
except BaseException:
# Try without appending the
# "downloader.scheduler.plugins.DataReader" strings
# "eo_dataflow_manager.scheduler.plugins.DataReader" strings
try:
tmpModule = my_import(classname)
except BaseException:
......
......@@ -2,8 +2,8 @@
# -*- coding: UTF-8 -*-
#
from downloader.scheduler.sc.IListingBuilder import IListingBuilder
from downloader.scheduler.com.sys.File import File
from eo_dataflow_manager.scheduler.sc.IListingBuilder import IListingBuilder
from eo_dataflow_manager.scheduler.com.sys.File import File
import os
import logging
......@@ -162,7 +162,7 @@ class DCheckReportListingBuilder(IListingBuilder):
def setDReportConfiguration(self, listing_mode):
plugins_config_path = self.__download.globalConfig.getPath("dynamic_plugins")
dreport_config_name = "dreport_" + listing_mode + "_files"
dreport_config_name = "dreport_" + listing_mode + "_files_v7"
plugin_filename = os.path.join(plugins_config_path, dreport_config_name + ".py")
......@@ -418,7 +418,7 @@ class DCheckReportListingBuilder(IListingBuilder):
def __runDCheckReport(self, command):
# On verifie que le fichier de conf existe bien, sinon dcheck peut s'executer sans erreur, et sans le fichier de conf...
# 28/02/2018 PMT : ajout du mode debug
if command == 'downloader-dcheck':
if command == 'eo-dataflow-manager-dcheck':
argsList = [
self.__base_url,
"-d",
......@@ -434,7 +434,7 @@ class DCheckReportListingBuilder(IListingBuilder):
raise Exception(
"dcheck error : config file does not exists : %s" %
(self.__dcheck_config))
elif command == 'downloader-dreport':
elif command == 'eo-dataflow-manager-dreport':
# TODO : gicler le ignore config differences !? (necessite
# probablemnet une correctoin du dreport ?)
argsList = [
......@@ -524,7 +524,7 @@ class DCheckReportListingBuilder(IListingBuilder):
# Set dcheck args/options and run it !
try:
self.__runDCheckReport('downloader-dcheck')
self.__runDCheckReport('eo-dataflow-manager-dcheck')
except Exception as e:
self._log.exception(e)
raise Exception(
......@@ -534,15 +534,15 @@ class DCheckReportListingBuilder(IListingBuilder):
try:
# Gestion du fichier timestamp : pour eviter qu'un fichier timestamp ne soit utilise, alors qu'il y a eu
# un probleme apres la generation du listing precedent (exemple : ouverture du rapport et renvoie de la liste
# au downloader), qui fait que le downloader n'aurait pas pris en compte le rapport, le timestamp utilise par
# au eo-dataflow-manager), qui fait que le eo-dataflow-manager n'aurait pas pris en compte le rapport, le timestamp utilise par
# le dreport est un fichier .tmp. Le vrai timestamp est recopie en .tmp avant l'appel du dreport, et est
# renomme lors du ackListingStorage. Ainsi, tant que le downloader n'a pas valide la bonne reception du listing
# renomme lors du ackListingStorage. Ainsi, tant que le eo-dataflow-manager n'a pas valide la bonne reception du listing
# le dreport continuera d'utiliser le meme timestamp
# fabrication du listing dreport a partir de la base de donnees
self.__runDCheckReport('downloader-dreport')
self.__runDCheckReport('eo-dataflow-manager-dreport')
# lecture du listing dreport, pour renvoyer au downloader la liste
# lecture du listing dreport, pour renvoyer au eo-dataflow-manager la liste
# des fichiers du nouveau listing
f = open(self.__dreport_output)
lines = f.readlines()
......@@ -550,7 +550,7 @@ class DCheckReportListingBuilder(IListingBuilder):
except Exception as e:
self._log.exception(e)
raise Exception(
"DReport error => no listing to return to downloader (%s)" %
"DReport error => no listing to return to eo-dataflow-manager (%s)" %
(str(e)))
# Analyse des lignes, pour recupere les erreurs et ignorer les
......@@ -566,7 +566,7 @@ class DCheckReportListingBuilder(IListingBuilder):
if len(error_lines) > 0:
raise Exception(
"DReport : report contains anomalies => do not return listing to downloader. Errors : %s" %
"DReport : report contains anomalies => do not return listing to eo-dataflow-manager. Errors : %s" %
(str(error_lines)))
return listing
......
from dchecktools.reports import Report_ListFiles
from eo_dataflow_manager.dchecktools.reports import Report_ListFiles
REPORT = Report_ListFiles.Report_ListFiles()
REPORT.display_titles = True
......
from eo_dataflow_manager.dchecktools.reports import Report_ListFiles
REPORT = Report_ListFiles.Report_ListFiles()
REPORT.display_titles = True
REPORT.display_unmodified_files = False
REPORT.display_removed_files = False
REPORT.display_created_files = True
REPORT.display_modified_files = True
REPORT.check_infos = ['size', 'mtime', 'sensingtime'] # to get modified files
REPORT.report_infos = ['size', 'mtime'] # to get file size and file modification date
# ignoring all directories informations
REPORT.ignoreUnModifiedDirectories = True
REPORT.ignoreModifiedDirectories = True
REPORT.ignoreCreatedDirectories = True
REPORT.ignoreRemovedDirectories = True
from dchecktools.reports import Report_ListFiles
from eo_dataflow_manager.dchecktools.reports import Report_ListFiles
REPORT = Report_ListFiles.Report_ListFiles()
REPORT.display_titles = True
......
from eo_dataflow_manager.dchecktools.reports import Report_ListFiles
REPORT = Report_ListFiles.Report_ListFiles()
REPORT.display_titles = True
REPORT.display_unmodified_files = False
REPORT.display_removed_files = True
REPORT.display_created_files = True
REPORT.display_modified_files = False
REPORT.check_infos = ['size', 'mtime', 'sensingtime'] # to get modified files
# to get file size and file modification date
REPORT.report_infos = ['size', 'mtime']
# ignoring all directories informations
REPORT.ignoreUnModifiedDirectories = True
REPORT.ignoreModifiedDirectories = True
REPORT.ignoreCreatedDirectories = True
REPORT.ignoreRemovedDirectories = True
......@@ -9,7 +9,7 @@ import json
from ifr_lib.ifr_yaml import YamlConfig
"""
from downloader.scheduler.com.ext.XMLReader import XMLReader
from eo-dataflow-manager.scheduler.com.ext.XMLReader import XMLReader
from xml.parsers.expat import ExpatError
"""
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment