Merge 236490c into c519c45

mikrosimage · Aug 20, 2019 · c5babee · c5babee
2 parents c519c45 + 236490c
commit c5babee
Show file tree

Hide file tree

Showing 9 changed files with 54 additions and 49 deletions.
diff --git a/src/sequenceParser/ItemStat.cpp b/src/sequenceParser/ItemStat.cpp
@@ -82,14 +82,14 @@ void ItemStat::setPermissions( const mode_t& protection )
 	otherCanExecute = protection & S_IXOTH;
 }
 
-void ItemStat::setUserName()
+void ItemStat::updateUserName()
 {
     passwd* user = getpwuid(userId);
     if(user && user->pw_name)
         userName = std::string(user->pw_name);
 }
 
-void ItemStat::setGroupName()
+void ItemStat::updateGroupName()
 {
     group* group = getgrgid(groupId);
     if(group && group->gr_name)
@@ -126,8 +126,8 @@ void ItemStat::statLink( const boost::filesystem::path& path )
 	// size on hard-drive (takes hardlinks into account)
 	sizeOnDisk = (statInfos.st_blocks / nbHardLinks) * statInfos.st_blksize;
 	setPermissions(statInfos.st_mode);
-	setUserName();
-	setGroupName();
+	updateUserName();
+	updateGroupName();
 #else
 	fullNbHardLinks = nbHardLinks = 1;
 #endif
@@ -161,8 +161,8 @@ void ItemStat::statFolder( const boost::filesystem::path& path )
 	maxSize = size;
 	sizeOnDisk = statInfos.st_blocks * statInfos.st_blksize;
 	setPermissions(statInfos.st_mode);
-	setUserName();
-	setGroupName();
+	updateUserName();
+	updateGroupName();
 #endif
 
 	// size (takes hardlinks into account)
@@ -197,8 +197,8 @@ void ItemStat::statFile( const boost::filesystem::path& path )
 	// size on hard-drive (takes hardlinks into account)
 	sizeOnDisk = (statInfos.st_blocks / nbHardLinks) * statInfos.st_blksize;
 	setPermissions(statInfos.st_mode);
-	setUserName();
-	setGroupName();
+	updateUserName();
+	updateGroupName();
 #endif
 
 	// size (takes hardlinks into account)
@@ -219,8 +219,8 @@ void ItemStat::statSequence( const Item& item, const bool approximative )
 	groupId = statInfos.st_gid;
 	accessTime = statInfos.st_atime;
 	setPermissions(statInfos.st_mode);
-	setUserName();
-	setGroupName();
+	updateUserName();
+	updateGroupName();
 #endif
 
 	modificationTime = 0;

diff --git a/src/sequenceParser/ItemStat.hpp b/src/sequenceParser/ItemStat.hpp
@@ -24,8 +24,10 @@ class ItemStat
 	void statLink( const boost::filesystem::path& path );
 #ifdef __UNIX__
 	void setPermissions( const mode_t& protection );
-	void setUserName();
-	void setGroupName();
+    /// @brief Update user name from filesystem
+	void updateUserName();
+    /// @brief Update group name from filesystem
+	void updateGroupName();
 #endif
 
 public:

diff --git a/src/sequenceParser/detail/analyze.cpp b/src/sequenceParser/detail/analyze.cpp
@@ -378,7 +378,7 @@ std::vector<Sequence> buildSequences( const boost::filesystem::path& directory,
 
 std::size_t decomposeFilename( const std::string& filename, FileStrings& stringParts, FileNumbers& numberParts, const EDetection& options )
 {
-	static const std::size_t max = std::numeric_limits<std::size_t>::digits10;
+	static const std::size_t max = std::numeric_limits<Time>::digits10;
 	std::string regex;
 	if( options & eDetectionNegative )
 	{

diff --git a/test/java/StatLibraryTestMain.java b/test/java/StatLibraryTestMain.java
@@ -30,6 +30,8 @@ private static void displayFolderContent(ItemStat itemStat) {
         System.out.println("Full Hard links : " + itemStat.getFullNbHardLinks());
         System.out.println("Hardlinks : " + itemStat.getNbHardLinks());
         System.out.println("Device : " + itemStat.getDeviceId());
+        System.out.println("Group : " + itemStat.getGroupName());
+        System.out.println("User : " + itemStat.getUserName());
     }
 }
 

diff --git a/tools/docker/centos6/Dockerfile b/tools/docker/centos6/Dockerfile
diff --git a/tools/docker/centos6/build.sh b/tools/docker/centos6/build.sh
diff --git a/tools/docker/centos7/Dockerfile b/tools/docker/centos7/Dockerfile
@@ -0,0 +1,29 @@
+FROM centos:7
+
+#Install dependencies
+RUN yum install -y wget cmake tar gcc gcc-c++ pcre-devel python-devel make zlib-devel bzip2-devel
+
+#Install boost
+RUN cd /opt/ && \ 
+    wget https://sourceforge.net/projects/boost/files/boost/1.55.0/boost_1_55_0.tar.gz && \
+    tar xzf boost_1_55_0.tar.gz && \
+    cd boost_1_55_0 && \
+    ./bootstrap.sh && \
+    ./b2 install --with=all && \
+    rm -rf boost_1_55_0.tar.gz && \
+    rm -rf boost_1_55_0.tar
+
+
+
+#Install JAVA
+RUN yum install -y java-1.8.0-openjdk java-1.8.0-openjdk-devel
+
+#Install Swig 2.0.11
+
+RUN cd /opt/ && \
+    wget -O swig-2.0.11.tar.gz https://sourceforge.net/projects/swig/files/swig/swig-2.0.11/swig-2.0.11.tar.gz/download && \
+    tar xzf swig-2.0.11.tar.gz && \
+    cd swig-2.0.11 && \
+    ./configure && \
+    make && make install && \
+    cd /opt/ && rm -rf swig-2.0.11*
diff --git a/tools/docker/centos6/README.md → tools/docker/centos7/README.md b/tools/docker/centos6/README.md → tools/docker/centos7/README.md
@@ -1,6 +1,6 @@
 ### How to compile with docker
 ```Shell
-docker build -t sequenceparser:centos6 .
-docker run -v <path to sequenceparser>:/opt/sequenceparser sequenceparser:centos6 /opt/sequenceparser/docker/centos6/build.sh
+docker build -t sequenceparser:centos7 .
+docker run -v <path to sequenceparser>:/opt/sequenceparser sequenceparser:centos7 /opt/sequenceparser/tools/docker/centos7/build.sh
 ```
 The compiled libraries is installed into centos6 folder at root folder of sequenceparser repository
diff --git a/tools/docker/centos7/build.sh b/tools/docker/centos7/build.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+cd /opt/sequenceparser
+cmake . -DCMAKE_INSTALL_PREFIX=/opt/sequenceparser/install -DBOOST_ROOT=/usr/local/include/boost/
+make
+make install