Re-implemented nano-second opt-in in fusepy, changed loggedfs-python accordingly.

Author: s-m-e

.travis.yml

@@ -34,8 +34,8 @@ language: python
 
 # Python version
 python:
-#  - "3.4"
-#  - "3.5"
+  - "3.4"
+  - "3.5"
   - "3.6"
 
 # Install dependencies

src/loggedfs/cli.py

@@ -114,8 +114,8 @@ def proc_filter_list(in_list):
 	config_dict = OrderedDict({
 		'@logEnabled': True,
 		'@printProcessName': True,
-		'includes': [],
-		'excludes': []
+		'includes': {},
+		'excludes': {}
 		})
 
 	config_file = None
@@ -125,7 +125,7 @@ def proc_filter_list(in_list):
 		config_fh.close()
 
 	for f_type in ['includes', 'excludes']:
-		config_dict[f_type] = proc_filter_list(config_dict[f_type][f_type[:-1]])
+		config_dict[f_type] = proc_filter_list(config_dict[f_type].get(f_type[:-1], None))
 
 	return {
 		'log_includes': config_dict['includes'],

src/loggedfs/core.py

@@ -42,14 +42,18 @@
 import sys
 import time
 
-import fuse
 from fuse import (
 	FUSE,
 	fuse_get_context,
 	FuseOSError,
-	Operations
+	Operations,
+	UTIME_NOW,
+	UTIME_OMIT
 	)
-
+try:
+	from fuse import __features__ as fuse_features
+except ImportError:
+	fuse_features = {}
 
 # +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 # ROUTINES
@@ -260,10 +264,16 @@ def match_filter(f_path, f_uid, f_action, f_status):
 class loggedfs: # (Operations):
 
 
-	WITH_NANOSECOND_INT = True
 	flag_utime_omit_ok = 1
 
 
+	requested_features = {
+		'nanosecond_int': True,
+		'utime_omit_none': True,
+		'utime_now_auto': True
+		}
+
+
 	def __init__(self,
 		directory,
 		log_includes = [],
@@ -297,7 +307,13 @@ def __init__(self,
 
 		self.logger.info(log_configmsg)
 
-		self.flag_nanosecond_int = hasattr(self, 'WITH_NANOSECOND_INT') and hasattr(fuse, 'NANOSECOND_INT_AVAILABLE')
+		for flag_name in self.requested_features.keys():
+			setattr(
+				self,
+				'flag_' + flag_name,
+				self.requested_features[flag_name] and fuse_features.get(flag_name, False)
+				)
+
 		self.st_fields = [i for i in dir(os.stat_result) if i.startswith('st_')]
 		self.stvfs_fields = [i for i in dir(os.statvfs_result) if i.startswith('f_')]
 
@@ -606,15 +622,12 @@ def unlink(self, path):
 	@__log__(format_pattern = '{0}', abs_path_fields = [0])
 	def utimens(self, path, times = None):
 
-		UTIME_OMIT = (1 << 30) - 2
-		UTIME_NOW = (1 << 30) - 1
-
 		def _fix_time_(atime, mtime):
-			if UTIME_OMIT in (atime, mtime):
+			if any(val in (atime, mtime) for val in [UTIME_OMIT, None]):
 				st = os.lstat(relpath, dir_fd = self.root_path_fd)
-				if atime == UTIME_OMIT:
+				if atime in [UTIME_OMIT, None]:
 					atime = st.st_atime_ns
-				if mtime == UTIME_OMIT:
+				if mtime in [UTIME_OMIT, None]:
 					mtime = st.st_mtime_ns
 			if UTIME_NOW in (atime, mtime):
 				now = int(time.time() * 10**9)