Skip to content

Add an option to ignore EyeFi logs #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nirgal wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add an option to ignore EyeFi logs #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions etc/eyefiserver.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,10 @@ upload_dir=~/eyefi/%Y/%Y%m%d

use_date_from_file=no

# Should we extract EyeFi logs from image tarfile.
# They are of little use usually, so default is 'no'.

#extract_logs=yes

# This parameter executes the specified command on each incoming file passing in
# the full file path as the first argument.
Expand Down
9 changes: 8 additions & 1 deletion src/eyefiserver
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -719,7 +719,14 @@ class EyeFiRequestHandler(BaseHTTPRequestHandler):

eyeFiLogger.debug("Extracting TAR file %s", tarpath)
imagefilename = imagetarfile.getnames()[0]
imagetarfile.extractall(path=upload_dir)

extract_logs = self.server.config.getboolean(macaddress,
'extract_logs', False)

if extract_logs:
imagetarfile.extractall(path=upload_dir)
else:
imagetarfile.extract(imagefilename, path=upload_dir)

if use_date_from_file and correct_mtime:
corr_mtime = time.mktime(reference_date.timetuple())
Expand Down