HTML Uploader Videos and Picture from iOS devices!

I guess that this module shoul be updated to use the new function to check file types not just extensions.

Dave
_____________________________________________
Blog & G2 || floridave - Gallery Team

Here is the contents of the HTML uploader.php file.
Can any of you super coders edit/tweak this file so it will allow for the user to enter the Name/Title and a Description as the media is being uploaded?

<?php defined("SYSPATH") or die("No direct script access.");
/**
 * Gallery - a web based photo album viewer and editor
 * Copyright (C) 2000-2013 Bharat Mediratta
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or (at
 * your option) any later version.
 *
 * This program is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
 */
class Uploader_Controller extends Controller {
  public function index($id) {
    $album = ORM::factory("item", $id);
    access::required("view", $album);
    access::required("add", $album);
    if (!$album->is_album()) {
      $album = $album->parent();
    }

    print $this->_get_add_form($album);
  }

  public function add($id) {
    $album = ORM::factory("item", $id);
    access::required("view", $album);
    access::required("add", $album);
    access::verify_csrf();

    $form = $this->_get_add_form($album);
    if ($form->validate()) {
      batch::start();

      $count = 0;
      $added_a_movie = false;
      $added_a_photo = false;
      foreach (array("file1", "file2", "file3") as $key) {
        if ($form->add_photos->$key->value == "") {
          continue;
        }

        try {
          $temp_filename = $form->add_photos->$key->value;
          $item = ORM::factory("item");
          $item->name = basename($temp_filename);
          $item->title = item::convert_filename_to_title($item->name);
          $item->parent_id = $album->id;
          $item->set_data_file($temp_filename);

          $path_info = @pathinfo($temp_filename);
          if (array_key_exists("extension", $path_info) &&
              in_array(strtolower($path_info["extension"]), array("flv", "mp4", "m4v", "MOV", "wmv"))) {
            $item->type = "movie";
            $item->save();
            $added_a_movie = true;
            log::success("content", t("Added a movie"),
                         html::anchor("movies/$item->id", t("view movie")));
          } else {
            $item->type = "photo";
            $item->save();
            $added_a_photo = true;
            log::success("content", t("Added a photo"),
                         html::anchor("photos/$item->id", t("view photo")));
          }
          $count++;
          module::event("add_photos_form_completed", $item, $form);
        } catch (Exception $e) {
          // Lame error handling for now.  Just record the exception and move on
          Kohana_Log::add("error", $e->getMessage() . "\n" . $e->getTraceAsString());

          // Ugh.  I hate to use instanceof, But this beats catching the exception separately since
          // we mostly want to treat it the same way as all other exceptions
          if ($e instanceof ORM_Validation_Exception) {
            Kohana_Log::add("error", "Validation errors: " . print_r($e->validation->errors(), 1));
          }
        }

        if (file_exists($temp_filename)) {
          unlink($temp_filename);
        }
      }
      batch::stop();
      if ($count) {
        if ($added_a_photo && $added_a_movie) {
          message::success(t("Added %count photos and movies", array("count" => $count)));
        } else if ($added_a_photo) {
          message::success(t2("Added one photo", "Added %count photos", $count));
        } else {
          message::success(t2("Added one movie", "Added %count movies", $count));
        }
      }
      json::reply(array("result" => "success"));
    } else {
      json::reply(array("result" => "error", "html" => (string) $form));
    }

    // Override the application/json mime type.  The dialog based HTML uploader uses an iframe to
    // buffer the reply, and on some browsers (Firefox 3.6) it does not know what to do with the
    // JSON that it gets back so it puts up a dialog asking the user what to do with it.  So force
    // the encoding type back to HTML for the iframe.
    // See: http://jquery.malsup.com/form/#file-upload
    header("Content-Type: text/html; charset=" . Kohana::CHARSET);
  }

  private function _get_add_form($album) {
    $form = new Forge("uploader/add/{$album->id}", "", "post", array("id" => "g-add-photos-form"));
    $group = $form->group("add_photos")
      ->label(t("Add photos to %album_title", array("album_title" => html::purify($album->title))));
    $group->upload("file1")->add_rule("foo");
    $group->upload("file2");
    $group->upload("file3");

    module::event("add_photos_form", $album, $form);

    $group = $form->group("buttons")->label("");
    $group->submit("")->value(t("Upload"));

    return $form;
  }
}

Dave,
Pardon my excitement.
WOW! Exactly what my intention was.
So far everything works perfectly. I tested it with mp4 and MOV files as well as jpg picture files from my iPad and iPhone, all worked flawlessly.
One upload at a time is perfect (in my opinion, although I'm sure other users will want or need more)

I can't see where anything needs changing at this point.

For #1, what doesn't work for the stadfed module (I may have fixed the issue if it's what I think it is...)

Awesome,
I can't wait to try the new module. I've been having a blast testing this today.

You guys are awesome. let me know when your change is made James.
This is a very exciting moment for Gallery and it's users.

MikeLFD,
post a image that has the EXIF/IPTC data that you want the stadfed module to work with so I can test against it.
tell us what the title should be and the other meta data that should be populated.

Dave
_____________________________________________
Blog & G2 || floridave - Gallery Team

the conflict is what we want to determine and fix.

Send us a link to an image that doesn't work with both modules enabled - then Dave can test it out and see what we need to do.

Ah, gotcha. Dave, let me know what you find out then. I'm sure it's something simple.

aha just make a note on the form Title (required)
I edited the php file and added (Required) next to the label title (to remind me I need to give it a name) Made an upload using both modules after entering a title and It works flawlessly.

private function _get_add_form($album) {
    $form = new Forge("uploader/add/{$album->id}", "", "post", array("id" => "g-add-photos-form"));
    $group = $form->group("add_photos")
      ->label(t("Add an item to %album_title", array("album_title" => html::purify($album->title))));
    $group->upload("file1");
	$group->input("title1")->label(t('Title (Required).'));
	$group->input("description1")->label(t('description.'));

    module::event("add_photos_form", $album, $form);

    $group = $form->group("buttons")->label("");
    $group->submit("")->value(t("Upload"));

    return $form;

Should probably pre-fill and validate: (quick edit, untested)

private function _get_add_form($album) {
    $form = new Forge("uploader/add/{$album->id}", "", "post", array("id" => "g-add-photos-form"));
    $group = $form->group("add_photos")
      ->label(t("Add an item to %album_title", array("album_title" => html::purify($album->title))));
    $group->upload("file1");
	$group->input("title1")
           ->label(t('Title (Required).')
           ->rules('required')
           ->error_messages("required",t("Title is required"))
           ->value(item::convert_filename_to_title($item->name))
           ->rules('required')
        );
	$group->input("description1")->label(t('description.'));

    module::event("add_photos_form", $album, $form);

    $group = $form->group("buttons")->label("");
    $group->submit("")->value(t("Upload"));

    return $form;

ah, I see it... hmmm... let me think about it a bit, $item doesn't exist yet... doh!

for now, take out the line:

->value(item::convert_filename_to_title($item->name))

yea, forget it, it's been a long day, and I shouldn't have even tried

Especially since I couldn't do any testing...

Plus, I see I duplicated the ->rules line...

Dave and I will refocus and address a better solution.

This is the issue... hence the 'required' part of our discussions... I just didn't have time or effort to look at it further.

Sounds like a plan to me!

Or do it at the processing of the form... another file edit, but hey, it's open source!