Release 1.1.2 cleanup

Author: Vaccarini-Lorenzo

manifest.json

@@ -1,7 +1,7 @@
 {
 	"id": "ical-obsidian-sync",
 	"name": "iCalSync",
-	"version": "1.1.1",
+	"version": "1.1.2",
 	"minAppVersion": "0.15.0",
 	"description": "Synchronize iCalendar with your notes",
 	"author": "Vaccarini Lorenzo",

package.json

@@ -1,13 +1,11 @@
 {
 	"name": "obsidian-sample-plugin",
-	"version": "1.1.0",
+	"version": "1.1.2",
 	"description": "This is a sample plugin for Obsidian (https://obsidian.md)",
 	"main": "main.js",
 	"scripts": {
 		"build": "tsc -noEmit -skipLibCheck && node esbuild.config.mjs",
-		"version": "node version-bump.mjs && git add manifest.json versions.json",
-		"pack": "tsc -noEmit -skipLibCheck && node esbuild.config.mjs && cp main.js ical-obsidian-sync && cp manifest.json ical-obsidian-sync && cp styles.css  ical-obsidian-sync && cp .noun_patterns.txt ical-obsidian-sync && cp .proper_name_patterns.txt ical-obsidian-sync",
-		"dev": "tsc -noEmit -skipLibCheck && node esbuild.config.mjs production && cp main.js /Users/lorenzovaccarini/Library/Mobile\\ Documents/iCloud~md~obsidian/Documents/Obsidian\\ Vault/.obsidian/plugins/ical-obsidian-sync && cp .noun_patterns.txt /Users/lorenzovaccarini/Library/Mobile\\ Documents/iCloud~md~obsidian/Documents/Obsidian\\ Vault/.obsidian/plugins/ical-obsidian-sync && cp .proper_name_patterns.txt /Users/lorenzovaccarini/Library/Mobile\\ Documents/iCloud~md~obsidian/Documents/Obsidian\\ Vault/.obsidian/plugins/ical-obsidian-sync && cp styles.css /Users/lorenzovaccarini/Library/Mobile\\ Documents/iCloud~md~obsidian/Documents/Obsidian\\ Vault/.obsidian/plugins/ical-obsidian-sync"
+		"version": "node version-bump.mjs && git add manifest.json versions.json"
 	},
 	"keywords": [],
 	"author": "",

src/controllers/cacheController.ts

@@ -5,7 +5,6 @@ import {Sentence} from "../model/sentence";
 import iCloudController from "./iCloudController";
 import {Notice, requestUrl, RequestUrlParam} from "obsidian";
 import {appendFileSync, readFileSync, writeFileSync} from "fs";
-import cacheController from "./cacheController";
 import {DateRange} from "../model/dateRange";
 
 class EventController{
@@ -162,18 +161,6 @@ class EventController{
 		}
 	}
 
-	async getEventsFromRange(dateRange: DateRange): Promise<iCloudCalendarEvent[]> {
-		const cacheCheck = cacheController.checkCache(dateRange);
-		if (cacheCheck.missedDateRanges.length == 0) return cacheCheck.cachedICouldEvents;
-		const iCloudEvents = cacheCheck.cachedICouldEvents;
-		for (let i=0; i<cacheCheck.missedDateRanges.length; i++){
-			const missedDateRange = cacheCheck.missedDateRanges[i];
-			const fetchedICloudEvents = await iCloudController.getICloudEvents(missedDateRange);
-			fetchedICloudEvents.forEach(iCloudEvent => iCloudEvents.push(iCloudEvent));
-		}
-		return iCloudEvents;
-	}
-
 	// This method sends a body-less post request to an internal server to notify the synchronisation request
 	// The purpose is to publish on the README page a badge with the number of synced requests
 	private updateCounter() {

src/controllers/calendarViewController.ts

@@ -19,22 +19,12 @@ class NlpController {
 	private _secondaryNLP;
 	private _ready: boolean;
 
-	private test_list_pos: string[];
-	private nouns: string[];
-	private test_list_entities: string[];
-	private map: Map<string[], string>;
-
 	constructor() {
 		this._ready = false;
 		this._mainNLP = wink( model );
 		this._secondaryNLP = wink (model);
 		this._customPatterns = [];
 		this._secondaryCustomPatterns = [];
-
-		this.test_list_pos = [];
-		this.test_list_entities = [];
-		this.map = new Map();
-		this.nouns = [];
 	}
 
 	injectPath(pluginPath: string){
@@ -66,7 +56,7 @@ class NlpController {
 			{name: "ordinalDateReverse", patterns: [" [|DATE] [DATE|may|march] [|DET] [ORDINAL]"]},
 		);
 		this._customPatterns.push(
-			{name: "timeRange", patterns: ["[|ADP] [TIME|CARDINAL|NUM] [|am|pm] [|ADP] [TIME|CARDINAL|NUM] [|am|pm]", "[TIME|CARDINAL] [-|/] [TIME|CARDINAL]"]},
+			{name: "timeRange", patterns: ["from [TIME|CARDINAL|NUM] [|am|pm] to [TIME|CARDINAL|NUM] [|am|pm]", "[TIME|CARDINAL] [-|/] [TIME|CARDINAL]"]},
 			{name: "exactTime", patterns: ["[at|for] [CARDINAL|TIME]"]}
 		)
 		this._customPatterns.push({name: "intentionalVerb", patterns: ["[|AUX] [VERB] [|ADP] [|DET] [NOUN]"]});
@@ -421,55 +411,6 @@ class NlpController {
 		return eventTitle;
 	}
 
-	test(sentence: Sentence) {
-		const text = sentence.value;
-		const sentences = text.split("\n");
-		sentences.forEach(sentence => {
-			const caseInsensitiveText = sentence.toLowerCase();
-			const doc = this._mainNLP.readDoc(caseInsensitiveText);
-			const testDoc = this._secondaryNLP.readDoc(caseInsensitiveText);
-			const customEntities = doc.customEntities().out(this._mainNLP.its.detail);
-			const secondaryCustomE = testDoc.customEntities().out(this._secondaryNLP.its.detail);
-			console.log("customE", customEntities);
-			console.log("secondaryCustomE", secondaryCustomE);
-			const entities = doc.entities().out(this._mainNLP.its.detail);
-			const dates = entities.filter(e => e.type == "DATE");
-			const tokens = doc.tokens();
-			const tokenValues = tokens.out();
-			const pos = tokens.out(this._mainNLP.its.pos);
-			console.log(pos);
-			pos.forEach((p, i) => {
-				if (p == "PROPN"){
-					const corrispectiveToken = tokenValues[i];
-					const corrispectiveDateList = dates.filter(d => d.value == corrispectiveToken)
-					if (corrispectiveDateList.length > 0){
-						pos[i] = corrispectiveDateList[0].type;
-					}
-				}
-				if (p == "PUNCT"){
-					pos.remove(p);
-				}
-				if (p == "NOUN"){
-					const corrispectiveToken = tokenValues[i];
-					this.nouns.push(corrispectiveToken);
-				}
-			})
-			this.test_list_pos.push(pos);
-			this.map.set(pos, sentence);
-		})
-	}
-
-	print() {
-		console.log("POS list")
-		console.log(this.test_list_pos);
-		this.test_list_pos = [];
-		console.log(Array.from(this.map.entries()));
-		console.log("Nouns")
-		console.log(this.nouns);
-		this.nouns = [];
-
-	}
-
 }
 
 const nplController = new NlpController();