Skip to content
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

[Feature] different directories #193

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

[Feature] different directories #193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6e740c0
update settings for different directory of single shots
patkan Oct 13, 2019
9245ca5
use setting for different path of single shots
patkan Oct 13, 2019
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
6 changes: 5 additions & 1 deletion photobooth/defaults.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ hide_cursor = False
style = default

[Camera]
# Camera module to use (python-gphoto2, gphoto2-cffi, gphoto2-commandline,
# Camera module to use (python-gphoto2, gphoto2-cffi, gphoto2-commandline,
# opencv, picamera, dummy)
module = python-gphoto2
# Specify rotation of camera in degree (possible values: 0, 90, 180, 270)
Expand Down Expand Up @@ -92,6 +92,10 @@ basedir = %Y-%m-%d
basename = photobooth
# Keep single pictures (True/False)
keep_pictures = False
# Extra directory for single pictures (True/False)
single_extra = False
# Path for single pictures (if single_extra is True)
basedir_single = %Y-%m-%d-single

[Mailer]
# Enable/disable mailer
Expand Down
32 changes: 29 additions & 3 deletions photobooth/gui/Qt5Gui/Frames.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -746,23 +746,45 @@ def createStorageSettings(self):
keep_pictures.setChecked(self._cfg.getBool('Storage', 'keep_pictures'))
self.add('Storage', 'keep_pictures', keep_pictures)

def directory_dialog():
single_extra = QtWidgets.QCheckBox()
single_extra.setChecked(self._cfg.getBool('Storage', 'single_extra'))
self.add('Storage', 'single_extra', single_extra)

basedir_single = QtWidgets.QLineEdit(self._cfg.get('Storage', 'basedir_single'))
self.add('Storage', 'basedir_single', basedir_single)

def directory_dialog(target):
dialog = QtWidgets.QFileDialog.getExistingDirectory
basedir.setText(dialog(self, _('Select directory'),
target.setText(dialog(self, _('Select directory'),
os.path.expanduser('~'),
QtWidgets.QFileDialog.ShowDirsOnly))

def directory_dialog_basedir():
directory_dialog(basedir)

dir_button = QtWidgets.QPushButton(_('Select directory'))
dir_button.clicked.connect(directory_dialog)
dir_button.clicked.connect(directory_dialog_basedir)

lay_dir = QtWidgets.QHBoxLayout()
lay_dir.addWidget(basedir)
lay_dir.addWidget(dir_button)

def directory_dialog_single():
directory_dialog(basedir_single)

dir_button_single = QtWidgets.QPushButton(_('Select directory'))
dir_button_single.clicked.connect(directory_dialog_single)

lay_dir_single = QtWidgets.QHBoxLayout()
lay_dir_single.addWidget(basedir_single)
lay_dir_single.addWidget(dir_button_single)

layout = QtWidgets.QFormLayout()
layout.addRow(_('Output directory (strftime possible):'), lay_dir)
layout.addRow(_('Basename of files (strftime possible):'), basename)
layout.addRow(_('Keep single shots:'), keep_pictures)
layout.addRow(_('Store single shots in different directory:'), single_extra)
layout.addRow(_('Directory for single shots (strftime possible):'), lay_dir_single)

widget = QtWidgets.QWidget()
widget.setLayout(layout)
Expand Down Expand Up @@ -1022,6 +1044,10 @@ def storeConfigAndRestart(self):
self.get('Storage', 'basename').text())
self._cfg.set('Storage', 'keep_pictures',
str(self.get('Storage', 'keep_pictures').isChecked()))
self._cfg.set('Storage', 'single_extra',
str(self.get('Storage', 'single_extra').isChecked()))
self._cfg.set('Storage', 'basedir_single',
self.get('Storage', 'basedir_single').text())

self._cfg.set('Gpio', 'enable',
str(self.get('Gpio', 'enable').isChecked()))
Expand Down
9 changes: 7 additions & 2 deletions photobooth/worker/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,13 @@ def __init__(self, config, comm):
self._pic_list = PictureList(basename)

# Picture list for individual shots
path = os.path.join(config.get('Storage', 'basedir'),
config.get('Storage', 'basename') + '_shot_')
single_extra = config.getBool('Storage', 'single_extra')
if single_extra:
path = os.path.join(config.get('Storage', 'basedir_single'),
config.get('Storage', 'basename') + '_shot_')
else:
path = os.path.join(config.get('Storage', 'basedir'),
config.get('Storage', 'basename') + '_shot_')
basename = strftime(path, localtime())
self._shot_list = PictureList(basename)

Expand Down