diff options
author | Georg Ehrke <developer@georgehrke.com> | 2014-05-21 14:14:10 +0400 |
---|---|---|
committer | Georg Ehrke <developer@georgehrke.com> | 2014-05-31 14:17:54 +0400 |
commit | 2bcfd8e084b27ed89cf6e62bc9ab2c681d5a8361 (patch) | |
tree | bff130f767536eca5892511e0de26bab317b9697 /lib/private/app.php | |
parent | b9f059bd3ee75247058bd5eb9908f6c33ffa08e2 (diff) |
make it possible to update shipped apps via the appstore
Diffstat (limited to 'lib/private/app.php')
-rw-r--r-- | lib/private/app.php | 250 |
1 files changed, 184 insertions, 66 deletions
diff --git a/lib/private/app.php b/lib/private/app.php index 2f55b54b328..e672df7b32a 100644 --- a/lib/private/app.php +++ b/lib/private/app.php @@ -3,8 +3,13 @@ * ownCloud * * @author Frank Karlitschek + * @copyright 2012 Frank Karlitschek <frank@owncloud.org> + * * @author Jakob Sack - * @copyright 2012 Frank Karlitschek frank@owncloud.org + * @copyright 2012 Jakob Sack <mail@jakobsack.de> + * + * @author Georg Ehrke + * @copyright 2014 Georg Ehrke <georg@ownCloud.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE @@ -211,48 +216,50 @@ class OC_App{ */ public static function enable( $app ) { self::$enabledAppsCache = array(); // flush - if(!OC_Installer::isInstalled($app)) { - // check if app is a shipped app or not. OCS apps have an integer as id, shipped apps use a string - if(!is_numeric($app)) { - $app = OC_Installer::installShippedApp($app); - }else{ - $appdata=OC_OCSClient::getApplication($app); - $download=OC_OCSClient::getApplicationDownload($app, 1); - if(isset($download['downloadlink']) and $download['downloadlink']!='') { - // Replace spaces in download link without encoding entire URL - $download['downloadlink'] = str_replace(' ', '%20', $download['downloadlink']); - $info = array('source'=>'http', 'href'=>$download['downloadlink'], 'appdata'=>$appdata); - $app=OC_Installer::installApp($info); - } - } + if (!OC_Installer::isInstalled($app)) { + $app = self::installApp($app); } - $l = OC_L10N::get('core'); - if($app!==false) { - // check if the app is compatible with this version of ownCloud - $info=OC_App::getAppInfo($app); - $version=OC_Util::getVersion(); - if(!isset($info['require']) or !self::isAppVersionCompatible($version, $info['require'])) { - throw new \Exception( - $l->t("App \"%s\" can't be installed because it is not compatible with this version of ownCloud.", - array($info['name']) - ) - ); - }else{ - OC_Appconfig::setValue( $app, 'enabled', 'yes' ); - if(isset($appdata['id'])) { - OC_Appconfig::setValue( $app, 'ocsid', $appdata['id'] ); - } - \OC_Hook::emit('OC_App', 'post_enable', array('app' => $app)); - } - }else{ - throw new \Exception($l->t("No app name specified")); + + OC_Appconfig::setValue( $app, 'enabled', 'yes' ); + } + + /** + * @param string $app + * @return int + */ + public static function downloadApp($app) { + $appdata=OC_OCSClient::getApplication($app); + $download=OC_OCSClient::getApplicationDownload($app, 1); + if(isset($download['downloadlink']) and $download['downloadlink']!='') { + // Replace spaces in download link without encoding entire URL + $download['downloadlink'] = str_replace(' ', '%20', $download['downloadlink']); + $info = array('source'=>'http', 'href'=>$download['downloadlink'], 'appdata'=>$appdata); + $app=OC_Installer::installApp($info); } + return $app; + } + + /** + * @param string $app + * @return bool + */ + public static function removeApp($app) { + if (self::isShipped($app)) { + return false; + } + + $disable = self::disable($app); + if (!$disable) { + return false; + } + + return OC_Installer::removeApp($app); } /** * @brief disables an app * @param string $app app - * @return boolean|null + * @return null * * This function set an app as disabled in appconfig. */ @@ -261,11 +268,6 @@ class OC_App{ // check if app is a shipped app or not. if not delete \OC_Hook::emit('OC_App', 'pre_disable', array('app' => $app)); OC_Appconfig::setValue( $app, 'enabled', 'no' ); - - // check if app is a shipped app or not. if not delete - if(!OC_App::isShipped( $app )) { - OC_Installer::removeApp( $app ); - } } /** @@ -446,18 +448,50 @@ class OC_App{ } - protected static function findAppInDirectories($appid) { + /** + * search for an app in all app-directories + * @param $appId + * @return mixed (bool|string) + */ + protected static function findAppInDirectories($appId) { static $app_dir = array(); - if (isset($app_dir[$appid])) { - return $app_dir[$appid]; + + if (isset($app_dir[$appId])) { + return $app_dir[$appId]; } + + $possibleApps = array(); foreach(OC::$APPSROOTS as $dir) { - if(file_exists($dir['path'].'/'.$appid)) { - return $app_dir[$appid]=$dir; + if(file_exists($dir['path'].'/'.$appId)) { + $possibleApps[] = $dir; } } - return false; + + if (count($possibleApps) === 0) { + return false; + } elseif(count($possibleApps) === 1) { + reset($possibleApps); + $dir = current($possibleApps); + $app_dir[$appId] = $dir; + return $dir; + } else { + $versionToLoad = array(); + foreach($possibleApps as $possibleApp) { + $version = self::getAppVersionByPath($possibleApp['path']); + if (empty($versionToLoad) || version_compare($version, $versionToLoad['version'], '>')) { + $versionToLoad = array( + 'dir' => $possibleApp, + 'version' => $version, + ); + } + } + $app_dir[$appId] = $versionToLoad['dir']; + return $versionToLoad['dir']; + //TODO - write test + } } + + /** * Get the directory for the given app. * If the app is defined in multiple directories, the first one is taken. (false if not found) @@ -471,6 +505,18 @@ class OC_App{ return false; } + + /** + * check if an app's directory is writable + * @param $appid + * @return bool + */ + public static function isAppDirWritable($appid) { + $path = self::getAppPath($appid); + return is_writable($path); + } + + /** * Get the path for the given app on the access * If the app is defined in multiple directories, the first one is taken. (false if not found) @@ -490,15 +536,28 @@ class OC_App{ * @return string */ public static function getAppVersion($appid) { - $file= self::getAppPath($appid).'/appinfo/version'; - if(is_file($file) && $version = trim(file_get_contents($file))) { + $file = self::getAppPath($appid); + return self::getAppVersionByPath($file); + } + + + /** + * get app's version based on it's path + * @param string $path + * @return string + */ + public static function getAppVersionByPath($path) { + $versionFile = $path . '/appinfo/version'; + $infoFile = $path . '/appinfo/info.xml'; + if(is_file($versionFile) && $version = trim(file_get_contents($versionFile))) { return $version; }else{ - $appData=self::getAppInfo($appid); + $appData=self::getAppInfo($infoFile, true); return isset($appData['version'])? $appData['version'] : ''; } } + /** * @brief Read all app metadata from the info.xml file * @param string $appid id of the app or the path of the info.xml file @@ -513,7 +572,7 @@ class OC_App{ if(isset(self::$appInfo[$appid])) { return self::$appInfo[$appid]; } - $file= self::getAppPath($appid).'/appinfo/info.xml'; + $file = self::getAppPath($appid) . '/appinfo/info.xml'; } $data=array(); $content=@file_get_contents($file); @@ -602,7 +661,6 @@ class OC_App{ } } - /** * get the forms for either settings, admin or personal */ @@ -726,14 +784,14 @@ class OC_App{ $info['internal']=true; $info['internallabel']='Internal App'; $info['internalclass']=''; - $info['update']=false; } else { $info['internal']=false; $info['internallabel']='3rd Party'; $info['internalclass']='externalapp'; - $info['update']=OC_Installer::isUpdateAvailable($app); } + $info['update'] = OC_Installer::isUpdateAvailable($app); + $info['preview'] = OC_Helper::imagePath('settings', 'trans.png'); $info['version'] = OC_App::getAppVersion($app); $appList[] = $info; @@ -828,17 +886,29 @@ class OC_App{ // rating img - if($app['score']>=0 and $app['score']<5) $img=OC_Helper::imagePath( "core", "rating/s1.png" ); - elseif($app['score']>=5 and $app['score']<15) $img=OC_Helper::imagePath( "core", "rating/s2.png" ); - elseif($app['score']>=15 and $app['score']<25) $img=OC_Helper::imagePath( "core", "rating/s3.png" ); - elseif($app['score']>=25 and $app['score']<35) $img=OC_Helper::imagePath( "core", "rating/s4.png" ); - elseif($app['score']>=35 and $app['score']<45) $img=OC_Helper::imagePath( "core", "rating/s5.png" ); - elseif($app['score']>=45 and $app['score']<55) $img=OC_Helper::imagePath( "core", "rating/s6.png" ); - elseif($app['score']>=55 and $app['score']<65) $img=OC_Helper::imagePath( "core", "rating/s7.png" ); - elseif($app['score']>=65 and $app['score']<75) $img=OC_Helper::imagePath( "core", "rating/s8.png" ); - elseif($app['score']>=75 and $app['score']<85) $img=OC_Helper::imagePath( "core", "rating/s9.png" ); - elseif($app['score']>=85 and $app['score']<95) $img=OC_Helper::imagePath( "core", "rating/s10.png" ); - elseif($app['score']>=95 and $app['score']<100) $img=OC_Helper::imagePath( "core", "rating/s11.png" ); + if ($app['score'] >= 0 && $app['score'] < 5) { + $img = OC_Helper::imagePath( "core", "rating/s1.png" ); + } elseif ($app['score'] >= 5 && $app['score'] < 15) { + $img = OC_Helper::imagePath( "core", "rating/s2.png" ); + } elseif($app['score'] >= 15 && $app['score'] < 25) { + $img = OC_Helper::imagePath( "core", "rating/s3.png" ); + } elseif($app['score'] >= 25 && $app['score'] < 35) { + $img = OC_Helper::imagePath( "core", "rating/s4.png" ); + } elseif($app['score'] >= 35 && $app['score'] < 45) { + $img = OC_Helper::imagePath( "core", "rating/s5.png" ); + } elseif($app['score'] >= 45 && $app['score'] < 55) { + $img = OC_Helper::imagePath( "core", "rating/s6.png" ); + } elseif($app['score'] >= 55 && $app['score'] < 65) { + $img = OC_Helper::imagePath( "core", "rating/s7.png" ); + } elseif($app['score'] >= 65 && $app['score'] < 75) { + $img = OC_Helper::imagePath( "core", "rating/s8.png" ); + } elseif($app['score'] >= 75 && $app['score'] < 85) { + $img = OC_Helper::imagePath( "core", "rating/s9.png" ); + } elseif($app['score'] >= 85 && $app['score'] < 95) { + $img = OC_Helper::imagePath( "core", "rating/s10.png" ); + } elseif($app['score'] >= 95 && $app['score'] < 100) { + $img = OC_Helper::imagePath( "core", "rating/s11.png" ); + } $app1[$i]['score'] = '<img src="'.$img.'"> Score: '.$app['score'].'%'; $i++; @@ -959,9 +1029,55 @@ class OC_App{ return $versions; } + + /** + * @param mixed $app + * @return bool + */ + public static function installApp($app) { + $l = OC_L10N::get('core'); + $appdata=OC_OCSClient::getApplication($app); + + // check if app is a shipped app or not. OCS apps have an integer as id, shipped apps use a string + if(!is_numeric($app)) { + $shippedVersion=self::getAppVersion($app); + if($appdata && version_compare($shippedVersion, $appdata['version'], '<')) { + $app = self::downloadApp($app); + } else { + $app = OC_Installer::installShippedApp($app); + } + }else{ + $app = self::downloadApp($app); + } + + if($app!==false) { + // check if the app is compatible with this version of ownCloud + $info = self::getAppInfo($app); + $version=OC_Util::getVersion(); + if(!isset($info['require']) or !self::isAppVersionCompatible($version, $info['require'])) { + throw new \Exception( + $l->t("App \"%s\" can't be installed because it is not compatible with this version of ownCloud.", + array($info['name']) + ) + ); + }else{ + OC_Appconfig::setValue( $app, 'enabled', 'yes' ); + if(isset($appdata['id'])) { + OC_Appconfig::setValue( $app, 'ocsid', $appdata['id'] ); + } + \OC_Hook::emit('OC_App', 'post_enable', array('app' => $app)); + } + }else{ + throw new \Exception($l->t("No app name specified")); + } + + return $app; + } + /** * update the database for the app and call the update script * @param string $appid + * @return bool */ public static function updateApp($appid) { if(file_exists(self::getAppPath($appid).'/appinfo/preupdate.php')) { @@ -972,7 +1088,7 @@ class OC_App{ OC_DB::updateDbFromStructure(self::getAppPath($appid).'/appinfo/database.xml'); } if(!self::isEnabled($appid)) { - return; + return false; } if(file_exists(self::getAppPath($appid).'/appinfo/update.php')) { self::loadApp($appid); @@ -989,6 +1105,8 @@ class OC_App{ } self::setAppTypes($appid); + + return true; } /** |