1. ignoring @eaDir directories 2. setting UID and GID of copy / move process

Dockerfile

@@ -7,12 +7,14 @@ ENV CRON ""
 ENV OPTIONS ""
 
 COPY . /opt/phockup
-RUN chmod +x /opt/phockup/entrypoint.sh
 
 RUN apk --no-cache add exiftool \
     && pip install --no-cache-dir -r /opt/phockup/requirements.txt \
     && ln -s /opt/phockup/phockup.py /usr/local/bin/phockup \
     && apk add bash \
-    && apk add flock
+    && apk add flock \
+	&& apk add util-linux-login
+
+RUN ["chmod", "-R", "a+rx", "/opt/phockup/"]
 
 ENTRYPOINT ["/opt/phockup/entrypoint.sh"]

entrypoint.sh

@@ -1,19 +1,38 @@
 #!/usr/bin/env bash
 
-# If the CRON variable is empty, phockup gets executed once as command line tool
-if [ -z "$CRON" ]; then
-  phockup "$@"
+if [[ "$PHOCKUP_UID" != "" && "$PHOCKUP_GID" != "" ]]
+then
+	adduser -D -u $PHOCKUP_UID $PHOCKUP_UID || echo "User $PHOCKUP_UID already exists"
+	addgroup -g $PHOCKUP_GID $PHOCKUP_GID || echo "Group $PHOCKUP_GID already exists"
+	GNAME=`getent group $PHOCKUP_GID | cut -d: -f1`
+	if [ -z "$CRON" ]; then
+		su $PHOCKUP_UID -g $GNAME -c "phockup $*"
+	else
+		if [ -f /tmp/phockup.lockfile ]; then
+			rm /tmp/phockup.lockfile
+		fi
 
-# When CRON is not empty, phockup will run in a cron job until the container is stopped.
+		CRON_COMMAND="$CRON flock -n /tmp/phockup.lockfile su $PHOCKUP_UID -g $GNAME -c \"phockup /mnt/input /mnt/output $OPTIONS\""
+
+		echo "$CRON_COMMAND" >> /etc/crontabs/root
+		echo "cron job has been set up with command: $CRON_COMMAND"
+
+		crond -f -d 8
+	fi
 else
-  if [ -f /tmp/phockup.lockfile ]; then
-    rm /tmp/phockup.lockfile
-  fi
+	if [ -z "$CRON" ]; then
+		phockup "$@"
+	else
+		if [ -f /tmp/phockup.lockfile ]; then
+			rm /tmp/phockup.lockfile
+		fi
 
-  CRON_COMMAND="$CRON flock -n /tmp/phockup.lockfile phockup /mnt/input /mnt/output $OPTIONS"
+		CRON_COMMAND="$CRON flock -n /tmp/phockup.lockfile phockup /mnt/input /mnt/output $OPTIONS"
 
-  echo "$CRON_COMMAND" >> /etc/crontabs/root
-  echo "cron job has been set up with command: $CRON_COMMAND"
+		echo "$CRON_COMMAND" >> /etc/crontabs/root
+		echo "cron job has been set up with command: $CRON_COMMAND"
 
-  crond -f -d 8
+		crond -f -d 8
+	fi
 fi
+

src/phockup.py

@@ -15,7 +15,7 @@
 
 logger = logging.getLogger('phockup')
 ignored_files = ('.DS_Store', 'Thumbs.db')
-
+ignored_dirs = {'@eaDir'}
 
 class Phockup:
     DEFAULT_DIR_FORMAT = ['%Y', '%m', '%d']
@@ -128,24 +128,32 @@ def walk_directory(self):
 
         # Walk the directory
         for root, dirnames, files in os.walk(self.input_dir):
-            files.sort()
-            file_paths_to_process = []
-            for filename in files:
-                if filename in ignored_files:
-                    continue
-                file_paths_to_process.append(os.path.join(root, filename))
-            if self.max_concurrency > 1:
-                if not self.process_files(file_paths_to_process):
-                    return
+            logger.info(f"walking directory. current dir: {root}, dirnames: {dirnames}, files: {files}")
+            root_set = set(root.split(os.sep))
+            intersect_set = ignored_dirs.intersection(root_set)
+            logger.info(f"root_set: {root_set}, ignored_set: {ignored_dirs}, intersection: {intersect_set}")
+            if len(intersect_set) == 0:
+                files.sort()
+                file_paths_to_process = []
+                for filename in files:
+                    if filename in ignored_files:
+                        continue
+                    file_paths_to_process.append(os.path.join(root, filename))
+                if self.max_concurrency > 1:
+                    if not self.process_files(file_paths_to_process):
+                        return
+                else:
+                    try:
+                        for file_path in file_paths_to_process:
+                            self.process_file(file_path)
+                    except KeyboardInterrupt:
+                        logger.warning("Received interrupt. Shutting down...")
+                        return
+                if root.count(os.sep) >= self.stop_depth:
+                    del dirnames[:]
             else:
-                try:
-                    for file_path in file_paths_to_process:
-                        self.process_file(file_path)
-                except KeyboardInterrupt:
-                    logger.warning("Received interrupt. Shutting down...")
-                    return
-            if root.count(os.sep) >= self.stop_depth:
-                del dirnames[:]
+                logger.info(f"Found directory in ignore list: {root}")
+                continue
 
     def get_file_count(self):
         file_count = 0