Overview
| Comment: | OFSystemInfo: Add +[user{Config,Data}Path] |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
e3a2dc61803df6663e96cb41d4057a24 |
| User & Date: | js on 2014-03-16 22:32:50 |
| Other Links: | manifest | tags |
Context
|
2014-03-18
| ||
| 22:53 | OFSystemInfo: Fix compilation check-in: 8e4f4567d3 user: js tags: trunk | |
|
2014-03-16
| ||
| 22:32 | OFSystemInfo: Add +[user{Config,Data}Path] check-in: e3a2dc6180 user: js tags: trunk | |
|
2014-03-05
| ||
| 01:36 | Add OF_ROUND_UP_POW2 macro check-in: ae9f0dc0e0 user: js tags: trunk | |
Changes
Modified src/OFSystemInfo.h from [0797eaad35] to [3933be5d4b].
| ︙ | ︙ | |||
12 13 14 15 16 17 18 19 20 21 22 23 24 25 | * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #import "OFObject.h" /*! * @class OFSystemInfo OFSystemInfo.h ObjFW/OFSystemInfo.h * * @brief A class for querying information about the system. */ @interface OFSystemInfo: OFObject /*! | > > | 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 | * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #import "OFObject.h" @class OFString; /*! * @class OFSystemInfo OFSystemInfo.h ObjFW/OFSystemInfo.h * * @brief A class for querying information about the system. */ @interface OFSystemInfo: OFObject /*! |
| ︙ | ︙ | |||
33 34 35 36 37 38 39 40 | * @brief Returns the number of CPUs installed in the system. * * A CPU with multiple cores counts as multiple CPUs. * * @return The number of CPUs installed in the system */ + (size_t)numberOfCPUs; @end | > > > > > > > > > > > > > > > > > > > > > > > > > > | 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 | * @brief Returns the number of CPUs installed in the system. * * A CPU with multiple cores counts as multiple CPUs. * * @return The number of CPUs installed in the system */ + (size_t)numberOfCPUs; /*! * @brief Returns the path where user data for the application can be stored. * * On Unix systems, this adheres to the XDG Base Directory specification.@n * On Mac OS X and iOS, it uses the `NSApplicationSupportDirectory` directory.@n * On Windows, it uses the `APPDATA` environment variable.@n * On Haiku, it uses the `B_USER_SETTINGS_DIRECTORY` directory. * * @return The path where user data for the application can be stored */ + (OFString*)userDataPath; /*! * @brief Returns the path where user configuration for the application can be * stored. * * On Unix systems, this adheres to the XDG Base Directory specification.@n * On Mac OS X and iOS, it uses the `Preferences` directory inside of * `NSLibraryDirectory` directory.@n * On Windows, it uses the `APPDATA` environment variable.@n * On Haiku, it uses the `B_USER_SETTINGS_DIRECTORY` directory. * * @return The path where user configuration for the application can be stored */ + (OFString*)userConfigPath; @end |
Modified src/OFSystemInfo.m from [1b1b7ac8be] to [957b401e15].
| ︙ | ︙ | |||
14 15 16 17 18 19 20 21 22 | * file. */ #define __NO_EXT_QNX #include "config.h" #import "OFSystemInfo.h" | > > > > > > > | > > | | > > > | > > > | 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 |
* file.
*/
#define __NO_EXT_QNX
#include "config.h"
#include <unistd.h>
#import "OFSystemInfo.h"
#import "OFString.h"
#import "OFArray.h"
#import "OFDictionary.h"
#import "OFApplication.h"
#import "OFNotImplementedException.h"
#import "autorelease.h"
#import "macros.h"
#ifdef __APPLE__
# include <NSSystemDirectories.h>
#endif
#ifdef _WIN32
# include <windows.h>
#endif
#ifdef __HAIKU__
# include <FindDirectory.h>
#endif
#ifdef __QNX__
# include <sys/syspage.h>
#endif
static size_t pageSize;
static size_t numberOfCPUs;
@implementation OFSystemInfo
+ (void)initialize
{
|
| ︙ | ︙ | |||
72 73 74 75 76 77 78 79 |
return pageSize;
}
+ (size_t)numberOfCPUs
{
return numberOfCPUs;
}
@end
| > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 |
return pageSize;
}
+ (size_t)numberOfCPUs
{
return numberOfCPUs;
}
+ (OFString*)userDataPath
{
#if defined(__APPLE__)
void *pool = objc_autoreleasePoolPush();
char pathC[PATH_MAX];
NSSearchPathEnumerationState state;
OFMutableString *path;
OFString *home;
state = NSStartSearchPathEnumeration(NSApplicationSupportDirectory,
NSUserDomainMask);
if (NSGetNextSearchPathEnumeration(state, pathC) == 0)
@throw [OFNotImplementedException exceptionWithSelector: _cmd
object: self];
path = [OFMutableString stringWithUTF8String: pathC];
if ([path hasPrefix: @"~"]) {
OFDictionary *env = [OFApplication environment];
if ((home = [env objectForKey: @"HOME"]) == nil)
@throw [OFNotImplementedException
exceptionWithSelector: _cmd
object: self];
[path deleteCharactersInRange: of_range(0, 1)];
[path prependString: home];
}
[path makeImmutable];
[path retain];
objc_autoreleasePoolPop(pool);
return [path autorelease];
#elif defined(_WIN32)
void *pool = objc_autoreleasePoolPush();
OFDictionary *env = [OFApplication environment];
OFString *appData;
if ((appData = [env objectForKey: @"APPDATA"]) == nil)
@throw [OFNotImplementedException exceptionWithSelector: _cmd
object: self];
[appData retain];
objc_autoreleasePoolPop(pool);
return [appData autorelease];
#elif defined(__HAIKU__)
char pathC[PATH_MAX];
if (find_directory(B_USER_SETTINGS_DIRECTORY, 0, false,
pathC, PATH_MAX) != B_OK)
@throw [OFNotImplementedException exceptionWithSelector: _cmd
object: self];
return [OFString stringWithUTF8String: pathC];
#else
void *pool = objc_autoreleasePoolPush();
OFDictionary *env = [OFApplication environment];
OFString *var;
if ((var = [env objectForKey: @"XDG_DATA_HOME"]) != nil &&
[var length] > 0) {
[var retain];
objc_autoreleasePoolPop(pool);
return [dataHome autorelease];
}
if ((var = [env objectForKey: @"HOME"]) == nil)
@throw [OFNotImplementedException exceptionWithSelector: _cmd
object: self];
var = [OFString pathWithComponents: [OFArray arrayWithObjects:
var, @".local", @"share", nil]];
[var retain];
objc_autoreleasePoolPop(pool);
return [var autorelease];
#endif
}
+ (OFString*)userConfigPath
{
#if defined(__APPLE__)
void *pool = objc_autoreleasePoolPush();
char pathC[PATH_MAX];
NSSearchPathEnumerationState state;
OFMutableString *path;
OFString *home;
state = NSStartSearchPathEnumeration(NSLibraryDirectory,
NSUserDomainMask);
if (NSGetNextSearchPathEnumeration(state, pathC) == 0)
@throw [OFNotImplementedException exceptionWithSelector: _cmd
object: self];
path = [OFMutableString stringWithUTF8String: pathC];
if ([path hasPrefix: @"~"]) {
OFDictionary *env = [OFApplication environment];
if ((home = [env objectForKey: @"HOME"]) == nil)
@throw [OFNotImplementedException
exceptionWithSelector: _cmd
object: self];
[path deleteCharactersInRange: of_range(0, 1)];
[path prependString: home];
}
[path appendString: @"/Preferences"];
[path makeImmutable];
[path retain];
objc_autoreleasePoolPop(pool);
return [path autorelease];
#elif defined(_WIN32)
void *pool = objc_autoreleasePoolPush();
OFDictionary *env = [OFApplication environment];
OFString *appData;
if ((appData = [env objectForKey: @"APPDATA"]) == nil)
@throw [OFNotImplementedException exceptionWithSelector: _cmd
object: self];
[appData retain];
objc_autoreleasePoolPop(pool);
return [appData autorelease];
#elif defined(__HAIKU__)
char pathC[PATH_MAX];
if (find_directory(B_USER_SETTINGS_DIRECTORY, 0, false,
pathC, PATH_MAX) != B_OK)
@throw [OFNotImplementedException exceptionWithSelector: _cmd
object: self];
return [OFString stringWithUTF8String: pathC];
#else
void *pool = objc_autoreleasePoolPush();
OFDictionary *env = [OFApplication environment];
OFString *var;
if ((var = [env objectForKey: @"XDG_CONFIG_HOME"]) != nil &&
[var length] > 0) {
[var retain];
objc_autoreleasePoolPop(pool);
return [var autorelease];
}
if ((var = [env objectForKey: @"HOME"]) == nil)
@throw [OFNotImplementedException exceptionWithSelector: _cmd
object: self];
var = [var stringByAppendingPathComponent: @".config"];
[var retain];
objc_autoreleasePoolPop(pool);
return [var autorelease];
#endif
}
@end
|