From 0221159f8c62813bcb68ae33a23e3bb1f7c19e17 Mon Sep 17 00:00:00 2001 From: Heshan Wanigasooriya Date: Sun, 5 Dec 2010 15:48:43 +0000 Subject: Updating files to compatible with D7 --- plugins/video_s3/video_s3.info | 5 +-- plugins/video_zencoder/video_zencoder.info | 7 ++-- types/uploadfield/uploadfield.info | 11 ++--- types/uploadfield/uploadfield.install | 40 +++++++++--------- types/videoftp/videoftp.info | 10 ++--- video.info | 15 ++++--- video.install | 66 ++++++++++-------------------- 7 files changed, 67 insertions(+), 87 deletions(-) diff --git a/plugins/video_s3/video_s3.info b/plugins/video_s3/video_s3.info index 57898fc..6bcbcfa 100644 --- a/plugins/video_s3/video_s3.info +++ b/plugins/video_s3/video_s3.info @@ -2,7 +2,6 @@ name = Amazon S3 on Video description = Leverages the Video module and Amazon Simple Storage Service (Amazon S3) to serve and store your video's saving bandwidth. -package = "Video" +package = Video +core = 7.x dependencies[] = video -core = 6.x -version = 6.x-4.x-dev \ No newline at end of file diff --git a/plugins/video_zencoder/video_zencoder.info b/plugins/video_zencoder/video_zencoder.info index 02b4ae6..e44d5ae 100644 --- a/plugins/video_zencoder/video_zencoder.info +++ b/plugins/video_zencoder/video_zencoder.info @@ -2,8 +2,7 @@ name = Zencoder API on Video description = Zencoder is a webservice to transcode videos. -package = "Video" +package = Video +core = 7.x dependencies[] = video -dependencies[] = video_s3 -core = 6.x -version = 6.x-4.x-dev \ No newline at end of file +dependencies[] = video_s3 \ No newline at end of file diff --git a/types/uploadfield/uploadfield.info b/types/uploadfield/uploadfield.info index 9468461..3c5e92d 100644 --- a/types/uploadfield/uploadfield.info +++ b/types/uploadfield/uploadfield.info @@ -1,9 +1,10 @@ ; $Id$ + name = Video Upload description = Handle video upload for video module using filefield and CCK. -core = 6.x -version = 6.x-4.x-dev -dependencies[] = content -dependencies[] = filefield +package = Video +core = 7.x dependencies[] = video -package = "Video" \ No newline at end of file +files[] = uploadfield.module +files[] = uploadfield.field.inc +files[] = uploadfield.install \ No newline at end of file diff --git a/types/uploadfield/uploadfield.install b/types/uploadfield/uploadfield.install index a2e1b65..9f43a6d 100644 --- a/types/uploadfield/uploadfield.install +++ b/types/uploadfield/uploadfield.install @@ -2,24 +2,26 @@ // $Id$ /** - * Implementation of hook_install(). + * Implements hook_field_schema(). */ -function uploadfield_install() { - drupal_load('module', 'content'); - content_notify('install', 'uploadfield'); -} - -function uploadfield_uninstall() { - drupal_load('module', 'content'); - content_notify('uninstall', 'uploadfield'); -} - -function uploadfield_enable() { - drupal_load('module', 'content'); - content_notify('enable', 'uploadfield'); -} - -function uploadfield_disable() { - drupal_load('module', 'content'); - content_notify('disable', 'uploadfield'); +function uploadfield_field_schema($field) { + return array( + 'columns' => array( + 'fid' => array( + 'description' => 'The {file_managed}.fid being referenced in this field.', + 'type' => 'int', + 'not null' => FALSE, + 'unsigned' => TRUE, + ), + ), + 'indexes' => array( + 'fid' => array('fid'), + ), + 'foreign keys' => array( + 'fid' => array( + 'table' => 'file_managed', + 'columns' => array('fid' => 'fid'), + ), + ), + ); } \ No newline at end of file diff --git a/types/videoftp/videoftp.info b/types/videoftp/videoftp.info index 73b9318..c14f111 100644 --- a/types/videoftp/videoftp.info +++ b/types/videoftp/videoftp.info @@ -1,9 +1,7 @@ ; $Id$ + name = Video FTP description = Allows you to attach videos uploaded through FTP to nodes. -core = 6.x -version = 6.x-4.x-dev -dependencies[] = content -dependencies[] = filefield -dependencies[] = video -package = "Video" \ No newline at end of file +package = Video +core = 7.x +dependencies[] = video \ No newline at end of file diff --git a/video.info b/video.info index b4a584b..c18d370 100644 --- a/video.info +++ b/video.info @@ -1,9 +1,12 @@ ;$Id$ name = Video -description = Allows Creation of CCK Video Fields. -package = "Video" -dependencies[] = content -dependencies[] = filefield -core = 6.x -version = 6.x-4.x-dev \ No newline at end of file +description = Implementation of a video field +package = Video +core = 7.x +files[] = video.module +files[] = video.admin.inc +files[] = video.drush.inc +files[] = video.theme.inc +files[] = video_formatter.inc +files[] = video_schedular.inc \ No newline at end of file diff --git a/video.install b/video.install index 153ce1b..35fcc31 100644 --- a/video.install +++ b/video.install @@ -6,7 +6,7 @@ * Provides installation functions for video.module. * * @author Heshan Wanigasooriya - * + * * @todo */ @@ -15,7 +15,7 @@ */ function video_schema() { $schema['video_files'] = array( - 'description' => t('Store video transcoding queue'), + 'description' => 'Store video transcoding queue', 'fields' => array( 'vid' => array( 'description' => t('Video id'), @@ -24,21 +24,21 @@ function video_schema() { 'not null' => TRUE, ), 'fid' => array( - 'description' => t('Original file id'), + 'description' => 'Original file id', 'type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0, ), 'nid' => array( - 'description' => t('Node id'), + 'description' => 'Node id', 'type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0, ), 'status' => array( - 'description' => t('Status of the transcoding'), + 'description' => 'Status of the transcoding', 'type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, @@ -48,7 +48,7 @@ function video_schema() { 'type' => 'varchar', 'length' => '255', 'default' => '', - 'description' => t('The dimensions of the video.'), + 'description' => 'The dimensions of the video.', ), 'started' => array( 'description' => t('Started transcodings'), @@ -57,7 +57,7 @@ function video_schema() { 'default' => 0, ), 'completed' => array( - 'description' => t('Transcoding completed'), + 'description' => 'Transcoding completed', 'type' => 'int', 'not null' => TRUE, 'default' => 0, @@ -78,18 +78,19 @@ function video_schema() { return $schema; } + /** * Implementation of hook_install(). */ function video_install() { - drupal_install_schema('video'); +// drupal_install_schema('video'); } /** * Implementation of hook_uninstall(). */ function video_uninstall() { - drupal_uninstall_schema('video'); +// drupal_uninstall_schema('video'); // Delete all variables which begin with the namespaced "video_*". $video_vars = array(); $query = "SELECT name FROM {variable} WHERE name LIKE '%video_%'"; @@ -102,41 +103,18 @@ function video_uninstall() { } /** - * Update 6405 - * dropping video_rendering table and creating video_files - * @return - */ -function video_update_6405() { - $ret = array(); - $ret[] = update_sql("DROP TABLE IF EXISTS {video_rendering}"); - $ret[] = update_sql("DROP TABLE IF EXISTS {video_files}"); - $table = video_schema(); - db_create_table($ret, 'video_files', $table['video_files']); - return $ret; -} - -/** - * Update 6406 - * @return + * Implements hook_requirements() to check the PHP GD Library. + * + * @param $phase + * @TODO : add requirment when this need FFMPEG, thing on install profiles */ -function video_update_6406() { - drupal_set_message('The system has reset your thumbnail and ffmpeg command settings to their original state. If you made adjustments to these commands, you will have to reset them up.'); -//lets reset our ffmpeg system command variables. - variable_set('video_ffmpeg_thumbnailer_options', '-i !videofile -an -y -f mjpeg -ss !seek -vframes 1 !thumbfile'); - variable_set('video_ffmpeg_helper_auto_cvr_options', '-y -i !videofile -f flv -ar 22050 -ab !audiobitrate -s !size -b !videobitrate -qscale 1 !convertfile'); - return array(); -} +function video_requirements($phase) { + $requirements = array(); -/** - * Update 6407 - */ -function video_update_6407() { - $ret = array(); -// drop un wanted fields in video files - db_drop_field($ret, 'video_files', 'filesize'); - db_drop_field($ret, 'video_files', 'filename'); - db_drop_field($ret, 'video_files', 'filepath'); - db_drop_field($ret, 'video_files', 'filemime'); - db_add_column($ret, 'video_files', 'data', 'longtext', array('null' => TRUE)); - return $ret; + if ($phase == 'runtime') { + $requirements['video']['value'] = t('1.0'); + $requirements['video']['severity'] = REQUIREMENT_OK; + $requirements['video']['title'] = t('GD library rotate and desaturate effects'); + } + return $requirements; } \ No newline at end of file -- cgit v1.2.3