Merge branch 'ericvw-remove_getcachekey'

Author: Diullei

src/git/GithubRepo.ts

@@ -33,16 +33,13 @@ class GithubRepo {
 		this.config = config;
 		this.urls = new GithubURLs(this);
 
-		this.storeDir = path.join(storeDir.replace(/[\\\/]+$/, ''), this.getCacheKey());
+		var cacheKey = this.config.repoOwner + '-' + this.config.repoProject;
+		this.storeDir = path.join(storeDir.replace(/[\\\/]+$/, ''), cacheKey);
 
 		this.api = new GithubAPI(this.urls, opts.getChild('git/api'), opts, this.storeDir);
 		this.raw = new GithubRaw(this.urls, opts.getChild('git/raw'), opts, this.storeDir);
 	}
 
-	getCacheKey(): string {
-		return this.config.repoOwner + '-' + this.config.repoProject;
-	}
-
 	toString(): string {
 		return this.config.repoOwner + '/' + this.config.repoProject;
 	}

src/git/loader/GithubAPI.ts

@@ -25,14 +25,18 @@ import GithubRateInfo = require('../model/GithubRateInfo');
 class GithubAPI extends GithubLoader {
 
 	// github's version
-	private apiVersion: string = '3.0.0';
+	private static API_VERSION: string = '3.0.0';
+	private static FORMAT_VERSION: string = '1.0';
+	private static CACHE_KEY: string = 'git-api-v' + GithubAPI.API_VERSION + '-fmt' + GithubAPI.FORMAT_VERSION;
+
+	static NAME: string = 'GithubAPI';
 
 	constructor(urls: GithubURLs, options: JSONPointer, shared: JSONPointer, storeDir: string) {
-		super(urls, options, shared, storeDir, 'GithubAPI');
+		super(urls, options, shared, storeDir, GithubAPI.NAME);
 
-		this.formatVersion = '1.0';
+		this.formatVersion = GithubAPI.FORMAT_VERSION;
 
-		this._initGithubLoader();
+		this._initGithubLoader(GithubAPI.CACHE_KEY);
 	}
 
 	getBranches(): Promise<any> {
@@ -122,10 +126,6 @@ class GithubAPI extends GithubLoader {
 			});
 		});
 	}
-
-	getCacheKey(): string {
-		return 'git-api-v' + this.apiVersion + '-fmt' + this.formatVersion;
-	}
 }
 
 export = GithubAPI;

src/git/loader/GithubLoader.ts

@@ -45,14 +45,14 @@ class GithubLoader {
 		this.label = label;
 	}
 
-	_initGithubLoader(): void {
+	_initGithubLoader(cacheKey: string): void {
 		var cache = new CacheOpts();
 		cache.allowClean = this.options.getBoolean('allowClean', cache.allowClean);
 		cache.cleanInterval = this.options.getDurationSecs('cacheCleanInterval', cache.cleanInterval / 1000) * 1000;
 		cache.splitDirLevel = this.options.getNumber('splitDirLevel', cache.splitDirLevel);
 		cache.splitDirChunk = this.options.getNumber('splitDirChunk', cache.splitDirChunk);
 		cache.jobTimeout = this.options.getDurationSecs('jobTimeout', cache.jobTimeout / 1000) * 1000;
-		cache.storeDir = path.join(this.storeDir, this.getCacheKey());
+		cache.storeDir = path.join(this.storeDir, cacheKey);
 
 		var opts: HTTPOpts = {
 			cache: cache,
@@ -73,11 +73,6 @@ class GithubLoader {
 		this.headers['user-agent'] = this.label + '-v' + this.formatVersion;
 	}
 
-	getCacheKey(): string {
-		// override
-		return 'loader';
-	}
-
 	copyHeadersTo(target: any, source?: any) {
 		source = (source || this.headers);
 		Object.keys(source).forEach((name) => {

src/git/loader/GithubRaw.ts

@@ -19,13 +19,16 @@ import GithubRateInfo = require('../model/GithubRateInfo');
  GithubRaw: get files from raw.github.com and cache on disk
  */
 class GithubRaw extends GithubLoader {
+	private static API_VERSION: string = '3.0.0';
+	private static FORMAT_VERSION: string = '1.0';
+	private static CACHE_KEY = 'git-raw-fmt' + GithubRaw.FORMAT_VERSION;
 
 	constructor(urls: GithubURLs, options: JSONPointer, shared: JSONPointer, storeDir: string) {
 		super(urls, options, shared, storeDir, 'GithubRaw');
 
-		this.formatVersion = '1.0';
+		this.formatVersion = GithubRaw.FORMAT_VERSION;
 
-		this._initGithubLoader();
+		this._initGithubLoader(GithubRaw.CACHE_KEY);
 	}
 
 	getText(ref: string, filePath: string): Promise<string> {
@@ -68,10 +71,6 @@ class GithubRaw extends GithubLoader {
 			return object.body;
 		});
 	}
-
-	getCacheKey(): string {
-		return 'git-raw-fmt' + this.formatVersion;
-	}
 }
 
 export = GithubRaw;