From 1d3f925a1c162ef3b4da8718ed9f715e99ec490d Mon Sep 17 00:00:00 2001
From: "benjamin.jakimow@geo.hu-berlin.de" <q8DTkxUg-BB>
Date: Mon, 20 Mar 2017 18:11:54 +0100
Subject: [PATCH] added DEBUG added logging removed "findAbsolutePath"
---
timeseriesviewer/__init__.py | 43 +++++++++++++++++++--------------
timeseriesviewer/ui/__init__.py | 5 ++--
2 files changed, 28 insertions(+), 20 deletions(-)
diff --git a/timeseriesviewer/__init__.py b/timeseriesviewer/__init__.py
index 0a11a96d..4cb40a32 100644
--- a/timeseriesviewer/__init__.py
+++ b/timeseriesviewer/__init__.py
@@ -1,7 +1,25 @@
import os, sys, fnmatch, site
-import six
+import six, logging
+logger = logging.getLogger(__name__)
+
from PyQt4.QtCore import QSettings
from PyQt4.QtGui import QIcon
+
+DEBUG = True
+if DEBUG:
+ #initiate loggers for all pyfiles
+ import pkgutil
+ DIR = os.path.dirname(__file__)
+ for m, name, ispkg in pkgutil.walk_packages(path=DIR, prefix='timeseriesviewer'):
+ logger = logging.getLogger(name)
+ logger.setLevel(logging.DEBUG)
+ fh = logging.StreamHandler()
+ fh_formatter = logging.Formatter('%(levelname)s %(lineno)d:%(filename)s%(module)s %(funcName)s \n\t%(message)s')
+ fh.setFormatter(fh_formatter)
+ fh.addFilter(logging.Filter(name))
+ logger.addHandler(fh)
+
+
jp = os.path.join
dn = os.path.dirname
mkdir = lambda p: os.makedirs(p, exist_ok=True)
@@ -35,11 +53,6 @@ def icon():
return QIcon(':/timeseriesviewer/icons/icon.png')
-def dprint(text, file=None):
- if DEBUG:
- six._print('DEBUG::{}'.format(text), file=file)
-
-
def file_search(rootdir, wildcard, recursive=False, ignoreCase=False):
assert rootdir is not None
if not os.path.isdir(rootdir):
@@ -58,20 +71,14 @@ def file_search(rootdir, wildcard, recursive=False, ignoreCase=False):
return results
-def findAbsolutePath(file):
- filepath, attr = getFileAndAttributes(file)
-
- if os.path.exists(filepath): return file
- possibleRoots = [DIR_EXAMPLES, DIR_REPO, os.getcwd()]
- for root in possibleRoots:
- tmp = jp(root, filepath)
- if os.path.exists(tmp):
- return tmp + attr
- return None
-
def getFileAndAttributes(file):
+ """
+ splits a GDAL valid file path into
+ :param file:
+ :return:
+ """
dn = os.path.dirname(file)
bn = os.path.basename(file)
bnSplit = bn.split(':')
- return os.path.join(dn,bn), ':'.join(bnSplit[1:])
\ No newline at end of file
+ return os.path.join(dn,bnSplit[0]), ':'.join(bnSplit[1:])
\ No newline at end of file
diff --git a/timeseriesviewer/ui/__init__.py b/timeseriesviewer/ui/__init__.py
index a1644e95..bac738e3 100644
--- a/timeseriesviewer/ui/__init__.py
+++ b/timeseriesviewer/ui/__init__.py
@@ -1,4 +1,5 @@
-import os, sys, six, importlib
+import os, sys, six, importlib, logging
+logger = logging.getLogger(__name__)
from PyQt4.QtCore import *
from PyQt4.QtXml import *
from PyQt4.QtGui import *
@@ -8,7 +9,7 @@ from PyQt4 import uic
#dictionary to store form classes. *.ui file name is key
FORM_CLASSES = dict()
-from timeseriesviewer import jp, DIR_UI, dprint
+from timeseriesviewer import jp, DIR_UI
def loadUIFormClass(pathUi, from_imports=False):
--
GitLab