From d16dfe24f2311a1e32c358b0b4bf0cf9fd67c81e Mon Sep 17 00:00:00 2001
From: matthew <matthew@darkholme.net>
Date: Fri, 5 Jul 2019 10:36:07 -0500
Subject: [PATCH] media extension adjustments

---
 ext/media/main.php | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/ext/media/main.php b/ext/media/main.php
index d801827a..a4fba3ba 100644
--- a/ext/media/main.php
+++ b/ext/media/main.php
@@ -339,11 +339,7 @@ class Media extends Extension
             case "bulk_media_rescan":
                 if ($user->is_admin()) {
                     $total = 0;
-                    foreach ($event->items as $id) {
-                        $image = Image::by_id($id);
-                        if ($image == null) {
-                            continue;
-                        }
+                    foreach ($event->items as $image) {
                         try {
                             $this->update_image_media_properties($image->hash, $image->ext);
                             $total++;
@@ -409,7 +405,7 @@ class Media extends Extension
     }
 
 
-    const CONTENT_SEARCH_TERM_REGEX = "/^(-)?content[=|:]((video)|(audio))$/i";
+    const CONTENT_SEARCH_TERM_REGEX = "/^content[=|:]((video)|(audio))$/i";
 
 
     public function onSearchTermParse(SearchTermParseEvent $event)
@@ -418,9 +414,8 @@ class Media extends Extension
 
         $matches = [];
         if (preg_match(self::CONTENT_SEARCH_TERM_REGEX, $event->term, $matches)) {
-            $positive = $matches[1];
             $field = $matches[2];
-            $event->add_querylet(new Querylet("$field = " . $database->scoreql_to_sql($positive != "-" ? SCORE::BOOL_Y : SCORE::BOOL_N)));
+            $event->add_querylet(new Querylet($database->scoreql_to_sql("$field = SCORE_BOOL_Y")));
         }
     }
 
@@ -779,12 +774,6 @@ class Media extends Extension
             $input_type = $input_type . ":";
         }
 
-        $args = " -flatten ";
-        if ($minimize) {
-            $args .= " -strip -thumbnail";
-        } else {
-            $args .= " -resize";
-        }
 
         $resize_args = "";
         if (!$allow_upscale) {
@@ -794,6 +783,7 @@ class Media extends Extension
             $resize_args .= "\!";
         }
 
+        $args = "";
         switch ($output_type) {
             case Media::WEBP_LOSSLESS:
                 $args .= '-define webp:lossless=true';
@@ -803,6 +793,13 @@ class Media extends Extension
                 break;
         }
 
+        if ($minimize) {
+            $args .= " -strip -thumbnail";
+        } else {
+            $args .= " -resize";
+        }
+
+
         $output_ext = self::determine_ext($output_type);
 
         $format = '"%s"  %s %ux%u%s -quality %u -background %s %s"%s[0]"  %s:"%s" 2>&1';