Mirrors/Sequenzia
Archived
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'revert-b1ca9f48' into 'master'

Browse Source 
Revert "MP4 Thumbnail support"

This reverts commit b1ca9f48ec

See merge request !10
This commit is contained in:
Yukimi Kazari 2017-01-04 04:48:11 -05:00
commit 6bd42a4f8e
1 changed files with 71 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
app/models/Post/FileMethods.php
View File

@ -12,9 +12,9 @@ trait PostFileMethods
'image/jpg' => 'jpg', 'image/jpg' => 'jpg',
'image/png' => 'png', 'image/png' => 'png',
'image/gif' => 'gif', 'image/gif' => 'gif',
'application/x-shockwave-flash' => 'swf',
'video/webm' => 'webm', 'video/webm' => 'webm',
'video/mp4' => 'mp4', 'video/mp4' => 'mp4',
'application/x-shockwave-flash' => 'swf'
]; ];
/** /**
@ -35,6 +35,7 @@ trait PostFileMethods
public $tempfile_name; public $tempfile_name;
public $mime_type; public $mime_type;
public $received_file; public $received_file;
protected $upload; protected $upload;
@ -85,6 +86,7 @@ trait PostFileMethods
// } // }
// return true // return true
} }
protected function ensure_tempfile_exists() protected function ensure_tempfile_exists()
{ {
// if ($this->is_upload) { // if ($this->is_upload) {
@ -99,6 +101,7 @@ trait PostFileMethods
$this->errors()->add('file', "not found, try uploading again"); $this->errors()->add('file', "not found, try uploading again");
return false; return false;
} }
protected function validate_content_type() protected function validate_content_type()
{ {
if (!array_key_exists($this->mime_type, self::$MIME_TYPES)) { if (!array_key_exists($this->mime_type, self::$MIME_TYPES)) {
@ -125,6 +128,7 @@ trait PostFileMethods
# - general tags can either be important ("fixme") or useless ("red hair") # - general tags can either be important ("fixme") or useless ("red hair")
# - remove character tags first; # - remove character tags first;
if ($options['type'] == 'sample') if ($options['type'] == 'sample')
$tags = "sample"; $tags = "sample";
else else
@ -132,6 +136,7 @@ trait PostFileMethods
# Filter characters. # Filter characters.
$tags = str_replace(array('/', '?'), array('_', ''), $tags); $tags = str_replace(array('/', '?'), array('_', ''), $tags);
$name = "{$this->id} $tags"; $name = "{$this->id} $tags";
if (CONFIG()->download_filename_prefix) if (CONFIG()->download_filename_prefix)
$name = CONFIG()->download_filename_prefix . " " . $name; $name = CONFIG()->download_filename_prefix . " " . $name;
@ -162,6 +167,7 @@ trait PostFileMethods
$this->tempfile_path = tempnam(Rails::root() . "/tmp", "upload"); $this->tempfile_path = tempnam(Rails::root() . "/tmp", "upload");
return $this->tempfile_path; return $this->tempfile_path;
} }
public function fake_sample_url() public function fake_sample_url()
{ {
if (CONFIG()->use_pretty_image_urls) { if (CONFIG()->use_pretty_image_urls) {
@ -176,6 +182,7 @@ trait PostFileMethods
{ {
return Rails::root() . "/public/data/{$this->md5}-preview.jpg"; return Rails::root() . "/public/data/{$this->md5}-preview.jpg";
} }
public function tempfile_sample_path() public function tempfile_sample_path()
{ {
return Rails::root() . "/public/data/{$this->md5}-sample.jpg"; return Rails::root() . "/public/data/{$this->md5}-sample.jpg";
@ -185,6 +192,7 @@ trait PostFileMethods
{ {
return Rails::root() . "/public/data/".$this->md5."-jpeg.jpg"; return Rails::root() . "/public/data/".$this->md5."-jpeg.jpg";
} }
# Generate MD5 and CRC32 hashes for the file. Do this before generating samples, so if this # Generate MD5 and CRC32 hashes for the file. Do this before generating samples, so if this
# is a duplicate we'll notice before we spend time resizing the image. # is a duplicate we'll notice before we spend time resizing the image.
public function regenerate_hash() public function regenerate_hash()
@ -202,10 +210,12 @@ trait PostFileMethods
// $this->crc32 = ............... // $this->crc32 = ...............
return true; return true;
} }
public function regenerate_jpeg_hash() public function regenerate_jpeg_hash()
{ {
if (!$this->has_jpeg()) if (!$this->has_jpeg())
return false; return false;
// crc32_accum = 0 // crc32_accum = 0
// File.open(jpeg_path, 'rb') { |fp| // File.open(jpeg_path, 'rb') { |fp|
// buf = "" // buf = ""
@ -214,9 +224,11 @@ trait PostFileMethods
// end // end
// } // }
// return; false if self.jpeg_crc32 == crc32_accum // return; false if self.jpeg_crc32 == crc32_accum
// self.jpeg_crc32 = crc32_accum // self.jpeg_crc32 = crc32_accum
return true; return true;
} }
public function generate_hash() public function generate_hash()
{ {
if (!$this->regenerate_hash()) if (!$this->regenerate_hash())
@ -229,6 +241,7 @@ trait PostFileMethods
} else } else
return true; return true;
} }
# Generate the specified image type. If options[:force_regen] is set, generate the file even # Generate the specified image type. If options[:force_regen] is set, generate the file even
# IF it already exists # IF it already exists
@ -236,6 +249,7 @@ trait PostFileMethods
{ {
if (!$this->image()) if (!$this->image())
return true; return true;
$force_regen = !empty($options['force_regen']); $force_regen = !empty($options['force_regen']);
switch ($type) { switch ($type) {
@ -266,6 +280,7 @@ trait PostFileMethods
default: default:
throw new Exception(sprintf("unknown type: %s", $type)); throw new Exception(sprintf("unknown type: %s", $type));
} }
# Only move in the changed files on success. When we return; false, the caller won't # Only move in the changed files on success. When we return; false, the caller won't
# save us to the database; we need to only move the new files in if we're going to be # save us to the database; we need to only move the new files in if we're going to be
# saved. This is normally handled by move_file. # saved. This is normally handled by move_file.
@ -277,8 +292,10 @@ trait PostFileMethods
rename($temp_path, $dest_path); rename($temp_path, $dest_path);
chmod($dest_path, 0775); chmod($dest_path, 0775);
} }
return true; return true;
} }
# Automatically download from the source if it's a URL. # Automatically download from the source if it's a URL.
public function download_source() public function download_source()
{ {
@ -306,6 +323,7 @@ trait PostFileMethods
return false; return false;
} }
} }
public function determine_content_type() public function determine_content_type()
{ {
if (!file_exists($this->tempfile_path())) { if (!file_exists($this->tempfile_path())) {
@ -315,11 +333,11 @@ trait PostFileMethods
$this->tempfile_name = pathinfo($this->tempfile_name, PATHINFO_FILENAME); $this->tempfile_name = pathinfo($this->tempfile_name, PATHINFO_FILENAME);
// list ($x, $y, $type) = getimagesize($this->tempfile_path());
// $this->mime_type = image_type_to_mime_type($type);
list ($x, $y) = getimagesize($this->tempfile_path()); list ($x, $y) = getimagesize($this->tempfile_path());
$finfo = finfo_open(FILEINFO_MIME_TYPE); $finfo = finfo_open(FILEINFO_MIME_TYPE);
$this->mime_type = finfo_file($finfo, $this->tempfile_path()); $this->mime_type = finfo_file($finfo, $this->tempfile_path());
//$this->mime_type = image_type_to_mime_type($type);
finfo_close($finfo); finfo_close($finfo);
} }
@ -327,6 +345,7 @@ trait PostFileMethods
// protected function file_setter($f) // protected function file_setter($f)
// { // {
// return; if f.nil? || count(f) == 0 // return; if f.nil? || count(f) == 0
// if (f.tempfile.path) { // if (f.tempfile.path) {
// # Large files are stored in the temp directory, so instead of // # Large files are stored in the temp directory, so instead of
// # reading/rewriting through Ruby, just rely on system calls to // # reading/rewriting through Ruby, just rely on system calls to
@ -338,18 +357,15 @@ trait PostFileMethods
// $this->received_file = true; // $this->received_file = true;
// } // }
protected function set_image_dimensions() protected function set_image_dimensions()
{ {
if ($this->image() or $this->flash()) { if ($this->image() or $this->flash()) {
list($this->width, $this->height) = getimagesize($this->tempfile_path()); list($this->width, $this->height) = getimagesize($this->tempfile_path());
} }
elseif ($this->video()){
$video = new FFmpegMovie($this->tempfile_path());
$this->width = $video->getFrameWidth();
$this->height = $video->getFrameHeight();
}
$this->file_size = filesize($this->tempfile_path()); $this->file_size = filesize($this->tempfile_path());
} }
# If the image resolution is too low and the user is privileged or below, force the # If the image resolution is too low and the user is privileged or below, force the
# image to pending. If the user has too many pending posts, raise an error. # image to pending. If the user has too many pending posts, raise an error.
# #
@ -362,6 +378,7 @@ trait PostFileMethods
if ($this->width * $this->height >= CONFIG()->min_mpixels) return false; if ($this->width * $this->height >= CONFIG()->min_mpixels) return false;
return true; return true;
} }
protected function set_image_status() protected function set_image_status()
{ {
if (!$this->image_is_too_small()) if (!$this->image_is_too_small())
@ -369,10 +386,12 @@ trait PostFileMethods
if ($this->user->level >= 33) if ($this->user->level >= 33)
return; return;
$this->status = "pending"; $this->status = "pending";
$this->status_reason = "low-res"; $this->status_reason = "low-res";
return true; return true;
} }
# If this post is pending, and the user has too many pending posts, reject the upload. # If this post is pending, and the user has too many pending posts, reject the upload.
# This must be done after set_image_status. # This must be done after set_image_status.
public function check_pending_count() public function check_pending_count()
@ -380,30 +399,34 @@ trait PostFileMethods
if (!CONFIG()->max_pending_images) return; if (!CONFIG()->max_pending_images) return;
if ($this->status != "pending") return; if ($this->status != "pending") return;
if ($this->user->level >= 33) return; if ($this->user->level >= 33) return;
$pending_posts = Post::where("user_id = ? AND status = 'pending'", $this->user_id)->count(); $pending_posts = Post::where("user_id = ? AND status = 'pending'", $this->user_id)->count();
if ($pending_posts < CONFIG()->max_pending_images) return; if ($pending_posts < CONFIG()->max_pending_images) return;
$this->errors()->addToBase("You have too many posts pending moderation"); $this->errors()->addToBase("You have too many posts pending moderation");
return false; return false;
} }
# Returns true if the post is an image format that GD can handle. # Returns true if the post is an image format that GD can handle.
public function image() public function image()
{ {
return in_array($this->file_ext, array('jpg', 'jpeg', 'gif', 'png')); return in_array($this->file_ext, array('jpg', 'jpeg', 'gif', 'png'));
} }
# Returns true if the post is a Flash movie. # Returns true if the post is a Flash movie.
public function flash() public function flash()
{ {
return $this->file_ext == "swf"; return $this->file_ext == "swf";
} }
public function gif()
{
return $this->file_ext == 'gif';
}
public function video() public function video()
{ {
return in_array($this->file_ext, array('mp4', 'webm')); return in_array($this->file_ext, array('mp4', 'webm'));
} }
public function gif()
{
return $this->file_ext == 'gif';
}
// public function find_ext(file_path) // public function find_ext(file_path)
// { // {
@ -418,47 +441,57 @@ trait PostFileMethods
// } // }
// public function content_type_to_file_ext(content_type) // public function content_type_to_file_ext(content_type)
// { // {
// case content_type.chomp // case content_type.chomp
// when "image/jpeg" // when "image/jpeg"
// return; "jpg" // return; "jpg"
// when "image/gif" // when "image/gif"
// return; "gif" // return; "gif"
// when "image/png" // when "image/png"
// return; "png" // return; "png"
// when "application/x-shockwave-flash" // when "application/x-shockwave-flash"
// return; "swf" // return; "swf"
// } else { // } else {
// nil // nil
// end // end
// } // }
public function raw_preview_dimensions() public function raw_preview_dimensions()
{ {
if ($this->image() || $this->video()) { if ($this->image()) {
$dim = Moebooru\Resizer::reduce_to(array('width' => $this->width, 'height' => $this->height), array('width' => 300, 'height' => 300)); $dim = Moebooru\Resizer::reduce_to(array('width' => $this->width, 'height' => $this->height), array('width' => 300, 'height' => 300));
$dim = array($dim['width'], $dim['height']); $dim = array($dim['width'], $dim['height']);
} else } else
$dim = array(300, 300); $dim = array(300, 300);
return $dim; return $dim;
} }
public function preview_dimensions() public function preview_dimensions()
{ {
if ($this->image() || $this->video() ) { if ($this->image()) {
$dim = Moebooru\Resizer::reduce_to(array('width' => $this->width, 'height' => $this->height), array('width' => 150, 'height' => 150)); $dim = Moebooru\Resizer::reduce_to(array('width' => $this->width, 'height' => $this->height), array('width' => 150, 'height' => 150));
$dim = array($dim['width'], $dim['height']); $dim = array($dim['width'], $dim['height']);
} else } else
$dim = array(150, 150); $dim = array(150, 150);
return $dim; return $dim;
} }
public function generate_sample($force_regen = false) public function generate_sample($force_regen = false)
{ {
if ($this->gif() || !$this->image()) return true; if ($this->gif() || !$this->image()) return true;
elseif (!CONFIG()->image_samples) return true; elseif (!CONFIG()->image_samples) return true;
elseif (!$this->width && !$this->height) return true; elseif (!$this->width && !$this->height) return true;
elseif ($this->file_ext == "gif") return true; elseif ($this->file_ext == "gif") return true;
# Always create samples for PNGs. # Always create samples for PNGs.
$ratio = $this->file_ext == 'png' ? 1 : CONFIG()->sample_ratio; $ratio = $this->file_ext == 'png' ? 1 : CONFIG()->sample_ratio;
$size = array('width' => $this->width, 'height' => $this->height); $size = array('width' => $this->width, 'height' => $this->height);
if (CONFIG()->sample_width) if (CONFIG()->sample_width)
$size = Moebooru\Resizer::reduce_to($size, array('width' => CONFIG()->sample_width, 'height' => CONFIG()->sample_height), $ratio); $size = Moebooru\Resizer::reduce_to($size, array('width' => CONFIG()->sample_width, 'height' => CONFIG()->sample_height), $ratio);
@ -473,6 +506,7 @@ trait PostFileMethods
$this->errors()->add('file', "not found"); $this->errors()->add('file', "not found");
return false; return false;
} }
# If we're not reducing the resolution for the sample image, only reencode if the # If we're not reducing the resolution for the sample image, only reencode if the
# source image is above the reencode threshold. Anything smaller won't be reduced # source image is above the reencode threshold. Anything smaller won't be reduced
# enough by the reencode to bother, so don't reencode it and save disk space. # enough by the reencode to bother, so don't reencode it and save disk space.
@ -500,12 +534,13 @@ trait PostFileMethods
# iTODO: enable crc32 for samples. # iTODO: enable crc32 for samples.
$crc32_accum = 0; $crc32_accum = 0;
return true; return true;
} }
protected function generate_preview($force_regen = false) protected function generate_preview($force_regen = false)
{ {
if ((!$this->image() && !$this->video()) || (!$this->width && !$this->height)) if (!$this->image() || (!$this->width && !$this->height))
return true; return true;
# If we already have a preview image, don't regenerate it. # If we already have a preview image, don't regenerate it.
@ -514,6 +549,7 @@ trait PostFileMethods
} }
$size = Moebooru\Resizer::reduce_to(array('width' => $this->width, 'height' => $this->height), array('width' => 300, 'height' => 300)); $size = Moebooru\Resizer::reduce_to(array('width' => $this->width, 'height' => $this->height), array('width' => 300, 'height' => 300));
# Generate the preview from the new sample if we have one to save CPU, otherwise from the image. # Generate the preview from the new sample if we have one to save CPU, otherwise from the image.
if (is_file($this->tempfile_sample_path())) if (is_file($this->tempfile_sample_path()))
list($path, $ext) = array($this->tempfile_sample_path(), "jpg"); list($path, $ext) = array($this->tempfile_sample_path(), "jpg");
@ -526,18 +562,6 @@ trait PostFileMethods
else else
return false; return false;
if ($this->video()){
try {
$video = new FFmpegMovie($this->tempfile_path());
$video->getFrameAtTime($seconds = 2, $size['width'], $size['height'], '', $this->tempfile_preview_path());
} catch (Exception $e) {
$this->errors()->add("preview", "couldn't be generated (".$e->getMessage().")");
$this->delete_tempfile();
return false;
}
}
if ($this->image()){
try { try {
Moebooru\Resizer::resize($ext, $path, $this->tempfile_preview_path(), $size, 85); Moebooru\Resizer::resize($ext, $path, $this->tempfile_preview_path(), $size, 85);
} catch (Exception $e) { } catch (Exception $e) {
@ -545,7 +569,6 @@ trait PostFileMethods
$this->delete_tempfile(); $this->delete_tempfile();
return false; return false;
} }
}
$this->actual_preview_width = $this->raw_preview_dimensions()[0]; $this->actual_preview_width = $this->raw_preview_dimensions()[0];
$this->actual_preview_height = $this->raw_preview_dimensions()[1]; $this->actual_preview_height = $this->raw_preview_dimensions()[1];
@ -554,6 +577,7 @@ trait PostFileMethods
return true; return true;
} }
# If the JPEG version needs to be generated (or regenerated), output it to tempfile_jpeg_path. On # If the JPEG version needs to be generated (or regenerated), output it to tempfile_jpeg_path. On
# error, return; false; on success or no-op, return; true. # error, return; false; on success or no-op, return; true.
protected function generate_jpeg($force_regen = false) protected function generate_jpeg($force_regen = false)
@ -565,6 +589,7 @@ trait PostFileMethods
# Only generate JPEGs for PNGs. Don't do it for files that are already JPEGs; we'll just add # Only generate JPEGs for PNGs. Don't do it for files that are already JPEGs; we'll just add
# artifacts and/or make the file bigger. Don't do it for GIFs; they're usually animated. # artifacts and/or make the file bigger. Don't do it for GIFs; they're usually animated.
if ($this->file_ext != "png") return true; if ($this->file_ext != "png") return true;
# We can generate the image during upload or offline. Use tempfile_path # We can generate the image during upload or offline. Use tempfile_path
#- if it exists, otherwise use file_path. #- if it exists, otherwise use file_path.
$path = $this->tempfile_path(); $path = $this->tempfile_path();
@ -592,13 +617,16 @@ trait PostFileMethods
# iTODO: enable crc32 for jpg. # iTODO: enable crc32 for jpg.
$crc32_accum = 0; $crc32_accum = 0;
return true; return true;
} }
# Returns true if the post has a sample image. # Returns true if the post has a sample image.
public function has_sample() public function has_sample()
{ {
return !empty($this->sample_size); return !empty($this->sample_size);
} }
# Returns true if the post has a sample image, and we're going to use it. # Returns true if the post has a sample image, and we're going to use it.
public function use_sample($user = null) public function use_sample($user = null)
{ {
@ -610,6 +638,7 @@ trait PostFileMethods
else else
return CONFIG()->image_samples && $this->has_sample(); return CONFIG()->image_samples && $this->has_sample();
} }
public function get_file_image($user = null) public function get_file_image($user = null)
{ {
return array( return array(
@ -625,6 +654,7 @@ trait PostFileMethods
{ {
if ($this->status == "deleted" or !$this->use_jpeg($user)) if ($this->status == "deleted" or !$this->use_jpeg($user))
return $this->get_file_image($user); return $this->get_file_image($user);
return array( return array(
'url' => $this->store_jpeg_url(), 'url' => $this->store_jpeg_url(),
'size' => $this->jpeg_size, 'size' => $this->jpeg_size,
@ -647,10 +677,12 @@ trait PostFileMethods
'height' => $this->sample_height 'height' => $this->sample_height
); );
} }
public function sample_url($user = null) public function sample_url($user = null)
{ {
return $this->get_file_sample($user)['url']; return $this->get_file_sample($user)['url'];
} }
public function get_sample_width($user = null) public function get_sample_width($user = null)
{ {
return $this->get_file_sample($user)['width']; return $this->get_file_sample($user)['width'];