wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Updated php generator

Browse source 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
This commit is contained in:
John Molakvoæ (skjnldsv) 2018-02-27 14:36:42 +01:00
parent bca8d83f02
commit 57a1dc1231
No known key found for this signature in database
GPG key ID: 60C25B8C072916CF
1 changed files with 84 additions and 120 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

204
lib/private/Avatar.php
View file

@ -3,7 +3,7 @@
* @copyright Copyright (c) 2016, ownCloud, Inc. * @copyright Copyright (c) 2016, ownCloud, Inc.
* *
* @author Arthur Schiwon <blizzz@arthur-schiwon.de> * @author Arthur Schiwon <blizzz@arthur-schiwon.de>
* @author Christopher Schäpers <kondou@ts.unde.re> * @author Christopher Schäpers <kondou@ts.unde->re>
* @author Lukas Reschke <lukas@statuscode.ch> * @author Lukas Reschke <lukas@statuscode.ch>
* @author Morris Jobke <hey@morrisjobke.de> * @author Morris Jobke <hey@morrisjobke.de>
* @author Olivier Mehani <shtrom@ssji.net> * @author Olivier Mehani <shtrom@ssji.net>
@ -23,7 +23,7 @@
* GNU Affero General Public License for more details. * GNU Affero General Public License for more details.
* *
* You should have received a copy of the GNU Affero General Public License, version 3, * You should have received a copy of the GNU Affero General Public License, version 3,
* along with this program. If not, see <http://www.gnu.org/licenses/> * along with this program. If not, see <http://www->gnu.org/licenses/>
* *
*/ */
@ -41,20 +41,29 @@ use OCP\IL10N;
use OC_Image; use OC_Image;
use OCP\ILogger; use OCP\ILogger;
class Color {
public $r, $g, $b;
public function __construct($r, $g, $b) {
$this->r = $r;
$this->g = $g;
$this->b = $b;
}
}
/** /**
* This class gets and sets users avatars. * This class gets and sets users avatars.
*/ */
class Avatar implements IAvatar { class Avatar implements IAvatar {
/** @var ISimpleFolder */ /** @$ISimpleFolder */
private $folder; private $folder;
/** @var IL10N */ /** @$IL10N */
private $l; private $l;
/** @var User */ /** @$User */
private $user; private $user;
/** @var ILogger */ /** @$ILogger */
private $logger; private $logger;
/** @var IConfig */ /** @$IConfig */
private $config; private $config;
/** /**
@ -217,7 +226,7 @@ class Avatar implements IAvatar {
} else { } else {
$avatar = new OC_Image(); $avatar = new OC_Image();
/** @var ISimpleFile $file */ /** @$ISimpleFile $file */
$file = $this->folder->getFile('avatar.' . $ext); $file = $this->folder->getFile('avatar.' . $ext);
$avatar->loadFromData($file->getContent()); $avatar->loadFromData($file->getContent());
$avatar->resize($size); $avatar->resize($size);
@ -267,7 +276,7 @@ class Avatar implements IAvatar {
$backgroundColor = $this->avatarBackgroundColor($userDisplayName); $backgroundColor = $this->avatarBackgroundColor($userDisplayName);
$im = imagecreatetruecolor($size, $size); $im = imagecreatetruecolor($size, $size);
$background = imagecolorallocate($im, $backgroundColor[0], $backgroundColor[1], $backgroundColor[2]); $background = imagecolorallocate($im, $backgroundColor->r, $backgroundColor->g, $backgroundColor->b);
$white = imagecolorallocate($im, 255, 255, 255); $white = imagecolorallocate($im, 255, 255, 255);
imagefilledrectangle($im, 0, 0, $size, $size, $background); imagefilledrectangle($im, 0, 0, $size, $size, $background);
@ -291,131 +300,86 @@ class Avatar implements IAvatar {
} }
/** /**
* @param int $r * Calculate steps between two Colors
* @param int $g * @param object Color $steps start color
* @param int $b * @param object Color $ends end color
* @return double[] Array containing h s l in [0, 1] range * @return array [r,g,b] steps for each color to go from $steps to $ends
*/ */
private function rgbToHsl($r, $g, $b) { private function stepCalc($steps, $ends) {
$r /= 255.0; $step = array();
$g /= 255.0; $step[0] = ($ends[1]->r - $ends[0]->r) / $steps;
$b /= 255.0; $step[1] = ($ends[1]->g - $ends[0]->g) / $steps;
$step[2] = ($ends[1]->b - $ends[0]->b) / $steps;
$max = max($r, $g, $b); return $step;
$min = min($r, $g, $b);
$h = ($max + $min) / 2.0;
$l = ($max + $min) / 2.0;
if($max === $min) {
$h = $s = 0; // Achromatic
} else {
$d = $max - $min;
$s = $l > 0.5 ? $d / (2 - $max - $min) : $d / ($max + $min);
switch($max) {
case $r:
$h = ($g - $b) / $d + ($g < $b ? 6 : 0);
break;
case $g:
$h = ($b - $r) / $d + 2.0;
break;
case $b:
$h = ($r - $g) / $d + 4.0;
break;
}
$h /= 6.0;
}
return [$h, $s, $l];
} }
/**
* Convert a string to an integer evenly
* @param string $hash the text to parse
* @param int $maximum the maximum range
* @return int between 0 and $maximum
*/
private function mixPalette($steps, $color1, $color2) {
$count = $steps + 1;
$palette = array($color1);
$step = $this->stepCalc($steps, [$color1, $color2]);
for ($i = 1; $i < $steps; $i++) {
$r = intval($color1->r + ($step[0] * $i));
$g = intval($color1->g + ($step[1] * $i));
$b = intval($color1->b + ($step[2] * $i));
$palette[] = new Color($r, $g, $b);
}
return $palette;
}
/**
* Convert a string to an integer evenly
* @param string $hash the text to parse
* @param int $maximum the maximum range
* @return int between 0 and $maximum
*/
private function hashToInt($hash, $maximum) {
$final = 0;
$result = array();
// Splitting evenly the string
for ($i=0; $i< strlen($hash); $i++) {
// chars in md5 goes up to f, hex:16
$result[] = intval(substr($hash, $i, 1), 16) % 16;
}
// Adds up all results
foreach ($result as $value) {
$final += $value;
}
// chars in md5 goes up to f, hex:16
return intval($final % $maximum);
}
/** /**
* @param string $text * @param string $text
* @return int[] Array containting r g b in the range [0, 255] * @return Color Object containting r g b int in the range [0, 255]
*/ */
private function avatarBackgroundColor($text) { function avatarBackgroundColor($text) {
$hash = preg_replace('/[^0-9a-f]+/', '', $text); $hash = preg_replace('/[^0-9a-f]+/', '', $text);
$hash = md5($hash); $hash = md5($hash);
$hashChars = str_split($hash); $hashChars = str_split($hash);
$red = new Color(182, 70, 157);
$yellow = new Color(221, 203, 85);
$blue = new Color(0, 130, 201); // Nextcloud blue
// Number of steps to go from a color to another
// 3 colors * 6 will result in 18 generated colors
$steps = 6;
// Init vars $palette1 = $this->mixPalette($steps, $red, $yellow);
$result = ['0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0']; $palette2 = $this->mixPalette($steps, $yellow, $blue);
$rgb = [0, 0, 0]; $palette3 = $this->mixPalette($steps, $blue, $red);
$sat = 0.70;
$lum = 0.68;
$modulo = 16;
$finalPalette = array_merge($palette1, $palette2, $palette3);
// Splitting evenly the string return $finalPalette[$this->hashToInt($hash, $steps * 3 )];
foreach($hashChars as $i => $char) {
$result[$i % $modulo] .= intval($char, 16);
}
// Converting our data into a usable rgb format
// Start at 1 because 16%3=1 but 15%3=0 and makes the repartition even
for($count = 1; $count < $modulo; $count++) {
$rgb[$count%3] += (int)$result[$count];
}
// Reduce values bigger than rgb requirements
$rgb[0] %= 255;
$rgb[1] %= 255;
$rgb[2] %= 255;
$hsl = $this->rgbToHsl($rgb[0], $rgb[1], $rgb[2]);
// Classic formula to check the brightness for our eye
// If too bright, lower the sat
$bright = sqrt(0.299 * ($rgb[0] ** 2) + 0.587 * ($rgb[1] ** 2) + 0.114 * ($rgb[2] ** 2));
if ($bright >= 200) {
$sat = 0.60;
}
return $this->hslToRgb($hsl[0], $sat, $lum);
}
/**
* @param double $h Hue in range [0, 1]
* @param double $s Saturation in range [0, 1]
* @param double $l Lightness in range [0, 1]
* @return int[] Array containing r g b in the range [0, 255]
*/
private function hslToRgb($h, $s, $l){
$hue2rgb = function ($p, $q, $t){
if($t < 0) {
$t += 1;
}
if($t > 1) {
$t -= 1;
}
if($t < 1/6) {
return $p + ($q - $p) * 6 * $t;
}
if($t < 1/2) {
return $q;
}
if($t < 2/3) {
return $p + ($q - $p) * (2/3 - $t) * 6;
}
return $p;
};
if($s === 0){
$r = $l;
$g = $l;
$b = $l; // achromatic
}else{
$q = $l < 0.5 ? $l * (1 + $s) : $l + $s - $l * $s;
$p = 2 * $l - $q;
$r = $hue2rgb($p, $q, $h + 1/3);
$g = $hue2rgb($p, $q, $h);
$b = $hue2rgb($p, $q, $h - 1/3);
}
return array(round($r * 255), round($g * 255), round($b * 255));
} }
public function userChanged($feature, $oldValue, $newValue) { public function userChanged($feature, $oldValue, $newValue) {