mirror of
https://github.com/gnosygnu/xowa.git
synced 2025-05-30 22:14:38 +00:00
XOMW: Finish XomwServiceContainer [#632]
This commit is contained in:
gnosygnu
parent
43866163b9
commit
a6331f5c89
@ -247,7 +247,7 @@ public class XophpArray<T> implements Bry_bfr_able, Iterable<T> {
|
||||
|
||||
@Override
|
||||
public T next() {
|
||||
return (T) hash.Get_at(curIdx++);
|
||||
return (T) ((XophpArrayItm)hash.Get_at(curIdx++)).Val();
|
||||
}
|
||||
|
||||
@Override
|
||||
@ -255,6 +255,37 @@ public class XophpArray<T> implements Bry_bfr_able, Iterable<T> {
|
||||
throw new XophpRuntimeException("remove not supported");
|
||||
}
|
||||
}
|
||||
public Iterable<XophpArrayItm<T>> IterateItms() {
|
||||
return new XophpArrayItmIterable(hash);
|
||||
}
|
||||
class XophpArrayItmIterable implements Iterable<XophpArrayItm<T>>, Iterator<XophpArrayItm<T>> {
|
||||
private final Ordered_hash hash;
|
||||
private int curIdx;
|
||||
private int len;
|
||||
public XophpArrayItmIterable(Ordered_hash hash) {
|
||||
this.hash = hash;
|
||||
this.len = hash.Len();
|
||||
}
|
||||
@Override
|
||||
public boolean hasNext() {
|
||||
return curIdx < len;
|
||||
}
|
||||
|
||||
@Override
|
||||
public XophpArrayItm<T> next() {
|
||||
return (XophpArrayItm<T>) hash.Get_at(curIdx++);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void remove() {
|
||||
throw new XophpRuntimeException("remove not supported");
|
||||
}
|
||||
|
||||
@Override
|
||||
public Iterator<XophpArrayItm<T>> iterator() {
|
||||
return this;
|
||||
}
|
||||
}
|
||||
|
||||
// DEPRECATE:use XophpArray
|
||||
public static boolean popBoolOrN(List_adp list) {return Bool_.Cast(List_adp_.Pop_or(list, false));}
|
||||
@ -286,9 +317,9 @@ public class XophpArray<T> implements Bry_bfr_able, Iterable<T> {
|
||||
// * STATIC *
|
||||
// **********
|
||||
public static final XophpArray False = null; // handles code like "if ($var === false)" where var is an Object;
|
||||
public static XophpArray New(Object... vals) {
|
||||
public static <S> XophpArray<S> New(S... vals) {
|
||||
XophpArray rv = new XophpArray();
|
||||
for (Object val : vals)
|
||||
for (S val : vals)
|
||||
rv.Add(val);
|
||||
return rv;
|
||||
}
|
||||
|
||||
654
400_xowa/src/gplx/xowa/mediawiki/includes/XomwServiceWiring.java
Normal file
654
400_xowa/src/gplx/xowa/mediawiki/includes/XomwServiceWiring.java
Normal file
@ -0,0 +1,654 @@
|
||||
/*
|
||||
XOWA: the XOWA Offline Wiki Application
|
||||
Copyright (C) 2012-2020 gnosygnu@gmail.com
|
||||
|
||||
XOWA is licensed under the terms of the General Public License (GPL) Version 3,
|
||||
or alternatively under the terms of the Apache License Version 2.0.
|
||||
|
||||
You may use XOWA according to either of these licenses as is most appropriate
|
||||
for your project on a case-by-case basis.
|
||||
|
||||
The terms of each license can be found in the source code repository:
|
||||
|
||||
GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt
|
||||
Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt
|
||||
*/
|
||||
package gplx.xowa.mediawiki.includes;
|
||||
|
||||
import gplx.Err_;
|
||||
import gplx.xowa.mediawiki.XophpCallback;
|
||||
import gplx.xowa.mediawiki.XophpCallbackOwner;
|
||||
import gplx.xowa.mediawiki.includes.config.XomwConfig;
|
||||
import gplx.xowa.mediawiki.languages.XomwLanguage;
|
||||
|
||||
// MW.SRC:1.33.1
|
||||
public class XomwServiceWiring implements XophpCallbackOwner {
|
||||
//return [
|
||||
// "ActorMigration" => function (MediaWikiServices services) : ActorMigration {
|
||||
// return new ActorMigration(
|
||||
// services.getMainConfig().get("ActorTableSchemaMigrationStage")
|
||||
// );
|
||||
// },
|
||||
//
|
||||
// "BlobStore" => function (MediaWikiServices services) : BlobStore {
|
||||
// return services.getService("_SqlBlobStore");
|
||||
// },
|
||||
//
|
||||
// "BlobStoreFactory" => function (MediaWikiServices services) : BlobStoreFactory {
|
||||
// return new BlobStoreFactory(
|
||||
// services.getDBLoadBalancerFactory(),
|
||||
// services.getMainWANObjectCache(),
|
||||
// services.getMainConfig(),
|
||||
// services.getContentLanguage()
|
||||
// );
|
||||
// },
|
||||
//
|
||||
// "BlockRestrictionStore" => function (MediaWikiServices services) : BlockRestrictionStore {
|
||||
// return new BlockRestrictionStore(
|
||||
// services.getDBLoadBalancer()
|
||||
// );
|
||||
// },
|
||||
//
|
||||
// "CommentStore" => function (MediaWikiServices services) : CommentStore {
|
||||
// return new CommentStore(
|
||||
// services.getContentLanguage(),
|
||||
// MIGRATION_NEW
|
||||
// );
|
||||
// },
|
||||
//
|
||||
// "ConfigFactory" => function (MediaWikiServices services) : ConfigFactory {
|
||||
// // Use the bootstrap config to initialize the ConfigFactory.
|
||||
// registry = services.getBootstrapConfig().get("ConfigRegistry");
|
||||
// factory = new ConfigFactory();
|
||||
//
|
||||
// foreach (registry as name => callback) {
|
||||
// factory.register(name, callback);
|
||||
// }
|
||||
// return factory;
|
||||
// },
|
||||
//
|
||||
// "ConfigRepository" => function (MediaWikiServices services) : ConfigRepository {
|
||||
// return new ConfigRepository(services.getConfigFactory());
|
||||
// },
|
||||
//
|
||||
// "ConfiguredReadOnlyMode" => function (MediaWikiServices services) : ConfiguredReadOnlyMode {
|
||||
// return new ConfiguredReadOnlyMode(services.getMainConfig());
|
||||
// },
|
||||
|
||||
private XomwLanguage newContentLanguage(XomwMediaWikiServices services) {
|
||||
// return XomwLanguage.factory(services.getMainConfig().get("LanguageCode"));
|
||||
return null;
|
||||
}
|
||||
//
|
||||
// "CryptHKDF" => function (MediaWikiServices services) : CryptHKDF {
|
||||
// config = services.getMainConfig();
|
||||
//
|
||||
// secret = config.get("HKDFSecret") ?: config.get("SecretKey");
|
||||
// if (!secret) {
|
||||
// throw new RuntimeException("Cannot use MWCryptHKDF without a secret.");
|
||||
// }
|
||||
//
|
||||
// // In HKDF, the context can be known to the attacker, but this will
|
||||
// // keep simultaneous runs from producing the same output.
|
||||
// context = [ microtime(), getmypid(), gethostname() ];
|
||||
//
|
||||
// // Setup salt cache. Use APC, or fallback to the main cache if it isn"t setup
|
||||
// cache = services.getLocalServerObjectCache();
|
||||
// if (cache instanceof EmptyBagOStuff) {
|
||||
// cache = ObjectCache::getLocalClusterInstance();
|
||||
// }
|
||||
//
|
||||
// return new CryptHKDF(secret, config.get("HKDFAlgorithm"), cache, context);
|
||||
// },
|
||||
//
|
||||
// "CryptRand" => function () : CryptRand {
|
||||
// return new CryptRand();
|
||||
// },
|
||||
//
|
||||
// "DBLoadBalancer" => function (MediaWikiServices services) : Wikimedia\Rdbms\LoadBalancer {
|
||||
// // just return the default LB from the DBLoadBalancerFactory service
|
||||
// return services.getDBLoadBalancerFactory().getMainLB();
|
||||
// },
|
||||
//
|
||||
// "DBLoadBalancerFactory" =>
|
||||
// function (MediaWikiServices services) : Wikimedia\Rdbms\LBFactory {
|
||||
// mainConfig = services.getMainConfig();
|
||||
//
|
||||
// lbConf = MWLBFactory::applyDefaultConfig(
|
||||
// mainConfig.get("LBFactoryConf"),
|
||||
// mainConfig,
|
||||
// services.getConfiguredReadOnlyMode(),
|
||||
// services.getLocalServerObjectCache(),
|
||||
// services.getMainObjectStash(),
|
||||
// services.getMainWANObjectCache()
|
||||
// );
|
||||
// class = MWLBFactory::getLBFactoryClass(lbConf);
|
||||
//
|
||||
// instance = new class(lbConf);
|
||||
// MWLBFactory::setSchemaAliases(instance, mainConfig);
|
||||
//
|
||||
// return instance;
|
||||
// },
|
||||
//
|
||||
// "EventRelayerGroup" => function (MediaWikiServices services) : EventRelayerGroup {
|
||||
// return new EventRelayerGroup(services.getMainConfig().get("EventRelayerConfig"));
|
||||
// },
|
||||
//
|
||||
// "ExternalStoreFactory" => function (MediaWikiServices services) : ExternalStoreFactory {
|
||||
// config = services.getMainConfig();
|
||||
//
|
||||
// return new ExternalStoreFactory(
|
||||
// config.get("ExternalStores")
|
||||
// );
|
||||
// },
|
||||
//
|
||||
// "GenderCache" => function (MediaWikiServices services) : GenderCache {
|
||||
// return new GenderCache();
|
||||
// },
|
||||
//
|
||||
// "HttpRequestFactory" =>
|
||||
// function (MediaWikiServices services) : \MediaWiki\Http\HttpRequestFactory {
|
||||
// return new \MediaWiki\Http\HttpRequestFactory();
|
||||
// },
|
||||
|
||||
|
||||
private Object newInterwikiLoopup(XomwMediaWikiServices services) {
|
||||
// XomwConfig config = services.getMainConfig();
|
||||
// return new ClassicInterwikiLookup(
|
||||
// services.getContentLanguage(),
|
||||
// services.getMainWANObjectCache(),
|
||||
// config.get("InterwikiExpiry"),
|
||||
// config.get("InterwikiCache"),
|
||||
// config.get("InterwikiScopes"),
|
||||
// config.get("InterwikiFallbackSite")
|
||||
// );
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object Call(String method, Object... args) {
|
||||
XomwMediaWikiServices services = (XomwMediaWikiServices)args[0];
|
||||
switch (method) {
|
||||
case "InterwikiLookup":
|
||||
return newInterwikiLoopup(services);
|
||||
case "ContentLanguage":
|
||||
return newContentLanguage(services);
|
||||
default:
|
||||
throw Err_.new_unhandled_default(method);
|
||||
}
|
||||
};
|
||||
|
||||
// "LinkCache" => function (MediaWikiServices services) : LinkCache {
|
||||
// return new LinkCache(
|
||||
// services.getTitleFormatter(),
|
||||
// services.getMainWANObjectCache()
|
||||
// );
|
||||
// },
|
||||
//
|
||||
// "LinkRenderer" => function (MediaWikiServices services) : LinkRenderer {
|
||||
// if (defined("MW_NO_SESSION")) {
|
||||
// return services.getLinkRendererFactory().create();
|
||||
// } else {
|
||||
// return services.getLinkRendererFactory().createForUser(
|
||||
// RequestContext::getMain().getUser()
|
||||
// );
|
||||
// }
|
||||
// },
|
||||
//
|
||||
// "LinkRendererFactory" => function (MediaWikiServices services) : LinkRendererFactory {
|
||||
// return new LinkRendererFactory(
|
||||
// services.getTitleFormatter(),
|
||||
// services.getLinkCache()
|
||||
// );
|
||||
// },
|
||||
//
|
||||
// "LocalServerObjectCache" => function (MediaWikiServices services) : BagOStuff {
|
||||
// cacheId = \ObjectCache::detectLocalServerCache();
|
||||
// return \ObjectCache::newFromId(cacheId);
|
||||
// },
|
||||
//
|
||||
// "MagicWordFactory" => function (MediaWikiServices services) : MagicWordFactory {
|
||||
// return new MagicWordFactory(services.getContentLanguage());
|
||||
// },
|
||||
//
|
||||
// "MainConfig" => function (MediaWikiServices services) : Config {
|
||||
// // Use the "main" config from the ConfigFactory service.
|
||||
// return services.getConfigFactory().makeConfig("main");
|
||||
// },
|
||||
//
|
||||
// "MainObjectStash" => function (MediaWikiServices services) : BagOStuff {
|
||||
// mainConfig = services.getMainConfig();
|
||||
//
|
||||
// id = mainConfig.get("MainStash");
|
||||
// if (!isset(mainConfig.get("ObjectCaches")[id])) {
|
||||
// throw new UnexpectedValueException(
|
||||
// "Cache type \"id\" is not present in \wgObjectCaches.");
|
||||
// }
|
||||
//
|
||||
// return \ObjectCache::newFromParams(mainConfig.get("ObjectCaches")[id]);
|
||||
// },
|
||||
//
|
||||
// "MainWANObjectCache" => function (MediaWikiServices services) : WANObjectCache {
|
||||
// mainConfig = services.getMainConfig();
|
||||
//
|
||||
// id = mainConfig.get("MainWANCache");
|
||||
// if (!isset(mainConfig.get("WANObjectCaches")[id])) {
|
||||
// throw new UnexpectedValueException(
|
||||
// "WAN cache type \"id\" is not present in \wgWANObjectCaches.");
|
||||
// }
|
||||
//
|
||||
// params = mainConfig.get("WANObjectCaches")[id];
|
||||
// objectCacheId = params["cacheId"];
|
||||
// if (!isset(mainConfig.get("ObjectCaches")[objectCacheId])) {
|
||||
// throw new UnexpectedValueException(
|
||||
// "Cache type \"objectCacheId\" is not present in \wgObjectCaches.");
|
||||
// }
|
||||
// params["store"] = mainConfig.get("ObjectCaches")[objectCacheId];
|
||||
//
|
||||
// return \ObjectCache::newWANCacheFromParams(params);
|
||||
// },
|
||||
//
|
||||
// "MediaHandlerFactory" => function (MediaWikiServices services) : MediaHandlerFactory {
|
||||
// return new MediaHandlerFactory(
|
||||
// services.getMainConfig().get("MediaHandlers")
|
||||
// );
|
||||
// },
|
||||
//
|
||||
// "MimeAnalyzer" => function (MediaWikiServices services) : MimeAnalyzer {
|
||||
// logger = LoggerFactory::getInstance("Mime");
|
||||
// mainConfig = services.getMainConfig();
|
||||
// params = [
|
||||
// "typeFile" => mainConfig.get("MimeTypeFile"),
|
||||
// "infoFile" => mainConfig.get("MimeInfoFile"),
|
||||
// "xmlTypes" => mainConfig.get("XMLMimeTypes"),
|
||||
// "guessCallback" =>
|
||||
// function (mimeAnalyzer, &head, &tail, file, &mime) use (logger) {
|
||||
// // Also test DjVu
|
||||
// deja = new DjVuImage(file);
|
||||
// if (deja.isValid()) {
|
||||
// logger.info("Detected file as image/vnd.djvu\n");
|
||||
// mime = "image/vnd.djvu";
|
||||
//
|
||||
// return;
|
||||
// }
|
||||
// // Some strings by reference for performance - assuming well-behaved hooks
|
||||
// Hooks::run(
|
||||
// "MimeMagicGuessFromContent",
|
||||
// [ mimeAnalyzer, &head, &tail, file, &mime ]
|
||||
// );
|
||||
// },
|
||||
// "extCallback" => function (mimeAnalyzer, ext, &mime) {
|
||||
// // Media handling extensions can improve the MIME detected
|
||||
// Hooks::run("MimeMagicImproveFromExtension", [ mimeAnalyzer, ext, &mime ]);
|
||||
// },
|
||||
// "initCallback" => function (mimeAnalyzer) {
|
||||
// // Allow media handling extensions adding MIME-types and MIME-info
|
||||
// Hooks::run("MimeMagicInit", [ mimeAnalyzer ]);
|
||||
// },
|
||||
// "logger" => logger
|
||||
// ];
|
||||
//
|
||||
// if (params["infoFile"] === "includes/mime.info") {
|
||||
// params["infoFile"] = __DIR__ . "/libs/mime/mime.info";
|
||||
// }
|
||||
//
|
||||
// if (params["typeFile"] === "includes/mime.types") {
|
||||
// params["typeFile"] = __DIR__ . "/libs/mime/mime.types";
|
||||
// }
|
||||
//
|
||||
// detectorCmd = mainConfig.get("MimeDetectorCommand");
|
||||
// if (detectorCmd) {
|
||||
// factory = services.getShellCommandFactory();
|
||||
// params["detectCallback"] = function (file) use (detectorCmd, factory) {
|
||||
// result = factory.create()
|
||||
// // wgMimeDetectorCommand can contain commands with parameters
|
||||
// .unsafeParams(detectorCmd)
|
||||
// .params(file)
|
||||
// .execute();
|
||||
// return result.getStdout();
|
||||
// };
|
||||
// }
|
||||
//
|
||||
// return new MimeAnalyzer(params);
|
||||
// },
|
||||
//
|
||||
// "NameTableStoreFactory" => function (MediaWikiServices services) : NameTableStoreFactory {
|
||||
// return new NameTableStoreFactory(
|
||||
// services.getDBLoadBalancerFactory(),
|
||||
// services.getMainWANObjectCache(),
|
||||
// LoggerFactory::getInstance("NameTableSqlStore")
|
||||
// );
|
||||
// },
|
||||
//
|
||||
// "OldRevisionImporter" => function (MediaWikiServices services) : OldRevisionImporter {
|
||||
// return new ImportableOldRevisionImporter(
|
||||
// true,
|
||||
// LoggerFactory::getInstance("OldRevisionImporter"),
|
||||
// services.getDBLoadBalancer()
|
||||
// );
|
||||
// },
|
||||
//
|
||||
// "Parser" => function (MediaWikiServices services) : Parser {
|
||||
// return services.getParserFactory().create();
|
||||
// },
|
||||
//
|
||||
// "ParserCache" => function (MediaWikiServices services) : ParserCache {
|
||||
// config = services.getMainConfig();
|
||||
// cache = ObjectCache::getInstance(config.get("ParserCacheType"));
|
||||
// wfDebugLog("caches", "parser: " . get_class(cache));
|
||||
//
|
||||
// return new ParserCache(
|
||||
// cache,
|
||||
// config.get("CacheEpoch")
|
||||
// );
|
||||
// },
|
||||
//
|
||||
// "ParserFactory" => function (MediaWikiServices services) : ParserFactory {
|
||||
// return new ParserFactory(
|
||||
// services.getMainConfig().get("ParserConf"),
|
||||
// services.getMagicWordFactory(),
|
||||
// services.getContentLanguage(),
|
||||
// wfUrlProtocols(),
|
||||
// services.getSpecialPageFactory(),
|
||||
// services.getMainConfig(),
|
||||
// services.getLinkRendererFactory()
|
||||
// );
|
||||
// },
|
||||
//
|
||||
// "PasswordFactory" => function (MediaWikiServices services) : PasswordFactory {
|
||||
// config = services.getMainConfig();
|
||||
// return new PasswordFactory(
|
||||
// config.get("PasswordConfig"),
|
||||
// config.get("PasswordDefault")
|
||||
// );
|
||||
// },
|
||||
//
|
||||
// "PerDbNameStatsdDataFactory" =>
|
||||
// function (MediaWikiServices services) : StatsdDataFactoryInterface {
|
||||
// config = services.getMainConfig();
|
||||
// wiki = config.get("DBname");
|
||||
// return new PrefixingStatsdDataFactoryProxy(
|
||||
// services.getStatsdDataFactory(),
|
||||
// wiki
|
||||
// );
|
||||
// },
|
||||
//
|
||||
// "PermissionManager" => function (MediaWikiServices services) : PermissionManager {
|
||||
// config = services.getMainConfig();
|
||||
// return new PermissionManager(
|
||||
// services.getSpecialPageFactory(),
|
||||
// config.get("WhitelistRead"),
|
||||
// config.get("WhitelistReadRegexp"),
|
||||
// config.get("EmailConfirmToEdit"),
|
||||
// config.get("BlockDisablesLogin"));
|
||||
// },
|
||||
//
|
||||
// "PreferencesFactory" => function (MediaWikiServices services) : PreferencesFactory {
|
||||
// factory = new DefaultPreferencesFactory(
|
||||
// services.getMainConfig(),
|
||||
// services.getContentLanguage(),
|
||||
// AuthManager::singleton(),
|
||||
// services.getLinkRendererFactory().create()
|
||||
// );
|
||||
// factory.setLogger(LoggerFactory::getInstance("preferences"));
|
||||
//
|
||||
// return factory;
|
||||
// },
|
||||
//
|
||||
// "ProxyLookup" => function (MediaWikiServices services) : ProxyLookup {
|
||||
// mainConfig = services.getMainConfig();
|
||||
// return new ProxyLookup(
|
||||
// mainConfig.get("SquidServers"),
|
||||
// mainConfig.get("SquidServersNoPurge")
|
||||
// );
|
||||
// },
|
||||
//
|
||||
// "ReadOnlyMode" => function (MediaWikiServices services) : ReadOnlyMode {
|
||||
// return new ReadOnlyMode(
|
||||
// services.getConfiguredReadOnlyMode(),
|
||||
// services.getDBLoadBalancer()
|
||||
// );
|
||||
// },
|
||||
//
|
||||
// "ResourceLoader" => function (MediaWikiServices services) : ResourceLoader {
|
||||
// global IP;
|
||||
// config = services.getMainConfig();
|
||||
//
|
||||
// rl = new ResourceLoader(
|
||||
// config,
|
||||
// LoggerFactory::getInstance("resourceloader")
|
||||
// );
|
||||
// rl.addSource(config.get("ResourceLoaderSources"));
|
||||
// rl.register(include "IP/resources/Resources.php");
|
||||
//
|
||||
// return rl;
|
||||
// },
|
||||
//
|
||||
// "RevisionFactory" => function (MediaWikiServices services) : RevisionFactory {
|
||||
// return services.getRevisionStore();
|
||||
// },
|
||||
//
|
||||
// "RevisionLookup" => function (MediaWikiServices services) : RevisionLookup {
|
||||
// return services.getRevisionStore();
|
||||
// },
|
||||
//
|
||||
// "RevisionRenderer" => function (MediaWikiServices services) : RevisionRenderer {
|
||||
// renderer = new RevisionRenderer(
|
||||
// services.getDBLoadBalancer(),
|
||||
// services.getSlotRoleRegistry()
|
||||
// );
|
||||
//
|
||||
// renderer.setLogger(LoggerFactory::getInstance("SaveParse"));
|
||||
// return renderer;
|
||||
// },
|
||||
//
|
||||
// "RevisionStore" => function (MediaWikiServices services) : RevisionStore {
|
||||
// return services.getRevisionStoreFactory().getRevisionStore();
|
||||
// },
|
||||
//
|
||||
// "RevisionStoreFactory" => function (MediaWikiServices services) : RevisionStoreFactory {
|
||||
// config = services.getMainConfig();
|
||||
// store = new RevisionStoreFactory(
|
||||
// services.getDBLoadBalancerFactory(),
|
||||
// services.getBlobStoreFactory(),
|
||||
// services.getNameTableStoreFactory(),
|
||||
// services.getSlotRoleRegistry(),
|
||||
// services.getMainWANObjectCache(),
|
||||
// services.getCommentStore(),
|
||||
// services.getActorMigration(),
|
||||
// config.get("MultiContentRevisionSchemaMigrationStage"),
|
||||
// LoggerFactory::getProvider(),
|
||||
// config.get("ContentHandlerUseDB")
|
||||
// );
|
||||
//
|
||||
// return store;
|
||||
// },
|
||||
//
|
||||
// "SearchEngineConfig" => function (MediaWikiServices services) : SearchEngineConfig {
|
||||
// return new SearchEngineConfig(services.getMainConfig(),
|
||||
// services.getContentLanguage());
|
||||
// },
|
||||
//
|
||||
// "SearchEngineFactory" => function (MediaWikiServices services) : SearchEngineFactory {
|
||||
// return new SearchEngineFactory(services.getSearchEngineConfig());
|
||||
// },
|
||||
//
|
||||
// "ShellCommandFactory" => function (MediaWikiServices services) : CommandFactory {
|
||||
// config = services.getMainConfig();
|
||||
//
|
||||
// limits = [
|
||||
// "time" => config.get("MaxShellTime"),
|
||||
// "walltime" => config.get("MaxShellWallClockTime"),
|
||||
// "memory" => config.get("MaxShellMemory"),
|
||||
// "filesize" => config.get("MaxShellFileSize"),
|
||||
// ];
|
||||
// cgroup = config.get("ShellCgroup");
|
||||
// restrictionMethod = config.get("ShellRestrictionMethod");
|
||||
//
|
||||
// factory = new CommandFactory(limits, cgroup, restrictionMethod);
|
||||
// factory.setLogger(LoggerFactory::getInstance("exec"));
|
||||
// factory.logStderr();
|
||||
//
|
||||
// return factory;
|
||||
// },
|
||||
//
|
||||
// "SiteLookup" => function (MediaWikiServices services) : SiteLookup {
|
||||
// // Use SiteStore as the SiteLookup as well. This was originally separated
|
||||
// // to allow for a cacheable read-only interface (using FileBasedSiteLookup),
|
||||
// // but this was never used. SiteStore has caching (see below).
|
||||
// return services.getSiteStore();
|
||||
// },
|
||||
//
|
||||
// "SiteStore" => function (MediaWikiServices services) : SiteStore {
|
||||
// rawSiteStore = new DBSiteStore(services.getDBLoadBalancer());
|
||||
//
|
||||
// // TODO: replace wfGetCache with a CacheFactory service.
|
||||
// // TODO: replace wfIsHHVM with a capabilities service.
|
||||
// cache = wfGetCache(wfIsHHVM() ? CACHE_ACCEL : CACHE_ANYTHING);
|
||||
//
|
||||
// return new CachingSiteStore(rawSiteStore, cache);
|
||||
// },
|
||||
//
|
||||
// "SkinFactory" => function (MediaWikiServices services) : SkinFactory {
|
||||
// factory = new SkinFactory();
|
||||
//
|
||||
// names = services.getMainConfig().get("ValidSkinNames");
|
||||
//
|
||||
// foreach (names as name => skin) {
|
||||
// factory.register(name, skin, function () use (name, skin) {
|
||||
// class = "Skinskin";
|
||||
// return new class(name);
|
||||
// });
|
||||
// }
|
||||
// // Register a hidden "fallback" skin
|
||||
// factory.register("fallback", "Fallback", function () {
|
||||
// return new SkinFallback;
|
||||
// });
|
||||
// // Register a hidden skin for api output
|
||||
// factory.register("apioutput", "ApiOutput", function () {
|
||||
// return new SkinApi;
|
||||
// });
|
||||
//
|
||||
// return factory;
|
||||
// },
|
||||
//
|
||||
// "SlotRoleRegistry" => function (MediaWikiServices services) : SlotRoleRegistry {
|
||||
// config = services.getMainConfig();
|
||||
//
|
||||
// registry = new SlotRoleRegistry(
|
||||
// services.getNameTableStoreFactory().getSlotRoles()
|
||||
// );
|
||||
//
|
||||
// registry.defineRole("main", function () use (config) {
|
||||
// return new MainSlotRoleHandler(
|
||||
// config.get("NamespaceContentModels")
|
||||
// );
|
||||
// });
|
||||
//
|
||||
// return registry;
|
||||
// },
|
||||
//
|
||||
// "SpecialPageFactory" => function (MediaWikiServices services) : SpecialPageFactory {
|
||||
// return new SpecialPageFactory(
|
||||
// services.getMainConfig(),
|
||||
// services.getContentLanguage()
|
||||
// );
|
||||
// },
|
||||
//
|
||||
// "StatsdDataFactory" => function (MediaWikiServices services) : IBufferingStatsdDataFactory {
|
||||
// return new BufferingStatsdDataFactory(
|
||||
// rtrim(services.getMainConfig().get("StatsdMetricPrefix"), ".")
|
||||
// );
|
||||
// },
|
||||
//
|
||||
// "TitleFormatter" => function (MediaWikiServices services) : TitleFormatter {
|
||||
// return services.getService("_MediaWikiTitleCodec");
|
||||
// },
|
||||
//
|
||||
// "TitleParser" => function (MediaWikiServices services) : TitleParser {
|
||||
// return services.getService("_MediaWikiTitleCodec");
|
||||
// },
|
||||
//
|
||||
// "UploadRevisionImporter" => function (MediaWikiServices services) : UploadRevisionImporter {
|
||||
// return new ImportableUploadRevisionImporter(
|
||||
// services.getMainConfig().get("EnableUploads"),
|
||||
// LoggerFactory::getInstance("UploadRevisionImporter")
|
||||
// );
|
||||
// },
|
||||
//
|
||||
// "VirtualRESTServiceClient" =>
|
||||
// function (MediaWikiServices services) : VirtualRESTServiceClient {
|
||||
// config = services.getMainConfig().get("VirtualRestConfig");
|
||||
//
|
||||
// vrsClient = new VirtualRESTServiceClient(new MultiHttpClient([]));
|
||||
// foreach (config["paths"] as prefix => serviceConfig) {
|
||||
// class = serviceConfig["class"];
|
||||
// // Merge in the global defaults
|
||||
// constructArg = serviceConfig["options"] ?? [];
|
||||
// constructArg += config["global"];
|
||||
// // Make the VRS service available at the mount point
|
||||
// vrsClient.mount(prefix, [ "class" => class, "config" => constructArg ]);
|
||||
// }
|
||||
//
|
||||
// return vrsClient;
|
||||
// },
|
||||
//
|
||||
// "WatchedItemQueryService" =>
|
||||
// function (MediaWikiServices services) : WatchedItemQueryService {
|
||||
// return new WatchedItemQueryService(
|
||||
// services.getDBLoadBalancer(),
|
||||
// services.getCommentStore(),
|
||||
// services.getActorMigration(),
|
||||
// services.getWatchedItemStore()
|
||||
// );
|
||||
// },
|
||||
//
|
||||
// "WatchedItemStore" => function (MediaWikiServices services) : WatchedItemStore {
|
||||
// store = new WatchedItemStore(
|
||||
// services.getDBLoadBalancerFactory(),
|
||||
// JobQueueGroup::singleton(),
|
||||
// services.getMainObjectStash(),
|
||||
// new HashBagOStuff([ "maxKeys" => 100 ]),
|
||||
// services.getReadOnlyMode(),
|
||||
// services.getMainConfig().get("UpdateRowsPerQuery")
|
||||
// );
|
||||
// store.setStatsdDataFactory(services.getStatsdDataFactory());
|
||||
//
|
||||
// if (services.getMainConfig().get("ReadOnlyWatchedItemStore")) {
|
||||
// store = new NoWriteWatchedItemStore(store);
|
||||
// }
|
||||
//
|
||||
// return store;
|
||||
// },
|
||||
//
|
||||
// "WikiRevisionOldRevisionImporterNoUpdates" =>
|
||||
// function (MediaWikiServices services) : ImportableOldRevisionImporter {
|
||||
// return new ImportableOldRevisionImporter(
|
||||
// false,
|
||||
// LoggerFactory::getInstance("OldRevisionImporter"),
|
||||
// services.getDBLoadBalancer()
|
||||
// );
|
||||
// },
|
||||
//
|
||||
// "_MediaWikiTitleCodec" => function (MediaWikiServices services) : MediaWikiTitleCodec {
|
||||
// return new MediaWikiTitleCodec(
|
||||
// services.getContentLanguage(),
|
||||
// services.getGenderCache(),
|
||||
// services.getMainConfig().get("LocalInterwikis"),
|
||||
// services.getInterwikiLookup()
|
||||
// );
|
||||
// },
|
||||
//
|
||||
// "_SqlBlobStore" => function (MediaWikiServices services) : SqlBlobStore {
|
||||
// return services.getBlobStoreFactory().newSqlBlobStore();
|
||||
// },
|
||||
//
|
||||
// ///////////////////////////////////////////////////////////////////////////
|
||||
// // NOTE: When adding a service here, don"t forget to add a getter function
|
||||
// // in the MediaWikiServices class. The convenience getter should just call
|
||||
// // this.getService("FooBarService").
|
||||
// ///////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// ];
|
||||
|
||||
}
|
||||
@ -16,6 +16,7 @@ Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt
|
||||
package gplx.xowa.mediawiki.includes.libs.services;
|
||||
|
||||
import gplx.xowa.mediawiki.XophpArray;
|
||||
import gplx.xowa.mediawiki.XophpArrayItm;
|
||||
import gplx.xowa.mediawiki.XophpCallback;
|
||||
import gplx.xowa.mediawiki.XophpObject_;
|
||||
import gplx.xowa.mediawiki.XophpType_;
|
||||
@ -108,18 +109,19 @@ public class XomwServiceContainer implements XomwDestructibleService {
|
||||
* Each file is loaded using PHP's include mechanism. Each file is expected to
|
||||
* return an associative array that maps service names to instantiator functions.
|
||||
*/
|
||||
public void loadWiringFiles(XophpArray wiringFiles) {
|
||||
// foreach ($wiringFiles as $file) {
|
||||
// // the wiring file is required to return an array of instantiators.
|
||||
// $wiring = require $file;
|
||||
//
|
||||
// // Assert::postcondition(
|
||||
// // is_array($wiring),
|
||||
// // "Wiring file $file is expected to return an array!"
|
||||
// // );
|
||||
//
|
||||
// this.applyWiring($wiring);
|
||||
// }
|
||||
public void loadWiringFiles(XophpArray<XophpArray<XophpCallback>> wiringFiles) {
|
||||
for (XophpArray<XophpCallback> file : wiringFiles) {
|
||||
// the wiring file is required to return an array of instantiators.
|
||||
// $wiring = require $file;
|
||||
XophpArray<XophpCallback> wiring = file;
|
||||
|
||||
// Assert::postcondition(
|
||||
// is_array($wiring),
|
||||
// "Wiring file $file is expected to return an array!"
|
||||
// );
|
||||
|
||||
this.applyWiring(wiring);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
@ -128,12 +130,13 @@ public class XomwServiceContainer implements XomwDestructibleService {
|
||||
* @param array $serviceInstantiators An associative array mapping service names to
|
||||
* instantiator functions.
|
||||
*/
|
||||
public void applyWiring(XophpArray $serviceInstantiators) {
|
||||
public void applyWiring(XophpArray<XophpCallback> serviceInstantiators) {
|
||||
// XomwAssert.parameterElementType(XophpCallback.class, $serviceInstantiators, "serviceInstantiators");
|
||||
|
||||
// foreach ($serviceInstantiators as $name => $instantiator) {
|
||||
// this.defineService($name, $instantiator);
|
||||
// }
|
||||
for (XophpArrayItm<XophpCallback> itm : serviceInstantiators.IterateItms()) {
|
||||
String name = itm.Key();
|
||||
XophpCallback instantiator = itm.Val();
|
||||
this.defineService(name, instantiator);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
@ -148,31 +151,31 @@ public class XomwServiceContainer implements XomwDestructibleService {
|
||||
*/
|
||||
public void importWiring(XomwServiceContainer container) {this.importWiring(container, new XophpArray<>());}
|
||||
public void importWiring(XomwServiceContainer container, XophpArray<String> skip) {
|
||||
// XophpArray<String> newInstantiators = XophpArray.array_diff_key(
|
||||
// container.serviceInstantiators,
|
||||
// XophpArray.array_flip(skip)
|
||||
// );
|
||||
//
|
||||
// this.serviceInstantiators = XophpArray.array_merge(
|
||||
// this.serviceInstantiators,
|
||||
// newInstantiators
|
||||
// );
|
||||
//
|
||||
// XophpArray<String> newManipulators = XophpArray.array_diff(
|
||||
// XophpArray.array_keys(container.serviceManipulators),
|
||||
// skip
|
||||
// );
|
||||
//
|
||||
// for (String name : newManipulators) {
|
||||
// if (XophpArray.isset(this.serviceManipulators, name)) {
|
||||
// this.serviceManipulators.Set(name, XophpArray.array_merge(
|
||||
// this.serviceManipulators.Get_by(name),
|
||||
// container.serviceManipulators.Get_by(name)
|
||||
// ));
|
||||
// } else {
|
||||
// this.serviceManipulators.Set(name, container.serviceManipulators.Get_by(name));
|
||||
// }
|
||||
// }
|
||||
XophpArray<String> newInstantiators = XophpArray.array_diff_key(
|
||||
container.serviceInstantiators,
|
||||
XophpArray.array_flip(skip)
|
||||
);
|
||||
|
||||
this.serviceInstantiators = XophpArray.array_merge(
|
||||
this.serviceInstantiators,
|
||||
newInstantiators
|
||||
);
|
||||
|
||||
XophpArray<String> newManipulators = XophpArray.array_diff(
|
||||
XophpArray.array_keys(container.serviceManipulators),
|
||||
skip
|
||||
);
|
||||
|
||||
for (String name : newManipulators) {
|
||||
if (XophpArray.isset(this.serviceManipulators, name)) {
|
||||
this.serviceManipulators.Set(name, XophpArray.array_merge(
|
||||
this.serviceManipulators.Get_by(name),
|
||||
container.serviceManipulators.Get_by(name)
|
||||
));
|
||||
} else {
|
||||
this.serviceManipulators.Set(name, container.serviceManipulators.Get_by(name));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -0,0 +1,118 @@
|
||||
package gplx.xowa.mediawiki.includes.libs.services;
|
||||
|
||||
import gplx.Err_;
|
||||
import gplx.core.tests.Gftest;
|
||||
import gplx.tests.Gftest_fxt;
|
||||
import gplx.xowa.mediawiki.XophpArray;
|
||||
import gplx.xowa.mediawiki.XophpCallback;
|
||||
import gplx.xowa.mediawiki.XophpCallbackOwner;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
|
||||
import static org.junit.Assert.*;
|
||||
|
||||
public class XomwServiceContainerTest {
|
||||
private XomwServiceContainer container = new XomwServiceContainer();
|
||||
private XomwServiceContainerExample wiring = new XomwServiceContainerExample();
|
||||
private XomwServiceManipulatorExample manipulator = new XomwServiceManipulatorExample();
|
||||
|
||||
@Test
|
||||
public void basic() {
|
||||
XophpArray<String> extraInstantiatorArg = XophpArray.<String>New("a", "b");
|
||||
XomwServiceContainer container = new XomwServiceContainer(extraInstantiatorArg);
|
||||
|
||||
// applyWiring -> adds servicesInstantator by calling defineService
|
||||
container.applyWiring(wiring.NewWirings("test1", "test2"));
|
||||
|
||||
// hasService -> checks if instantiator exists
|
||||
Gftest.Eq__bool_y(container.hasService("test1"));
|
||||
Gftest.Eq__bool_n(container.hasService("test9"));
|
||||
|
||||
// getServiceNames -> gets list of instantiators
|
||||
Gftest.Eq__str(XophpArray.<String>New("test1", "test2").To_str(), container.getServiceNames().To_str());
|
||||
|
||||
// getService -> creates service
|
||||
XomwServiceExample service = (XomwServiceExample)container.getService("test1");
|
||||
Gftest.Eq__str("test1", service.Name());
|
||||
Gftest.Eq__int(0, service.InstanceNumber());
|
||||
Gftest.Eq__obj_or_null(extraInstantiatorArg, service.ExtraInstantiatorArg());
|
||||
|
||||
// getService again -> retrieves service
|
||||
service = (XomwServiceExample)container.getService("test1");
|
||||
Gftest.Eq__int(0, service.InstanceNumber());
|
||||
|
||||
// resetService + getService -> recreates service
|
||||
container.resetService("test1");
|
||||
service = (XomwServiceExample)container.getService("test1");
|
||||
Gftest.Eq__int(1, service.InstanceNumber());
|
||||
|
||||
// peekService -> returns service if created
|
||||
service = (XomwServiceExample)container.peekService("test1");
|
||||
Gftest.Eq__int(1, service.InstanceNumber());
|
||||
|
||||
// peekService -> returns null if not created
|
||||
Gftest.Eq__obj_or_null(null, (XomwServiceExample)container.peekService("test2"));
|
||||
|
||||
// disableService -> disables service
|
||||
container.disableService("test1");
|
||||
|
||||
// isServiceDisabled -> checks disabled state
|
||||
Gftest.Eq__bool_y(container.isServiceDisabled("test1"));
|
||||
Gftest.Eq__bool_n(container.isServiceDisabled("test2"));
|
||||
|
||||
// resetService -> also reenables service
|
||||
container.resetService("test1");
|
||||
Gftest.Eq__bool_n(container.isServiceDisabled("test1"));
|
||||
|
||||
// redefineService -> redefines instantiator if not called
|
||||
container.redefineService("test2", wiring.NewCallback("test2a"));
|
||||
service = (XomwServiceExample)container.getService("test2");
|
||||
Gftest.Eq__str("test2a", service.Name());
|
||||
|
||||
// addServiceManipulator -> adds extra callback
|
||||
container.resetService("test2");
|
||||
container.addServiceManipulator("test2", manipulator.NewCallback("manip1"));
|
||||
service = (XomwServiceExample)container.getService("test2");
|
||||
Gftest.Eq__str("manip1", service.Name());
|
||||
|
||||
// destroy ->
|
||||
|
||||
// loadWiringFiles ->
|
||||
|
||||
// importWiring ->
|
||||
}
|
||||
|
||||
static class XomwServiceExample {
|
||||
private static int instanceNumberCounter = 0;
|
||||
public XomwServiceExample(String name, Object extraInstantiatorArg) {
|
||||
this.name = name;
|
||||
this.extraInstantiatorArg = extraInstantiatorArg;
|
||||
this.instanceNumber = instanceNumberCounter++;
|
||||
}
|
||||
public String Name() {return name;} private final String name;
|
||||
public Object ExtraInstantiatorArg() {return extraInstantiatorArg;} private final Object extraInstantiatorArg;
|
||||
public int InstanceNumber() {return instanceNumber;} private final int instanceNumber;
|
||||
}
|
||||
class XomwServiceContainerExample implements XophpCallbackOwner {
|
||||
private XophpArray<XophpCallback> wirings;
|
||||
@Override
|
||||
public Object Call(String method, Object... args) {
|
||||
XomwServiceContainer mediaWikiServices = (XomwServiceContainer)args[0];
|
||||
return new XomwServiceExample(method, args[1]);
|
||||
}
|
||||
public XophpArray<XophpCallback> NewWirings(String... names) {
|
||||
wirings = new XophpArray();
|
||||
for (String name : names) {
|
||||
wirings.Add(name, this.NewCallback(name));
|
||||
}
|
||||
return wirings;
|
||||
}
|
||||
}
|
||||
class XomwServiceManipulatorExample implements XophpCallbackOwner {
|
||||
@Override
|
||||
public Object Call(String method, Object... args) {
|
||||
XophpArray manipulatorArgs = (XophpArray)args[0];
|
||||
return new XomwServiceExample(method, manipulatorArgs);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,18 +1,18 @@
|
||||
/*
|
||||
XOWA: the XOWA Offline Wiki Application
|
||||
Copyright (C) 2012-2017 gnosygnu@gmail.com
|
||||
|
||||
XOWA is licensed under the terms of the General Public License (GPL) Version 3,
|
||||
or alternatively under the terms of the Apache License Version 2.0.
|
||||
|
||||
You may use XOWA according to either of these licenses as is most appropriate
|
||||
for your project on a case-by-case basis.
|
||||
|
||||
The terms of each license can be found in the source code repository:
|
||||
|
||||
GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt
|
||||
Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt
|
||||
*/
|
||||
/*
|
||||
XOWA: the XOWA Offline Wiki Application
|
||||
Copyright (C) 2012-2020 gnosygnu@gmail.com
|
||||
|
||||
XOWA is licensed under the terms of the General Public License (GPL) Version 3,
|
||||
or alternatively under the terms of the Apache License Version 2.0.
|
||||
|
||||
You may use XOWA according to either of these licenses as is most appropriate
|
||||
for your project on a case-by-case basis.
|
||||
|
||||
The terms of each license can be found in the source code repository:
|
||||
|
||||
GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt
|
||||
Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt
|
||||
*/
|
||||
package gplx.tests; import gplx.*;
|
||||
import gplx.objects.*;
|
||||
import gplx.objects.errs.*;
|
||||
@ -109,6 +109,7 @@ public class Gftest_fxt {
|
||||
throw Err_.New_msg(bfr.To_str_and_clear());
|
||||
}
|
||||
public static void Eq__bool_y(boolean actl) {Eq__bool(Bool_.Y, actl, null);}
|
||||
public static void Eq__bool_n(boolean actl) {Eq__bool(Bool_.N, actl, null);}
|
||||
public static void Eq__bool_y(boolean actl, String msg_fmt, Object... msg_args) {Eq__bool(Bool_.Y, actl, msg_fmt, msg_args);}
|
||||
public static void Eq__bool(boolean expd, boolean actl) {Eq__bool(expd, actl, null);}
|
||||
public static void Eq__bool(boolean expd, boolean actl, String msg_fmt, Object... msg_args) {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user