james/fembooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

boolinate image

Browse Source
This commit is contained in:
Shish 2020-10-27 00:34:28 +00:00
parent a9f0d764ae
commit ed735e17be
2 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/imageboard/image.php
View File

@ -459,7 +459,7 @@ class Image
"lossless" => $database->scoresql_value_prepare($this->lossless), "lossless" => $database->scoresql_value_prepare($this->lossless),
"video" => $database->scoresql_value_prepare($this->video), "video" => $database->scoresql_value_prepare($this->video),
"video_codec" => $this->video_codec, "video_codec" => $this->video_codec,
"image" => $database->scoresql_value_prepare($this->image), "image" => $this->image,
"audio" => $database->scoresql_value_prepare($this->audio), "audio" => $database->scoresql_value_prepare($this->audio),
"length" => $this->length "length" => $this->length
] ]

26
ext/media/main.php
View File

@ -918,9 +918,7 @@ class Media extends Extension
} }
if ($this->get_version(MediaConfig::VERSION) < 2) { if ($this->get_version(MediaConfig::VERSION) < 2) {
$database->execute($database->scoreql_to_sql( $database->execute("ALTER TABLE images ADD COLUMN image BOOLEAN NULL");
"ALTER TABLE images ADD COLUMN image SCORE_BOOL NULL"
));
switch ($database->get_driver_name()) { switch ($database->get_driver_name()) {
case DatabaseDriver::PGSQL: case DatabaseDriver::PGSQL:
@ -932,24 +930,24 @@ class Media extends Extension
break; break;
} }
$database->set_timeout(300000); // These updates can take a little bit
if ($database->transaction === true) {
$database->commit(); // Each of these commands could hit a lot of data, combining them into one big transaction would not be a good idea.
}
log_info("upgrade", "Setting predictable media values for known file types");
$database->execute($database->scoreql_to_sql("UPDATE images SET image = SCORE_BOOL_N WHERE ext IN ('swf','mp3','ani','flv','mp4','m4v','ogv','webm')"));
$database->execute($database->scoreql_to_sql("UPDATE images SET image = SCORE_BOOL_Y WHERE ext IN ('jpg','jpeg','ico','cur','png')"));
$this->set_version(MediaConfig::VERSION, 2); $this->set_version(MediaConfig::VERSION, 2);
$database->begin_transaction();
} }
if ($this->get_version(MediaConfig::VERSION) < 3) { if ($this->get_version(MediaConfig::VERSION) < 3) {
$database->execute("ALTER TABLE images ADD COLUMN video_codec varchar(512) NULL"); $database->execute("ALTER TABLE images ADD COLUMN video_codec varchar(512) NULL");
$this->set_version(MediaConfig::VERSION, 3); $this->set_version(MediaConfig::VERSION, 3);
} }
if ($this->get_version(MediaConfig::VERSION) < 4) {
$database->standardise_boolean("images", "image");
$this->set_version(MediaConfig::VERSION, 4);
}
if ($this->get_version(MediaConfig::VERSION) < 5) {
$database->execute("UPDATE images SET image = :f WHERE ext IN ('swf','mp3','ani','flv','mp4','m4v','ogv','webm')", ["f"=>false]);
$database->execute("UPDATE images SET image = :t WHERE ext IN ('jpg','jpeg','ico','cur','png')", ["t"=>true]);
$this->set_version(MediaConfig::VERSION, 5);
}
} }
public static function hex_color_allocate($im, $hex) public static function hex_color_allocate($im, $hex)