From d04fd1d44ef631d69098c007dd3706df04a7f73b Mon Sep 17 00:00:00 2001 From: plegall Date: Thu, 25 Sep 2008 23:01:35 +0000 Subject: feature 868 added: pwg.images.add checks if the same file has not alread been uploaded. git-svn-id: http://piwigo.org/svn/trunk@2592 68402e56-0260-453c-a942-63ccdbb3a9ee --- include/ws_functions.inc.php | 13 +++++++++++++ install/db/78-database.php | 46 ++++++++++++++++++++++++++++++++++++++++++++ install/piwigo_structure.sql | 1 + 3 files changed, 60 insertions(+) create mode 100644 install/db/78-database.php diff --git a/include/ws_functions.inc.php b/include/ws_functions.inc.php index f125515c6..82635a213 100644 --- a/include/ws_functions.inc.php +++ b/include/ws_functions.inc.php @@ -902,6 +902,18 @@ function ws_images_add($params, &$service) // fwrite($fh_log, 'input: '.$params['file_sum']."\n"); // fwrite($fh_log, 'input: '.$params['thumbnail_sum']."\n"); + // does the image already exists ? + $query = ' +SELECT + COUNT(*) AS counter + FROM '.IMAGES_TABLE.' + WHERE md5sum = \''.$params['file_sum'].'\' +;'; + list($counter) = mysql_fetch_row(pwg_query($query)); + if ($counter != 0) { + return new PwgError(500, 'file already exists'); + } + // current date list($dbnow) = mysql_fetch_row(pwg_query('SELECT NOW();')); list($year, $month, $day) = preg_split('/[^\d]/', $dbnow, 4); @@ -986,6 +998,7 @@ function ws_images_add($params, &$service) 'filesize' => floor(filesize($file_path)/1024), 'width' => $width, 'height' => $height, + 'md5sum' => $params['file_sum'], ); $info_columns = array( diff --git a/install/db/78-database.php b/install/db/78-database.php new file mode 100644 index 000000000..7ab247512 --- /dev/null +++ b/install/db/78-database.php @@ -0,0 +1,46 @@ + diff --git a/install/piwigo_structure.sql b/install/piwigo_structure.sql index 1ba00ca62..f4519839c 100644 --- a/install/piwigo_structure.sql +++ b/install/piwigo_structure.sql @@ -193,6 +193,7 @@ CREATE TABLE `piwigo_images` ( `storage_category_id` smallint(5) unsigned default NULL, `high_filesize` mediumint(9) unsigned default NULL, `level` tinyint unsigned NOT NULL default '0', + `md5sum` char(32) default NULL, PRIMARY KEY (`id`), KEY `images_i2` (`date_available`), KEY `images_i3` (`average_rate`), -- cgit v1.2.3