? .svn
? media_emfield
? media_file
? media_file_browser
? media_media_mover
? media_metadata
? media_styles
? media_upload
? plugins
? .cache/.svn
? css/.svn
? images/.svn
? images/icons/.svn
? images/icons/default/.svn
? images/icons/default/_notes
? images/icons/ricebowl/.svn
? images/types/.svn
? images/types/video.png
? includes/.svn
? javascript/.svn
? javascript/plugins/.svn
? javascript/plugins/media.upload_multiple.js
? javascript/util/.svn
? modules/.svn
? modules/media_gallery/includes
? modules/media_internet/.svn
? resource/tests
? test/.svn
? theme/.svn
? wysiwyg_plugins/.svn
Index: media.admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/media/media.admin.inc,v
retrieving revision 1.22
diff -u -p -r1.22 media.admin.inc
--- media.admin.inc	18 Sep 2010 02:42:05 -0000	1.22
+++ media.admin.inc	4 Nov 2010 20:53:22 -0000
@@ -150,8 +150,19 @@ function media_admin_list() {
 function media_admin_thumbnails() {
   $limit = variable_get('media_admin_limit', 50);
 
-  $entity_controller = entity_get_controller('media');
-  $media_entities = $entity_controller->load(NULL, array(), 0, $limit);
+  $query = new EntityFieldQuery();
+
+  $query->range(0, $limit);
+  $query->entityCondition('entity_type', 'media');
+  
+  $result = $query->execute();
+  $ids = array_keys($result['media']);
+  if ($ids) {
+    $media_entities = entity_load('media', $ids);
+  }
+  else {
+    $media_entities = array();
+  }
 
   $destination = drupal_get_destination();
   $rows = array();
Index: media.browser.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/media/media.browser.inc,v
retrieving revision 1.23
diff -u -p -r1.23 media.browser.inc
--- media.browser.inc	26 Oct 2010 22:46:37 -0000	1.23
+++ media.browser.inc	4 Nov 2010 20:53:22 -0000
@@ -170,8 +170,7 @@ function media_browser_list() {
   if ($url_exclude_patterns) {
     $query->propertyCondition('uri', "%$v%", 'NOT LIKE');
   }
-
-  $entity_controller = entity_get_controller('media');
+  
   $result = $query->execute();
   $ids = array_keys($result['media']);
   if ($ids) {
@@ -268,60 +267,6 @@ function media_media_browser_plugin_view
 
   return array();
  }
-/**
- * @todo: Re-integrate the stream based filters, etc
- * Currently this function is not being used.  See media_browser_list
- *
- *  Any options needed to retrieve the file select options. An associate array
- *  with the following optional keys:
- *    'conditions' => An array of 'column' => 'value' to pass to the db query,
- *    'streams' => An array of streams to filter,
- *    'limit' => The number of results to return.
- */
-function media_browser_fid_list($options = array()) {
-  $conditions = isset($options['conditions']) ? $options['conditions'] : array();
-  $streams = isset($options['streams']) ? $options['streams'] : array();
-  $limit = isset($options['limit']) ? $options['limit'] : media_variable_get('browser_pager_limit');
-
-
-  $entity_controller = entity_get_controller('media');
-
-  $results = $entity_controller->load(NULL, $conditions);
-  return $results;
-  // @TODO: re-integrate this stuff.
-
-  // First get the fid's to load. We have to do that first, because
-  // entity_load doesn't accept a condition of LIKE, which we need for streams.
-  $select = db_select('file', 'f')
-    ->extend('PagerDefault')
-    ->fields('f', array('fid'));
-
-  // Filter on streams.
-  foreach ($streams as $stream) {
-    $select->condition('uri', db_like($stream) . '%', 'LIKE');
-  }
-
-  // Add our conditions.
-  foreach ($conditions as $field => $condition) {
-    $select->condition($field, $condition);
-  }
-
-  // Add our pager limit filter.
-  $select->limit($limit);
-
-  // Grab the uri's.
-  $fids = $select->execute()
-    ->fetchCol();
-
-  $selections = array();
-
-   if (!empty($fids)) {
-    // Now load the desired media to display.
-    $medias = entity_load('media', $fids);
-  }
-
-  return $selections;
-}
 
 /**
  * Silly function to recursively run check_plain on an array.
Index: media.types.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/media/media.types.inc,v
retrieving revision 1.12
diff -u -p -r1.12 media.types.inc
--- media.types.inc	3 Sep 2010 19:04:53 -0000	1.12
+++ media.types.inc	4 Nov 2010 20:53:22 -0000
@@ -286,72 +286,11 @@ else {
 
   }
 
-  class MediaEntityController extends EntityAPIController {
-
-    public $customConditions = array();
-    public $start;
-    public $limit;
-
-    /**
-     * Wrapper around the DB_API to allow conditions which are not ==
-     *
-     * @param $key
-     * @param $value
-     * @param $operator
-     * @return unknown_type
-     */
-    public function addCondition($key, $value, $operator = NULL) {
-      $this->customConditions = array($key, $value, $operator);
-    }
-
-    /**
-     * Takes a DB query and... does what?
-     * @param <type> $query
-     */
-    public function getMedia($query) {
-
-    }
-    /**
-     * Overloaded (and this sucks).  $conditions can be an array or key=>value pairs or DBNTG conditions.
-     * Sets status = TRUE by default.
-     *
-     * @see sites/all/modules/media/includes/EntityAPIController#load($ids, $conditions)
-     */
-    public function load($ids = array(), $conditions = array(), $start = NULL, $limit = NULL) {
-      // Conditions using the = (equals) operator.
-      $normal_conditions = array();
-      $normal_conditions['status'] = TRUE;
-
-      $this->start = $start;
-      $this->limit = $limit;
-
-      foreach ($conditions as $k => $condition) {
-        if (is_array($condition)) {
-          $this->customConditions[] = array($condition[0], $condition[1], $condition[2]);
-          // We can't use caching in this case
-          $this->cache = FALSE;
-        }
-        else {
-          $normal_conditions[$k] = $condition;
-        }
-      }
-
-      // Unfortuantely, the load method won't query unless there is at least one condition
-      // This is a bad pattern and undocumented side-effect.
-      // @todo: refactor this.
-      return parent::load($ids, $normal_conditions);
-    }
-
-    protected function buildQuery($ids, $conditions = array(), $revision_id = FALSE) {
-      $query = parent::buildQuery($ids, $conditions = array(), $revision_id = FALSE);
-      if ($this->limit) {
-        $query->range($this->start, $this->limit);
-      }
-      foreach ($this->customConditions as $condition) {
-        $query->condition($condition[0], $condition[1], $condition[2]);
-      }
-      return $query;
-    }
-  }
+  // Historically, this Entitycontroller has a point, now it is simply here
+  // so that the EntityAPI can be used.  Media isn't really using this API much anyway
+  // since the main benefits are CRUD extensions and media is based on the files API
+  // which has its own (bad) CRUD stuff.
+  // @todo: remove coupling on entity API (needs issue).
+  class MediaEntityController extends EntityAPIController{}
 }
 
Index: images/icons/default/application-octet-stream.png
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/media/images/icons/default/application-octet-stream.png,v
retrieving revision 1.2
diff -u -p -r1.2 application-octet-stream.png
Binary files /tmp/cvslJ6L9X and application-octet-stream.png differ
Index: images/icons/default/audio-mpeg.png
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/media/images/icons/default/audio-mpeg.png,v
retrieving revision 1.2
diff -u -p -r1.2 audio-mpeg.png
Binary files /tmp/cvsqdRIX1 and audio-mpeg.png differ
Index: images/icons/default/audio-x-generic.png
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/media/images/icons/default/audio-x-generic.png,v
retrieving revision 1.2
diff -u -p -r1.2 audio-x-generic.png
Binary files /tmp/cvsxe8KL5 and audio-x-generic.png differ
Index: images/icons/default/file-unknown.png
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/media/images/icons/default/file-unknown.png,v
retrieving revision 1.2
diff -u -p -r1.2 file-unknown.png
Binary files /tmp/cvsLkTRz9 and file-unknown.png differ
Index: images/icons/default/image-x-generic.png
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/media/images/icons/default/image-x-generic.png,v
retrieving revision 1.2
diff -u -p -r1.2 image-x-generic.png
Binary files /tmp/cvsanI4nd and image-x-generic.png differ
Index: images/icons/default/video-x-generic.png
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/media/images/icons/default/video-x-generic.png,v
retrieving revision 1.2
diff -u -p -r1.2 video-x-generic.png
Binary files /tmp/cvsMcYlch and video-x-generic.png differ
Index: test/media.entity.test
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/media/test/media.entity.test,v
retrieving revision 1.2
diff -u -p -r1.2 media.entity.test
--- test/media.entity.test	7 Apr 2010 06:29:34 -0000	1.2
+++ test/media.entity.test	4 Nov 2010 20:53:28 -0000
@@ -25,13 +25,16 @@ class MediaEntityTest extends DrupalWebT
     variable_set('simpletest_verbose', TRUE);
   }
   
-  function createMedia() {
+  function createMedia($filename = NULL) {
+    if (!$filename) {
+      $filename = uniqid() . '.jpg';
+    }
     //file_save_data()
     $values = array(
       'type' => 'image',
       'uid' => 1,
-      'filename' => 'fakefile.jpg',
-      'uri' => 'temporary://blah.jpg',
+      'filename' => $filename,
+      'uri' => 'temporary://' . $filename,
       'filemime' => 'image/jpeg',
       'filesize' => 12345,
       'status' 	 => 1,
@@ -44,25 +47,36 @@ class MediaEntityTest extends DrupalWebT
   }
   
   function testCreateMedia() {
-    $m = $this->createMedia();
+    $m = $this->createMedia('blah.jpg');
     $loaded = entity_get_controller('media')->load(array($m->fid));
     $media = current($loaded);
-    $this->assertEqual($media->filename, $m->filename);
+    $this->assertEqual($media->filename, 'blah.jpg');
   }
-  
+
+  /**
+   * Test the ability to create and query media items.
+   */
   function testQueryMedia() {
-    $m = $this->createMedia();
-    $controller = entity_get_controller('media');
-    $result = $controller->load(NULL, array(array('uri', 'temporary://%', 'LIKE')));
-    $this->assertEqual(count($result), 1, "Returned one result as expected for like % condition");
+    $this->createMedia('blah.jpg');
+    $this->createMedia('blah2.jpg');
+    
+    $query = new EntityFieldQuery();
+    $query->entityCondition('entity_type', 'media');
+    $query->propertyCondition('uri', 'temporary://%', 'LIKE');
+    $result = $query->execute();
+    $this->assertEqual(count($result['media']), 2, "Returned two results as expected for like % condition");
     
-    $controller = entity_get_controller('media');
-    $result = $controller->load(NULL, array(array('uri', 'http://%', 'LIKE')));
-    $this->assertNotEqual(count($result), 1, "Did not return 1 result");
+    $query = new EntityFieldQuery();
+    $query->entityCondition('entity_type', 'media');
+    $query->propertyCondition('uri', 'temporary://blah.jpg');
+    $result = $query->execute();
+    $this->assertEqual(count($result['media']), 1, "Got one result for equality query");
 
-    $controller = entity_get_controller('media');
-    $result = $controller->load(NULL, array('uri' => 'temporary://blah.jpg'));
-    $this->assertEqual(count($result), 1, "Got one result for normal conditions");
+    $query = new EntityFieldQuery();
+    $query->entityCondition('entity_type', 'media');
+    $query->propertyCondition('uri', 'http://%', 'LIKE');
+    $result = $query->execute();
+    $this->assertEqual(count($result), 0, "Got no results for http scheme uris");
   }
 }