New upgrade process for 4.7

5 files changed, 198 insertions, 101 deletions

diff --git a/INSTALL.txt b/INSTALL.txt
index 5b51cd0..b47cff8 100644
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -1,14 +1,189 @@
 // $Id$
 
 INSTALL INSTRUCTIONS FOR VIDEO.MODULE
-----
+-------------------------------------
 
-1-Copy video folder to modules/
-2-Create database table using video.mysql file
-3-Login as site administrator
-4-Activate video.module as usual (administer->modules)
-5-Set access control as you like (administer->access control)
-6-(optional) Activate video.module blocks (administer->blocks)
+- Copy video folder to modules/
+- Login as site administrator
+- Activate video.module as usual (administer->modules)
+- Set access control as you like (administer->access control)
+- (optional) Activate video.module blocks (administer->blocks)
 
 
+UPGRADING FROM DRUPAL 4.7 to CVS
+--------------------------------
 
+The upgrade process is automated by the video.install file, so
+be sure you have the correct version of video.install to match
+the version of video.module you intend to use. If you downloaded
+a tarball of Video from drupal.org and over-wrote everything in
+your Video module directory, you should be fine.
+
+Run the update.php script that comes in the Drupal distribution
+  http://www.example.com/update.php
+
+
+UPGRADING FROM 4.6 OR 4.6 CVS
+-----------------------------
+
+Starting in Drupal 4.7, the video module has an automated upgrade.
+If you installed and used the stable video 4.6 release, the
+update.php script that upgrades Drupal will also update the
+video database schema. http://www.example.com/update.php
+
+If you decided to use a CVS version of Video for Drupal 4.6, you
+can still take advantage of the automated ugprade, but you will
+need to select an update version number when you run update.php.
+
+The following is a key of upgrade version numbers for Video CVS
+database schemas between the Drupal 4.6 and Drupal 4.7
+changes. When you find a database schema that matches your
+existing schema, select the corresponding update.php version
+number when you run update.php. You can get your current database
+schema by looking at the old video.mysql file you used to create
+your video table or execute the following SQL query:
+  `DESCRIBE video;`
+
+Some differences between versions are subtle, but important, so
+make sure you verify your video table is an actual fit, not just
+"close enough".
+
+VIDEO UPDATE.PHP VERSION 2
+--------------------------
+
+  CREATE TABLE video (
+    nid int(10) unsigned NOT NULL default '0',
+    vidfile text NOT NULL,
+    videox smallint(4) NOT NULL default '0',
+    videoy smallint(4) NOT NULL default '0',
+    size bigint(13) default NULL,
+    clicks int(10) unsigned NOT NULL default '0',
+    video_bitrate int(11) default NULL,
+    audio_bitrate int(11) default NULL,
+    audio_sampling_rate int(11) default NULL,
+    audio_channels enum('','stereo','mono') default NULL,  
+    playtime_seconds int(11) default NULL,
+    PRIMARY KEY  (nid)
+  ) TYPE=MyISAM COMMENT='size is in bytes';
+  
+
+VIDEO UPDATE.PHP VERSION 3
+--------------------------
+
+  CREATE TABLE video (
+    nid int(10) unsigned NOT NULL default '0',
+    vidfile text NOT NULL,
+    videox smallint(4) NOT NULL default '0',
+    videoy smallint(4) NOT NULL default '0',
+    size bigint(13) default NULL,
+    download_counter int(10) unsigned NOT NULL default '0',
+    play_counter int(10) unsigned NOT NULL default '0',
+    video_bitrate int(11) default NULL,
+    audio_bitrate int(11) default NULL,
+    audio_sampling_rate int(11) default NULL,
+    audio_channels enum('','5.1','stereo','mono') default NULL,  
+    playtime_seconds int(11) default NULL,
+    download_folder varchar(255) NULL default NULL,
+    disable_multidownload tinyint(1) NOT NULL default '0',
+    use_play_folder tinyint(1) NOT NULL default '0',
+    custom_field_1 varchar(255) NULL default NULL,
+    custom_field_2 varchar(255) NULL default NULL,
+    custom_field_3 varchar(255) NULL default NULL,
+    custom_field_4 varchar(255) NULL default NULL,
+    custom_field_5 text NULL default NULL,
+    custom_field_6 text NULL default NULL,
+    PRIMARY KEY  (nid)
+  ) TYPE=MyISAM COMMENT='size is in bytes';
+  
+
+VIDEO UPDATE.PHP VERSION 4
+--------------------------
+
+  -- $Id$
+  CREATE TABLE video (
+    nid int(10) unsigned NOT NULL default '0',
+    vidfile text NOT NULL default '',
+    videox smallint(4) unsigned NOT NULL default '0',
+    videoy smallint(4) unsigned NOT NULL default '0',
+    size bigint(13) unsigned default NULL,
+    download_counter int(10) unsigned NOT NULL default '0',
+    play_counter int(10) unsigned NOT NULL default '0',
+    video_bitrate int(11) unsigned default NULL,
+    audio_bitrate int(11) unsigned default NULL,
+    audio_sampling_rate int(11) unsigned default NULL,
+    audio_channels enum('','5.1','stereo','mono') default NULL,  
+    playtime_seconds int(11) unsigned default NULL,
+    download_folder varchar(255) NULL default NULL,
+    disable_multidownload tinyint(1) unsigned NOT NULL default '0',
+    use_play_folder tinyint(1) unsigned NOT NULL default '0',
+    custom_field_1 varchar(255) NULL default NULL,
+    custom_field_2 varchar(255) NULL default NULL,
+    custom_field_3 varchar(255) NULL default NULL,
+    custom_field_4 varchar(255) NULL default NULL,
+    custom_field_5 text NULL default NULL,
+    custom_field_6 text NULL default NULL,
+    PRIMARY KEY  (nid)
+  ) TYPE=MyISAM COMMENT='size is in bytes';
+  
+
+VIDEO UPDATE.PHP VERSION 5
+--------------------------
+
+  -- $Id$
+  CREATE TABLE video (
+    vid int(10) unsigned NOT NULL default '0',
+    nid int(10) unsigned NOT NULL default '0',
+    vidfile text NOT NULL default '',
+    videox smallint(4) unsigned NOT NULL default '0',
+    videoy smallint(4) unsigned NOT NULL default '0',
+    size bigint(13) unsigned default NULL,
+    download_counter int(10) unsigned NOT NULL default '0',
+    play_counter int(10) unsigned NOT NULL default '0',
+    video_bitrate int(10) unsigned default NULL,
+    audio_bitrate int(10) unsigned default NULL,
+    audio_sampling_rate int(10) unsigned default NULL,
+    audio_channels enum('','5.1','stereo','mono') default NULL,  
+    playtime_seconds int(10) unsigned default NULL,
+    download_folder varchar(255) NULL default NULL,
+    disable_multidownload tinyint(1) unsigned NOT NULL default '0',
+    use_play_folder tinyint(1) unsigned NOT NULL default '0',
+    custom_field_1 varchar(255) NULL default NULL,
+    custom_field_2 varchar(255) NULL default NULL,
+    custom_field_3 varchar(255) NULL default NULL,
+    custom_field_4 varchar(255) NULL default NULL,
+    custom_field_5 text NULL default NULL,
+    custom_field_6 text NULL default NULL,
+    serialized_data text NULL default NULL,
+    PRIMARY KEY  (vid)
+  ) TYPE=MyISAM COMMENT='size is in bytes';  
+  
+VIDEO UPDATE.PHP VERSION 6
+--------------------------
+
+  -- $Id$
+  CREATE TABLE video (
+    vid int(10) unsigned NOT NULL default '0',
+    nid int(10) unsigned NOT NULL default '0',
+    vidfile text NOT NULL default '',
+    videox smallint(4) unsigned NOT NULL default '0',
+    videoy smallint(4) unsigned NOT NULL default '0',
+    size bigint(13) unsigned default NULL,
+    download_counter int(10) unsigned NOT NULL default '0',
+    play_counter int(10) unsigned NOT NULL default '0',
+    video_bitrate int(10) unsigned default NULL,
+    audio_bitrate int(10) unsigned default NULL,
+    audio_sampling_rate int(10) unsigned default NULL,
+    audio_channels enum('','5.1','stereo','mono') default NULL,  
+    playtime_seconds int(10) unsigned default NULL,
+    download_folder varchar(255) NULL default NULL,
+    disable_multidownload tinyint(1) unsigned NOT NULL default '0',
+    use_play_folder tinyint(1) unsigned NOT NULL default '0',
+    custom_field_1 varchar(255) NULL default NULL,
+    custom_field_2 varchar(255) NULL default NULL,
+    custom_field_3 varchar(255) NULL default NULL,
+    custom_field_4 varchar(255) NULL default NULL,
+    custom_field_5 text NULL default NULL,
+    custom_field_6 text NULL default NULL,
+    serialized_data text NULL default NULL,
+    PRIMARY KEY  (vid)
+  ) TYPE=MyISAM /*!40100 DEFAULT CHARACTER SET utf8 */;
\ No newline at end of file
diff --git a/README.txt b/README.txt
index 5ee5b29..9c490d1 100644
--- a/README.txt
+++ b/README.txt
@@ -7,16 +7,17 @@ This module add the possibility to create
 video nodes wich are containers to embed
 videos into drupal pages.
 
-For installation instructions see INSTALL.txt
+For installation and upgrade instructions see INSTALL.txt
 
-For informations about supported files see FILE_TYPES.txt
+For information about supported file types see FILE_TYPES.txt
 
 For general instructions read video.module handbook:
-http://drupal.org/handbook/modules/video
+  http://drupal.org/handbook/modules/video
 
-Please send comments to:
-Fabio Varesano: fvaresano at yahoo dot it
-or
-David Norman: deekayen (at) deekayen [dot-} net
-or
-Luke Last - luke [at] lukelast dot com
+Please submit bugs/features/support requests at:
+  http://drupal.org/node/add/project_issue/video
+  
+Maintainers:
+  Fabio Varesano: fvaresano at yahoo dot it
+  David Norman:   deekayen (at) deekayen [dot-} net
+  Luke Last:      luke [at] lukelast dot com
\ No newline at end of file
diff --git a/TODO.txt b/TODO.txt
index 6a2feb0..1aa03a7 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -1,9 +1,11 @@
 // $Id$
 
-TODO LIST (in order of importance)
------------
+TODO LIST
+---------
 
-- Intensive testing
 - Upload feature - http://drupal.org/node/26978
 - Add mp4 support - http://drupal.org/node/26505
-- Your suggestions here...
+- Thumbnails - http://drupal.org/node/31784
+- Work on XHTML compliance - http://drupal.org/node/30953
+- Director/Flash (.dcr/.dir and .swf) - http://drupal.org/node/30100
+- Your suggestions here - http://drupal.org/node/add/project_issue/video
\ No newline at end of file
diff --git a/UPGRADE.txt b/UPGRADE.txt
deleted file mode 100644
index f347e0f..0000000
--- a/UPGRADE.txt
+++ /dev/null
@@ -1,54 +0,0 @@
-// $Id$
-UPGRADING FROM 4.6 TO 4.7
-
-1 - Backup your database and your drupal directory
-
-2 - Using your favorite mysql client run the following SQL queries:
-
-If upgrading from video.module for drupal 4.6:
-ALTER TABLE `video`
-  CHANGE `videox` `videox` smallint(4) unsigned NOT NULL default '0',
-  CHANGE `videoy` `videoy` smallint(4) unsigned NOT NULL default '0',
-  CHANGE `size` `size` bigint(13) unsigned default NULL,
-  CHANGE `clicks` `download_counter` INT( 10 ) UNSIGNED NOT NULL DEFAULT '0',
-  ADD play_counter int(10) unsigned NOT NULL default '0',
-  ADD video_bitrate int(11) unsigned default NULL,
-  ADD audio_bitrate int(11) unsigned default NULL,
-  ADD audio_sampling_rate int(11) unsigned default NULL,
-  ADD audio_channels enum('','5.1','stereo','mono') default NULL,
-  ADD playtime_seconds int(11) unsigned default NULL,
-  ADD download_folder varchar(255) NULL default NULL,
-  ADD disable_multidownload tinyint(1) unsigned NOT NULL default '0',
-  ADD use_play_folder tinyint(1) unsigned NOT NULL default '0',
-  ADD custom_field_1 varchar(255) NULL default NULL,
-  ADD custom_field_2 varchar(255) NULL default NULL,
-  ADD custom_field_3 varchar(255) NULL default NULL,
-  ADD custom_field_4 varchar(255) NULL default NULL,
-  ADD custom_field_5 varchar(255) NULL default NULL,
-  ADD custom_field_6 varchar(255) NULL default NULL
-;
-
-
-If upgrading from video.module v1.8 database scheme:
-
-ALTER TABLE `video` CHANGE `clicks` `download_counter` INT( 10 ) UNSIGNED NOT NULL DEFAULT '0';
-ALTER TABLE `video` CHANGE `audio_channels` `audio_channels` ENUM( '', '5.1', 'stereo', 'mono' ) NULL DEFAULT NULL;
-ALTER TABLE video ADD play_counter int(10) unsigned NOT NULL default '0';
-ALTER TABLE video ADD download_folder varchar(255) NULL default NULL;
-ALTER TABLE video ADD disable_multidownload tinyint(1) unsigned NOT NULL default '0';
-ALTER TABLE video ADD use_play_folder tinyint(1) unsigned NOT NULL default '0';
-ALTER TABLE video ADD custom_field_1 varchar(255) NULL default NULL;
-ALTER TABLE video ADD custom_field_2 varchar(255) NULL default NULL;
-ALTER TABLE video ADD custom_field_3 varchar(255) NULL default NULL;
-ALTER TABLE video ADD custom_field_4 varchar(255) NULL default NULL;
-ALTER TABLE video ADD custom_field_5 text NULL default NULL;
-ALTER TABLE video ADD custom_field_6 text NULL default NULL;
-
-3 - Replace video.module file for 4.6 with video.module for 4.7
-
-4 - Your video.module installation is upgraded
-
-5 - Report any problems to 
-    Fabio Varesano - fvaresano at yahoo dot it
-	 or
-	 Luke Last - luke [at] lukelast dot com
diff --git a/video.mysql b/video.mysql
deleted file mode 100644
index 25d609f..0000000
--- a/video.mysql
+++ /dev/null
@@ -1,27 +0,0 @@
--- $Id$
-CREATE TABLE video (
-  vid int(10) unsigned NOT NULL default '0',
-  nid int(10) unsigned NOT NULL default '0',
-  vidfile text NOT NULL default '',
-  videox smallint(4) unsigned NOT NULL default '0',
-  videoy smallint(4) unsigned NOT NULL default '0',
-  size bigint(13) unsigned default NULL,
-  download_counter int(10) unsigned NOT NULL default '0',
-  play_counter int(10) unsigned NOT NULL default '0',
-  video_bitrate int(10) unsigned default NULL,
-  audio_bitrate int(10) unsigned default NULL,
-  audio_sampling_rate int(10) unsigned default NULL,
-  audio_channels enum('','5.1','stereo','mono') default NULL,  
-  playtime_seconds int(10) unsigned default NULL,
-  download_folder varchar(255) NULL default NULL,
-  disable_multidownload tinyint(1) unsigned NOT NULL default '0',
-  use_play_folder tinyint(1) unsigned NOT NULL default '0',
-  custom_field_1 varchar(255) NULL default NULL,
-  custom_field_2 varchar(255) NULL default NULL,
-  custom_field_3 varchar(255) NULL default NULL,
-  custom_field_4 varchar(255) NULL default NULL,
-  custom_field_5 text NULL default NULL,
-  custom_field_6 text NULL default NULL,
-  serialized_data text NULL default NULL,
-  PRIMARY KEY  (vid)
-) TYPE=MyISAM /*!40100 DEFAULT CHARACTER SET utf8 */;