Picture set refactoring #16
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ChrisBr
approved these changes
Jul 2, 2018
app/models/picture_set.rb
Outdated
| class << self | ||
|
|
||
| def all | ||
| dirs = Dir.glob(File.join(PICTURE_PATH, "*/*#{ANIMATION_SUFFIX}")).map do |animation| | ||
| File.basename(File.dirname(animation)) | ||
| end | ||
| dirs.sort.reverse.map { |dir| new(dir) } | ||
| Rails.logger.warn "No picture sets found at: #{PICTURE_PATH}" if dirs.empty? | ||
| dirs.sort.reverse.map { |dir| PictureSet.new(date: dir) } |
There was a problem hiding this comment.
new should be enough then you also don't have the dependency to the class name.
|
|
||
| # Create collage of all images | ||
| def combine_images(overwrite: false) | ||
| if File.exist?(File.join(dir, combined)) && !overwrite |
There was a problem hiding this comment.
Maybe you can also introduce a flag for create_combine_images which we can set in the options. Then we don't need to comment it on the raspberry ...
app/models/picture_set.rb
Outdated
| end | ||
|
|
||
| def destroy | ||
| Syscall.execute("rm -r #{date}", dir: PICTURE_PATH) |
There was a problem hiding this comment.
Any reason why you don't use FileUtils.rm_rf?
https://ruby-doc.org/stdlib-1.9.3/libdoc/fileutils/rdoc/FileUtils.html#method-c-rm_f
There was a problem hiding this comment.
should move all file operations to FileUtils, will do.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.