-// Copyright (c) 2011-2013 Kris Maglione <maglione.k@gmail.com>
+// Copyright (c) 2011-2014 Kris Maglione <maglione.k@gmail.com>
//
// This work is licensed for reuse under an MIT license. Details are
// given in the LICENSE.txt file included with this file.
});
lazyRequire("overlay", ["overlay"]);
-lazyRequire("storage", ["File"]);
+lazyRequire("storage", ["File", "storage"]);
var Cache = Module("Cache", XPCOM(Ci.nsIRequestObserver), {
init: function init() {
this.queue = [];
- this.cache = {};
+ this.storage = storage.newMap("cache", { store: true });
this.providers = {};
this.globalProviders = this.providers;
- this.providing = {};
- this.localProviders = {};
+ this.providing = RealSet();
+ this.localProviders = RealSet();
if (JSMLoader.cacheFlush)
this.flush();
update(services["dactyl:"].providers, {
- "cache": function (uri, path) {
+ "cache": (uri, path) => {
let contentType = "text/plain";
try {
contentType = services.mime.getTypeFromURI(uri);
}
catch (e) {}
- if (!cache.cacheReader || !cache.cacheReader.hasEntry(path))
- return [contentType, cache.force(path)];
+ if (this.storage.has(path) ||
+ !this.cacheReader ||
+ !this.cacheReader.hasEntry(path))
+ return [contentType, this.force(path)];
let channel = services.StreamChannel(uri);
- channel.contentStream = cache.cacheReader.getInputStream(path);
+ try {
+ channel.contentStream = this.cacheReader.getInputStream(path);
+ }
+ catch (e if e.result = Cr.NS_ERROR_FILE_CORRUPTED) {
+ this.flushDiskCache();
+ throw e;
+ }
channel.contentType = contentType;
channel.contentCharset = "UTF-8";
return channel;
}),
parse: function parse(str) {
- if (~'{['.indexOf(str[0]))
+ if ('{['.contains(str[0]))
return JSON.parse(str);
return str;
},
}
catch (e if e.result == Cr.NS_ERROR_FILE_CORRUPTED) {
util.reportError(e);
- this.closeWriter();
- this.cacheFile.remove(false);
+ this.flushDiskCache();
}
return this._cacheReader;
closeReader: function closeReader() {
if (cache._cacheReader) {
this.cacheReader.close();
- delete cache._cacheReader;
+ cache._cacheReader = null;
}
},
if (this._cacheWriter) {
this._cacheWriter.close();
- delete cache._cacheWriter;
+ cache._cacheWriter = null;
// ZipWriter bug.
if (this.cacheFile.fileSize <= 22)
}
}),
- flush: function flush() {
- cache.cache = {};
+ flush: function flush(filter) {
+ if (filter) {
+ this.storage.keys().filter(filter)
+ .forEach(bind("remove", this.storage));
+ }
+ else {
+ this.storage.clear();
+ this.flushDiskCache();
+ }
+ },
+
+ flushDiskCache: function flushDiskCache() {
if (this.cacheFile.exists()) {
- this.closeReader();
+ this.closeWriter();
this.flushJAR(this.cacheFile);
this.cacheFile.remove(false);
cache.processQueue();
}
- delete this.cache[name];
+ this.storage.remove(name);
},
flushJAR: function flushJAR(file) {
},
force: function force(name, localOnly) {
+ if (this.storage.has(name))
+ return this.storage.get(name);
+
util.waitFor(() => !this.inQueue);
if (this.cacheReader && this.cacheReader.hasEntry(name)) {
- return this.parse(File.readStream(
- this.cacheReader.getInputStream(name)));
+ try {
+ return this.parse(File.readStream(
+ this.cacheReader.getInputStream(name)));
+ }
+ catch (e if e.result == Cr.NS_ERROR_FILE_CORRUPTED) {
+ this.flushDiskCache();
+ }
}
- if (Set.has(this.localProviders, name) && !this.isLocal) {
- for each (let { cache } in overlay.modules)
+ if (this.localProviders.has(name) && !this.isLocal) {
+ for (let { cache } of overlay.modules)
if (cache._has(name))
return cache.force(name, true);
}
- if (Set.has(this.providers, name)) {
- util.assert(!Set.add(this.providing, name),
+ if (hasOwnProperty(this.providers, name)) {
+ util.assert(!this.providing.add(name),
"Already generating cache for " + name,
false);
+
+ let [func, long] = this.providers[name];
try {
- let [func, self] = this.providers[name];
- this.cache[name] = func.call(self || this, name);
+ var value = func.call(this, name);
}
finally {
- delete this.providing[name];
+ this.providing.delete(name);
}
- cache.queue.push([Date.now(), name]);
- cache.processQueue();
+ if (!long)
+ this.storage.set(name, value);
+ else {
+ cache.queue.push([Date.now(), name, value]);
+ cache.processQueue();
+ }
- return this.cache[name];
+ return value;
}
if (this.isLocal && !localOnly)
return cache.force(name);
},
- get: function get(name, callback, self) {
- if (!Set.has(this.cache, name)) {
- if (callback && !(Set.has(this.providers, name) ||
- Set.has(this.localProviders, name)))
- this.register(name, callback, self);
+ get: function get(name, callback, long) {
+ if (this.storage.has(name))
+ return this.storage.get(name);
- this.cache[name] = this.force(name);
- util.assert(this.cache[name] !== undefined,
- "No such cache key", false);
- }
+ if (callback && !(hasOwnProperty(this.providers, name) ||
+ this.localProviders.has(name)))
+ this.register(name, callback, long);
- return this.cache[name];
+ var result = this.force(name);
+ util.assert(result !== undefined, "No such cache key", false);
+
+ return result;
},
- _has: function _has(name) Set.has(this.providers, name) || set.has(this.cache, name),
+ _has: function _has(name) hasOwnProperty(this.providers, name)
+ || this.storage.has(name),
- has: function has(name) [this.globalProviders, this.cache, this.localProviders]
- .some(obj => Set.has(obj, name)),
+ has: function has(name) [this.globalProviders, this.localProviders]
+ .some(obj => isinstance(obj, ["Set"]) ? obj.has(name)
+ : hasOwnProperty(obj, name)),
- register: function register(name, callback, self) {
+ register: function register(name, callback, long) {
if (this.isLocal)
- Set.add(this.localProviders, name);
+ this.localProviders.add(name);
- this.providers[name] = [callback, self];
+ this.providers[name] = [callback, long];
},
processQueue: function processQueue() {
if (this.queue.length && !this.inQueue) {
// removeEntry does not work properly with queues.
let removed = 0;
- for each (let [, entry] in this.queue)
+ for (let [, entry] of this.queue)
if (this.getCacheWriter().hasEntry(entry)) {
this.getCacheWriter().removeEntry(entry, false);
removed++;
}
- if (removed)
+ if (removed) {
this.closeWriter();
+ util.flushCache(this.cacheFile);
+ }
- this.queue.splice(0).forEach(function ([time, entry]) {
- if (time && Set.has(this.cache, entry)) {
+ this.queue.splice(0).forEach(function ([time, entry, value]) {
+ if (time && value != null) {
let stream = services.CharsetConv("UTF-8")
- .convertToInputStream(this.stringify(this.cache[entry]));
+ .convertToInputStream(this.stringify(value));
this.getCacheWriter().addEntryStream(entry, time * 1000,
this.compression, stream,
projects / dactyl.git / blobdiff