Changeset bb0e4c03b038dca05a1ebd482427351c958b733e

Timestamp:

11/01/11 11:42:21 (7 months ago)

Author:

Xemle <xemle@phtagr.org>

Children:

e7234c1259e67fbdaae43224343ef0f925519124

Parents:

f8d271c1ff0aebd1c0487928bf60ad46cd8d9aa6

git-committer:

Xemle <xemle@phtagr.org> / 2011-11-01T11:42:21Z+0100

Message:

Add name, description, and rotation for media

Files:

• controllers/components/file_cache.php (modified) (1 diff)
• controllers/explorer_controller.php (modified) (7 diffs)
• models/media.php (modified) (5 diffs)
• views/elements/explorer/menu.ctp (modified) (3 diffs)
• views/explorer/editmeta.ctp (modified) (1 diff)
• views/explorer/index.ctp (modified) (1 diff)

controllers/components/file_cache.php

@@ -92 +92 @@
     @param userId Id of the current user
     @param mediaId Id of the current image/file */
-  function delete($userId, $mediaId) {
-    $mediaId = intval($mediaId);
-    $cacheDir = $this->getPath($userId, $mediaId, false);
+  function delete(&$media) {
+    $mediaId = intval($media['Media']['id']);
+    $cacheDir = $this->getPath(&$media, false);
     if (!$cacheDir) {
-      Logger::trace("No cache dir found for image $mediaId");
+      Logger::trace("No cache dir found for media $mediaId");
       return true;
     }

controllers/explorer_controller.php

@@ -24 +24 @@
 class ExplorerController extends AppController
 {
-  var $components = array('RequestHandler', 'FilterManager', 'Search', 'QueryBuilder', 'FastFileResponder', 'Feed');
+  var $components = array('RequestHandler', 'FilterManager', 'Search', 'QueryBuilder', 'FastFileResponder', 'Feed', 'FileCache');
   var $uses = array('Media', 'MyFile', 'Group', 'Tag', 'Category', 'Location');
   var $helpers = array('Form', 'Html', 'Ajax', 'ImageData', 'Time', 'ExplorerMenu', 'Rss', 'Search', 'Navigator', 'Tab', 'Breadcrumb', 'Autocomplete');
@@ -540 +540 @@
           continue;
         }
-        
-        if ($media['Media']['canWriteMeta']) {
-          $tmp = $this->Media->editMetaMulti(&$media, $editData);
-        } else {
-          $tmp = $this->Media->editTagMulti(&$media, $editData);
-        }
+        $tmp = $this->Media->editMulti(&$media, $editData);
         if ($tmp) {
           $changedMedia[] = $tmp;
@@ -555 +550 @@
         } else {
           Logger::debug("Saved media: " . join(', ', Set::extract("/Media/id", $changedMedia)));
+        }
+        foreach ($changedMedia as $media) {
+          if ($media['Media']['orientation']) {
+            $this->FileCache->delete($media);
+            Logger::debug("Deleted previews of media {$media['Media']['id']}");
+          }
         }
       }
@@ -599 +600 @@
     $media = $this->Media->findById($id);
     $this->Media->setAccessFlags(&$media, $user);
-    $this->set('data', $media);
+    if (!$media['Media']['canWriteTag']) {
+      Logger::warn("User is not allowed to edit media {$media['Media']['id']}");
+      $this->redirect(null, '403');
+    }
+    $this->data = $media;
     $this->layout='bare';
-    if (!$this->Media->checkAccess(&$media, &$user, ACL_WRITE_META, ACL_WRITE_MASK)) {
-      if ($this->Media->checkAccess(&$media, &$user, ACL_WRITE_TAG, ACL_WRITE_MASK)) {
-        $this->render('edittag');
-      } else {
-        Logger::warn("User '{$user['User']['username']}' ({$user['User']['id']}) has no previleges to change ACL of image ".$id);
-        $this->render('updatemeta');
-      }
-    }
+    $this->render('editmeta');
     //Configure::write('debug', 0);
   }
@@ -616 +614 @@
    */
   function savemeta($id) {
-    if (!$this->RequestHandler->isAjax() || !$this->RequestHandler->isPost()) {
+    if (!$this->RequestHandler->isAjax()) {
       Logger::warn("Decline wrong ajax request");
       $this->redirect(null, '404');
@@ -626 +624 @@
     if (isset($this->data)) {
       $media = $this->Media->findById($id);
+      $this->Media->setAccessFlags(&$media, $user);
       if (!$media) {
         Logger::warn("Invalid media id: $id");
         $this->redirect(null, '404');
-      } elseif (!$this->Media->checkAccess(&$media, &$user, ACL_WRITE_TAG, ACL_WRITE_MASK)) {
+      } elseif (!$media['Media']['canWriteTag']) {
         Logger::warn("User '{$username}' ({$user['User']['id']}) has no previleges to change tags of image ".$id);
       } else {
-        if ($this->Media->checkAccess(&$media, &$user, ACL_WRITE_META, ACL_WRITE_MASK)) {
-          Logger::debug("User {$username} updates metadata of media {$id}");
-          $tmp = $this->Media->editMetaSingle(&$media, &$this->data);
-        } else {
-          Logger::debug("User {$username} updates tags of media {$id}");
-          $tmp = $this->Media->editTagSingle(&$media, &$this->data);
-        }
+        $tmp = $this->Media->editSingle(&$media, &$this->data);
         if (!$this->Media->save($tmp)) {
           Logger::warn("Could not save media");
@@ -644 +637 @@
         } else {
           Logger::info("Updated meta of media {$tmp['Media']['id']}");
+        }
+        if ($tmp['Media']['orientation']) {
+          $this->FileCache->delete($tmp);
+          Logger::debug("Deleted previews of media {$tmp['Media']['id']}");
         }
       }

models/media.php

@@ -707 +707 @@
   }
 
+  function rotate(&$data, $orientation, $rotation) {
+    $rotateClockwise = array(
+      1 => 8, 8 => 3, 3 => 6, 6 => 1, 
+      2 => 7, 7 => 4, 4 => 5, 5 => 2
+      );
+    $rotated = $orientation;
+    switch ($rotation) {
+      case '270': $rotated = $rotateClockwise[$rotated];
+      case '180': $rotated = $rotateClockwise[$rotated];
+      case '90': $rotated = $rotateClockwise[$rotated];
+      default: break;
+    }
+    if ($rotated != $orientation) {
+      $data['Media']['orientation'] = $rotated;
+    }
+  }
+ 
   /**
    * Prepare the input data for edit
@@ -718 +735 @@
       $this->splitGeo(&$data, $data['Media']['geo']);
     }
-    $fields = array('name', 'description', 'date', 'latitude', 'longitude');
+    $fields = array('name', 'description', 'date', 'latitude', 'longitude', 'rotation');
     foreach ($fields as $field) {
       if (!empty($data['Media'][$field])) {
@@ -743 +760 @@
   }
   
-  function editTagMulti(&$media, &$data) {
-    $tmp = array('Media' => array('id' => $media['Media']['id']));
-    
-    $tag = $this->Tag->editMetaMulti(&$media, &$data);
-    if ($tag) {
-      $tmp['Tag'] = $tag['Tag'];
-    }
-    if (count($tmp) == 1 && count($tmp['Media']) == 1) {
-      return false;
-    }
-    $tmp['Media']['flag'] = ($media['Media']['flag'] | MEDIA_FLAG_DIRTY);
-    return $tmp;
-  }
-  
-  function editMetaMulti(&$media, &$data) {
-    $tmp = array('Media' => array('id' => $media['Media']['id']));
-
-    $fields = array('name', 'description', 'date', 'latitude', 'longitude');
-    foreach ($fields as $field) {
-      if (empty($data['Media'][$field])) {
-        continue;
-      }
-      $tmp['Media'][$field] = $data['Media'][$field];
-    }
-    
-    $tag = $this->Tag->editMetaMulti(&$media, &$data);
-    if ($tag) {
-      $tmp['Tag'] = $tag['Tag'];
-    }
-    $category = $this->Category->editMetaMulti(&$media, &$data);
-    if ($category) {
-      $tmp['Category'] = $category['Category'];
-    }
-    $location = $this->Location->editMetaMulti(&$media, &$data);
-    if ($location) {
-      $tmp['Location'] = $location['Location'];
-    }
-    if (count($tmp) == 1 && count($tmp['Media']) == 1) {
+  function editMulti(&$media, &$data) {
+    $tmp = array('Media' => array('id' => $media['Media']['id'], 'user_id' => $media['Media']['user_id']));
+
+    if ($media['Media']['canWriteTag']) {
+      $tag = $this->Tag->editMetaMulti(&$media, &$data);
+      if ($tag) {
+        $tmp['Tag'] = $tag['Tag'];
+      }
+    }
+    if ($media['Media']['canWriteMeta']) {
+      $category = $this->Category->editMetaMulti(&$media, &$data);
+      if ($category) {
+        $tmp['Category'] = $category['Category'];
+      }
+      $location = $this->Location->editMetaMulti(&$media, &$data);
+      if ($location) {
+        $tmp['Location'] = $location['Location'];
+      }
+      $fields = array('latitude', 'longitude');
+      foreach ($fields as $field) {
+        if (empty($data['Media'][$field])) {
+          continue;
+        }
+        $tmp['Media'][$field] = $data['Media'][$field];
+      }
+    }
+    if ($media['Media']['canWriteCaption']) {
+      $fields = array('name', 'caption', 'date');
+      foreach ($fields as $field) {
+        if (empty($data['Media'][$field])) {
+          continue;
+        } else {
+          $tmp['Media'][$field] = $data['Media'][$field];
+        }
+      }
+      if (isset($data['Media']['rotation'])) {
+        $this->rotate(&$tmp, $media['Media']['orientation'], $data['Media']['rotation']);
+      }
+    }
+    if (count($tmp) == 1 && count($tmp['Media']) == 2) {
       return false;
     }
@@ -794 +813 @@
    * @return type 
    */
-  function editTagSingle(&$media, &$data) {
-    $tmp = array('Media' => array('id' => $media['Media']['id']));
-  
-    $tag = $this->Tag->editMetaSingle(&$media, &$data);
-    if (isset($tag['Tag'])) {
-      $tmp['Tag'] = $tag['Tag'];
-    }
-    if (count($tmp) == 1 && count($tmp['Media']) == 1) {
-      // Unchanged data
+  function editSingle(&$media, &$data) {
+    $tmp = array('Media' => array('id' => $media['Media']['id'], 'user_id' => $media['Media']['user_id']));
+    if ($media['Media']['canWriteTag']) {
+      $tag = $this->Tag->editMetaSingle(&$media, &$data);
+      if (isset($tag['Tag'])) {
+        $tmp['Tag'] = $tag['Tag'];
+      }
+    } 
+    if ($media['Media']['canWriteMeta']) {
+      $category = $this->Category->editMetaSingle(&$media, &$data);
+      if (isset($category['Category'])) {
+        $tmp['Category'] = $category['Category'];
+      }
+      $location = $this->Location->editMetaSingle(&$media, &$data);
+      if (isset($location['Location'])) {
+        $tmp['Location'] = $location['Location'];
+      }
+      if (!empty($data['Media']['geo'])) {
+        $this->splitGeo(&$data, $data['Media']['geo']);
+      }
+      $fields = array('latitude', 'longitude', 'altitude');
+      foreach ($fields as $field) {
+        if (isset($data['Media'][$field]) && $media['Media'][$field] !== $data['Media'][$field]) {
+          $tmp['Media'][$field] = $data['Media'][$field];
+        }
+      }
+    }
+    if ($media['Media']['canWriteCaption']) {
+      $fields = array('name', 'description', 'date', 'latitude', 'longitude');
+      foreach ($fields as $field) {
+        if (isset($data['Media'][$field]) && $media['Media'][$field] !== $data['Media'][$field]) {
+          $tmp['Media'][$field] = $data['Media'][$field];
+        }
+      }
+      if (isset($data['Media']['rotation'])) {
+        $this->rotate(&$tmp, $media['Media']['orientation'], $data['Media']['rotation']);
+      }
+    }
+    // Unchanged data
+    if (count($tmp) == 1 && count($tmp['Media']) == 2) {
       return false;
     }
@@ -808 +858 @@
     return $tmp;
   }
-    
-  /**
-   * Creates an new media data with updated values of given data
-   * 
-   * @param type $media Media model data array
-   * @param type $data Input data array
-   * @return type 
-   */
-  function editMetaSingle(&$media, &$data) {
-    $tmp = array('Media' => array('id' => $media['Media']['id']));
-    if (!empty($data['Media']['geo'])) {
-      $this->splitGeo(&$data, $data['Media']['geo']);
-    }
-    $fields = array('name', 'description', 'date', 'latitude', 'longitude');
-    foreach ($fields as $field) {
-      if (isset($data['Media'][$field]) && $media['Media'][$field] !== $data['Media'][$field]) {
-        $tmp['Media'][$field] = $data['Media'][$field];
-      }
-    }
-    $tag = $this->Tag->editMetaSingle(&$media, &$data);
-    if (isset($tag['Tag'])) {
-      $tmp['Tag'] = $tag['Tag'];
-    }
-    $category = $this->Category->editMetaSingle(&$media, &$data);
-    if (isset($category['Category'])) {
-      $tmp['Category'] = $category['Category'];
-    }
-    $location = $this->Location->editMetaSingle(&$media, &$data);
-    if (isset($location['Location'])) {
-      $tmp['Location'] = $location['Location'];
-    }
-    // Unchanged data
-    if (count($tmp) == 1 && count($tmp['Media']) == 1) {
-      return false;
-    }
-    $tmp['Media']['flag'] = ($media['Media']['flag'] | MEDIA_FLAG_DIRTY);
-    return $tmp;
-  }
 }
 ?>

views/elements/explorer/menu.ctp

@@ -1 +1 @@
 <?php
-  $canWriteTag = $canWriteMeta = $canWriteAcl = 0;
+  $canWriteTag = $canWriteMeta = $canWriteCaption = $canWriteAcl = 0;
   if (count($this->data)) {
     $canWriteTag = max(Set::extract('/Media/canWriteTag', $this->data));
     $canWriteMeta = max(Set::extract('/Media/canWriteMeta', $this->data));
+    $canWriteCaption = max(Set::extract('/Media/canWriteCaption', $this->data));
     $canWriteAcl = max(Set::extract('/Media/canWriteAcl', $this->data));
   }
@@ -85 +86 @@
 <?php 
   echo $form->hidden('Media.ids', array('id' => 'MediaIds'));
-  if ($canWriteMeta) {
-    echo $form->input('Media.date', array('type' => 'text', 'after' => $html->tag('div', __('E.g. 2008-08-07 15:30', true), array('class' => 'description')))); 
+  if ($canWriteTag) {
+    echo $form->input('Tag.names', array('label' => __('Tags', true), 'after' => $html->tag('div', __('E.g. newtag, -oldtag', true), array('class' => 'description'))));
+    echo $autocomplete->autoComplete('Tag.names', 'autocomplete/tag', array('split' => true));
   }
-  echo $form->input('Tag.names', array('label' => __('Tags', true), 'after' => $html->tag('div', __('E.g. newtag, -oldtag', true), array('class' => 'description'))));
-  echo $autocomplete->autoComplete('Tag.names', 'autocomplete/tag', array('split' => true));
   if ($canWriteMeta) {
     echo $form->input('Category.names', array('label' => __('Categories', true)));
@@ -102 +102 @@
     echo $autocomplete->autoComplete('Location.country', 'autocomplete/country');
     echo $form->input('Media.geo', array('label' => __('Geo data', true), 'maxlength' => 32, 'after' => $html->tag('div', __('latitude, longitude', true), array('class' => 'description'))));
+  }
+  if ($canWriteCaption) {
+    echo $form->input('Media.date', array('type' => 'text', 'after' => $html->tag('div', __('E.g. 2008-08-07 15:30', true), array('class' => 'description'))));
+    echo $form->input('Media.name', array('type' => 'text'));
+    echo $form->input('Media.caption', array('type' => 'textarea'));
+    $rotations = array(
+        '0' => __("Keep", true),
+        '90' => __("90 CW", true),
+        '180' => __("180 CW", true),
+        '270' => __("90 CCW", true)
+    );
+    echo $html->tag('div', $html->tag('label', __("Rotate", true)) .
+            $html->tag('div', $form->radio('Media.rotation', $rotations, array('legend' => false, 'value' => '0')), array('escape' => false, 'class' => 'radioSet')), array('escape' => false, 'class' => 'input radio'));
   }
 ?>

views/explorer/editmeta.ctp

@@ -1 +1 @@
 <?php 
-  $mediaId = $data['Media']['id'];
+  $mediaId = $this->data['Media']['id'];
   echo $form->create(null, array('url' => 'savemeta/'.$mediaId, 'id' => 'form-meta-'.$mediaId)); 
 ?>
 <fieldset>
 <?php
-  echo $form->input('Media.date', array('type' => 'text', 'value' => $data['Media']['date'], 'label' => __("Date", true)));
-  echo $form->input('Media.name', array('type' => 'text', 'value' => $data['Media']['name'], 'label' => __("Name", true)));
-  echo $form->input('Tag.names', array('label' => __('Tags', true), 'value' => join(', ', Set::extract('/Tag/name', $data))));
-  echo $autocomplete->autoComplete('Tags.text', 'autocomplete/tag', array('split' => true));
-  echo $form->input('Category.names', array('label' => __('Categories', true), 'value' => join(', ', Set::extract('/Category/name', $data))));
-  echo $autocomplete->autoComplete('Categories.text', 'autocomplete/category', array('split' => true));
-  echo $form->input('Location.city', array('label' => __('City', true), 'value' => join('', Set::extract('/Location[type='.LOCATION_CITY.']/name', $data))));
-  echo $autocomplete->autoComplete('Locations.city', 'autocomplete/city');
-  echo $form->input('Location.sublocation', array('label' => __('Sublocation', true), 'value' => join('', Set::extract('/Location[type='.LOCATION_SUBLOCATION.']/name', $data))));
-  echo $autocomplete->autoComplete('Locations.sublocation', 'autocomplete/sublocation');
-  echo $form->input('Location.state', array('label' => __('State', true), 'value' => join('', Set::extract('/Location[type='.LOCATION_STATE.']/name', $data))));
-  echo $autocomplete->autoComplete('Locations.state', 'autocomplete/state');
-  echo $form->input('Location.country', array('label' => __('Country', true), 'value' => join('', Set::extract('/Location[type='.LOCATION_COUNTRY.']/name', $data))));
-  echo $autocomplete->autoComplete('Locations.country', 'autocomplete/country');
-  echo $form->input('Media.geo', array('label' => __('Geo data', true), 'maxlength' => 32));
+  if ($this->data['Media']['canWriteTag']) {
+    echo $form->input('Tag.names', array('label' => __('Tags', true), 'value' => join(', ', Set::extract('/Tag/name', $this->data))));
+    echo $autocomplete->autoComplete('Tags.text', 'autocomplete/tag', array('split' => true));
+  }
+  if ($this->data['Media']['canWriteMeta']) {
+    echo $form->input('Category.names', array('label' => __('Categories', true), 'value' => join(', ', Set::extract('/Category/name', $this->data))));
+    echo $autocomplete->autoComplete('Categories.text', 'autocomplete/category', array('split' => true));
+    echo $form->input('Location.city', array('label' => __('City', true), 'value' => join('', Set::extract('/Location[type='.LOCATION_CITY.']/name', $this->data))));
+    echo $autocomplete->autoComplete('Locations.city', 'autocomplete/city');
+    echo $form->input('Location.sublocation', array('label' => __('Sublocation', true), 'value' => join('', Set::extract('/Location[type='.LOCATION_SUBLOCATION.']/name', $this->data))));
+    echo $autocomplete->autoComplete('Locations.sublocation', 'autocomplete/sublocation');
+    echo $form->input('Location.state', array('label' => __('State', true), 'value' => join('', Set::extract('/Location[type='.LOCATION_STATE.']/name', $this->data))));
+    echo $autocomplete->autoComplete('Locations.state', 'autocomplete/state');
+    echo $form->input('Location.country', array('label' => __('Country', true), 'value' => join('', Set::extract('/Location[type='.LOCATION_COUNTRY.']/name', $this->data))));
+    echo $autocomplete->autoComplete('Locations.country', 'autocomplete/country');
+    echo $form->input('Media.geo', array('label' => __('Geo data', true), 'maxlength' => 32));
+  }
+  if ($this->data['Media']['canWriteCaption']) {
+  echo $form->input('Media.date', array('type' => 'text', 'after' => $html->tag('div', __('E.g. 2008-08-07 15:30', true), array('class' => 'description'))));
+  echo $form->input('Media.name', array('type' => 'text'));
+  echo $form->input('Media.caption', array('type' => 'text'));
+  $rotations = array(
+      '0' => __("Keep", true),
+      '90' => __("90 CW", true),
+      '180' => __("180 CW", true),
+      '270' => __("90 CCW", true)
+  );
+  echo $html->tag('div', $html->tag('label', __("Rotate", true)) .
+          $html->tag('div', $form->radio('Media.rotation', $rotations, array('legend' => false, 'value' => '0')), array('escape' => false, 'class' => 'radioSet')), array('escape' => false, 'class' => 'input radio'));
+}
 ?>
 </fieldset>

views/explorer/index.ctp

@@ -70 +70 @@
               }
             });
+            $dialog.find('.radioSet').buttonset();
           }
         });