Changeset 1156 for trunk

Timestamp:

12/06/11 01:14:30 (6 months ago)

Author:

bogdan2412

Message:

Fix errors that appeared during deployment of avatar optimization

• Use hardlinks for full size avatars when possible, so we conserve

disk space.

• Skip users with invalid usernames
• Create 'tiny', 'small', etc folders if missing
• Added verbose parameter that allows one to view progress
• Coding style, don't use " when not needed.

There are still some tasks left, as described in
REVIEW URL ​http://reviewboard.infoarena.ro/r/180/

Location:

trunk

Files:

• common/avatar.php (modified) (1 diff)
• scripts/make-avatar-folder (modified) (6 diffs)

trunk/common/avatar.php

@@ -21 +21 @@
             'L50x50' => 'normal/' , '75x75'=> 'forum/', '150x150' => 'big/');
 
-    // Copying the original image
-    copy($filepath, IA_AVATAR_FOLDER.'full/'.$new_filename);
+    // Hardlink / Copy the original image
+    $new_filepath = IA_AVATAR_FOLDER . 'full/' . $new_filename;
+    if (is_file($new_filepath) || is_link($new_filepath)) {
+        unlink($new_filepath);
+    }
+    if (!link($filepath, $new_filepath)) {
+        if (!copy($filepath, $new_filepath)) {
+            log_error('Unable to copy user avatar into avatar folder');
+        }
+    }
 
     list($image_width, $image_height, $image_type, $image_attribute) =

trunk/scripts/make-avatar-folder

@@ -2 +2 @@
 <?php
 
-require_once(dirname($argv[0])."/utilities.php");
-require_once(IA_ROOT_DIR.'common/db/db.php');
-require_once(IA_ROOT_DIR.'www/controllers/attachment.php');
-require_once(IA_ROOT_DIR.'www/controllers/image_attachment.php');
-require_once(IA_ROOT_DIR.'common/db/attachment.php');
-require_once(IA_ROOT_DIR.'common/cache.php');
-require_once(IA_ROOT_DIR.'common/db/user.php');
-require_once(IA_ROOT_DIR.'common/avatar.php');
-require_once(IA_ROOT_DIR.'common/db/textblock.php');
+require_once(dirname($argv[0]) . '/utilities.php');
+require_once(IA_ROOT_DIR . 'common/db/db.php');
+require_once(IA_ROOT_DIR . 'www/controllers/attachment.php');
+require_once(IA_ROOT_DIR . 'www/controllers/image_attachment.php');
+require_once(IA_ROOT_DIR . 'common/db/attachment.php');
+require_once(IA_ROOT_DIR . 'common/cache.php');
+require_once(IA_ROOT_DIR . 'common/db/user.php');
+require_once(IA_ROOT_DIR . 'common/avatar.php');
+require_once(IA_ROOT_DIR . 'common/db/textblock.php');
 
 // Database connect
 db_connect();
+$verbose = getattr($argv, 1, false) === '-v';
 
 // Managing the userinfo template from the textblock table
-if (read_bool("Do you want to change the template/userinfo textblock?",
+if (read_bool('Do you want to change the template/userinfo textblock?',
         false)) {
     $textfortextblock = "table(compact). |=/5. ==UserImage".
@@ -28 +29 @@
     "\r\n\r\n\r\n";
     textblock_add_revision('template/userinfo', 'template/userinfo',
-            $textfortextblock, 1, "protected");
+            $textfortextblock, 1, 'protected');
 }
 
@@ -40 +41 @@
 if (file_exists(IA_AVATAR_FOLDER) == false) {
     mkdir(IA_AVATAR_FOLDER, 0777);
-    $size_types = array("tiny", "small", "normal", "forum", "big", "full");
-    foreach ($size_types as $size) {
-        if (file_exists(IA_AVATAR_FOLDER."/".$size) == false) {
-            mkdir(IA_AVATAR_FOLDER."/".$size, 0777);
-        }
+}
+$size_types = array('tiny', 'small', 'normal', 'forum', 'big', 'full');
+foreach ($size_types as $size) {
+    if (file_exists(IA_AVATAR_FOLDER . '/' . $size) == false) {
+        mkdir(IA_AVATAR_FOLDER . '/' . $size, 0777);
     }
 }
@@ -54 +55 @@
 // Going through all the users
 foreach ($userlist as $user) {
-    $attach = attachment_get('avatar', 'utilizator/'.$user);
+    if (!is_user_name($user)) {
+        log_warn('Invalid username: ' . $user);
+        continue;
+    }
+    $attach = attachment_get('avatar', 'utilizator/' . $user);
     $found = !is_null($attach);
 
@@ -60 +65 @@
         $real_name = attachment_get_filepath($attach);
         $found = file_exists($real_name);
-        if (!$found)
-            log_warn("File does not exists but it is in the Database.");
+        if (!$found) {
+            log_warn('File does not exists but it is in the Database.');
+        }
     }
 
@@ -74 +80 @@
 
     // The user has a valid image, resizing it, but keeping the attachment
+    if ($verbose) {
+        log_print('Processing user: ' . $user);
+    }
     avatar_cache_resized($real_name, $img_info, "a".$user);
 }