arno/lychee
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'pyro2927-feature/photo_checksum'

Browse Source
This commit is contained in:
Tobias Reich 2014-07-05 00:40:21 +02:00
commit 34cae0db24
7 changed files with 35 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
assets/js/lychee.js
View File

@ -8,8 +8,8 @@
var lychee = {
title: "",
version: "2.5",
version_code: "020500",
version: "2.5.5",
version_code: "020505",
api_path: "php/api.php",
update_path: "http://lychee.electerious.com/version/index.php",

2
assets/min/main.js
View File

File diff suppressed because one or more lines are too long

2
assets/min/view.js
View File

File diff suppressed because one or more lines are too long

1
php/database/photos_table.sql
View File

@ -23,5 +23,6 @@ CREATE TABLE IF NOT EXISTS `lychee_photos` (
`star` tinyint(1) NOT NULL,
`thumbUrl` varchar(50) NOT NULL,
`album` varchar(30) NOT NULL DEFAULT '0',
`checksum` VARCHAR(100) DEFAULT NULL,
PRIMARY KEY (`id`)
) ENGINE=MyISAM DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;

25
php/database/update_020505.php Normal file
View File

@ -0,0 +1,25 @@
<?php
###
# @name Update to version 2.5.5
# @author Tobias Reich
# @copyright 2014 by Tobias Reich
###
# Add `checksum`
if (!$database->query("SELECT `checksum` FROM `lychee_photos` LIMIT 1;")) {
$result = $database->query("ALTER TABLE `lychee_photos` ADD `checksum` VARCHAR(100) DEFAULT NULL");
if (!$result) {
Log::error($database, 'update_020500', __LINE__, 'Could not update database (' . $database->error . ')');
return false;
}
}
# Set version
$result = $database->query("UPDATE lychee_settings SET value = '020505' WHERE `key` = 'version';");
if (!$result) {
Log::error($database, 'update_020505', __LINE__, 'Could not update database (' . $database->error . ')');
return false;
}
?>

3
php/modules/Database.php
View File

@ -46,7 +46,8 @@ class Database extends Module {
'020100', #2.1
'020101', #2.1.1
'020200', #2.2
'020500' #2.5
'020500', #2.5
'020505' #2.5.5
);
# For each update

5
php/modules/Photo.php
View File

@ -130,7 +130,7 @@ class Photo extends Module {
}
# Save to DB
$query = "INSERT INTO lychee_photos (id, title, url, description, tags, type, width, height, size, iso, aperture, make, model, shutter, focal, takestamp, thumbUrl, album, public, star)
$query = "INSERT INTO lychee_photos (id, title, url, description, tags, type, width, height, size, iso, aperture, make, model, shutter, focal, takestamp, thumbUrl, album, public, star, checksum)
VALUES (
'" . $id . "',
'" . $info['title'] . "',
@ -151,7 +151,8 @@ class Photo extends Module {
'" . md5($id) . ".jpeg',
'" . $albumID . "',
'" . $public . "',
'" . $star . "');";
'" . $star . "',
'" . md5_file($path) . "');";
$result = $this->database->query($query);
if (!$result) {