tykayn
/
org-report-stats
mirror of https://forge.chapril.org/tykayn/org-report-stats.git
1
0
Fork 0
Code Issues Releases Activity

better tags search

This commit is contained in:
Tykayn 2023-04-18 12:23:52 +02:00 committed by tykayn
parent c78830157f
commit 24f590d7e5
4 changed files with 139 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
firefox_places_json_to_json_activities.mjs
View File

@ -1,5 +1,5 @@
import fs from "node-fs"; import fs from "node-fs";
import {writeFileInOuputFolder} from "./parse_orgmode_to_json.mjs"; import {writeFileInOuputFolderFromJsonObject} from "./parse_orgmode_to_json.mjs";
import moment from "moment"; import moment from "moment";
import {headersTsv} from "./utils.mjs"; import {headersTsv} from "./utils.mjs";
@ -63,7 +63,7 @@ function convertJsonToActivities(sourceFilePath, outputFileName) {
} }
}) })
console.log('events', events.length) console.log('events', events.length)
writeFileInOuputFolder(outputFileName, events.join("\n")).then(r => console.log('r', r)) writeFileInOuputFolderFromJsonObject(outputFileName, events.join("\n")).then(r => console.log('r', r))
}) })
} }

6
google_searches_to_json_activities.mjs
View File

@ -1,5 +1,5 @@
import fs from "node-fs"; import fs from "node-fs";
import {writeFileInOuputFolder} from "./parse_orgmode_to_json.mjs"; import {writeFileInOuputFolderFromJsonObject} from "./parse_orgmode_to_json.mjs";
import moment from "moment"; import moment from "moment";
@ -55,7 +55,7 @@ async function convertJsonToActivities(sourceFilePath, outputFileName)
allEvents.push(newLine) allEvents.push(newLine)
}) })
console.log('events', events.length) console.log('events', events.length)
writeFileInOuputFolder(outputFileName, events.join("\n")) writeFileInOuputFolderFromJsonObject(outputFileName, events.join("\n"))
}) })
} }
@ -69,7 +69,7 @@ fileArray.forEach(item=>{
convertJsonToActivities(sourceFilePath,outputFileName); convertJsonToActivities(sourceFilePath,outputFileName);
}) })
writeFileInOuputFolder(fileNameAllEvents, events.join("\n")) writeFileInOuputFolderFromJsonObject(fileNameAllEvents, events.join("\n"))

194
parse_orgmode_to_json.mjs
View File

@ -20,6 +20,7 @@ let tasksObjectsForJsonExport = []
let headersByKind = {} let headersByKind = {}
let writeJsonAfterParse = false; let writeJsonAfterParse = false;
writeJsonAfterParse = true; writeJsonAfterParse = true;
moment.locale('FR')
/************************************************************** /**************************************************************
* fetch the source orgmode file to read its contents * fetch the source orgmode file to read its contents
@ -59,10 +60,10 @@ let statistics = {
havingNoDate: 0, havingNoDate: 0,
oldEst: 0, oldEst: 0,
mostRecent: 0, mostRecent: 0,
years:{}, years: {},
weeks:{}, weeks: {},
months:{}, months: {},
days:{} days: {}
} }
} }
@ -90,15 +91,17 @@ let isLogbook = false;
let isFirst = true; let isFirst = true;
// init first task object as empty clone // init first task object as empty clone
let currentTask = {...task}; let currentTask = Object.create(task);
/** /**
* add to tasks to export and refresh current task * add to tasks to export and refresh current task
*/ */
function addAndRefreshCurrentTask() { function addAndRefreshCurrentTask() {
tasksObjectsForJsonExport.push(currentTask) tasksObjectsForJsonExport.push(currentTask)
currentTask = {...task}; // réinitialisation de tâche pour remplir de nouveau
currentTask = Object.create(task);
currentTask.dates = {}; currentTask.dates = {};
currentTask.tags = [];
}; };
function makeWordsStatistics(sentence) { function makeWordsStatistics(sentence) {
@ -124,58 +127,89 @@ function statisticDateFill(keyword, dateFoundElement) {
// décompte par années // décompte par années
let convertedDate = new Date(dateFoundElement ) let convertedDate = new Date(dateFoundElement)
let yearOfDate = convertedDate.getFullYear() let yearOfDate = convertedDate.getFullYear()
let monthOfDate = convertedDate.getFullYear()+ '-'+ convertedDate.getMonth() let monthOfDate = yearOfDate + '-' + convertedDate.getMonth()
let convertedMonth = convertedDate.getMonth() < 10 ? '0'+convertedDate.getMonth(): convertedDate.getMonth() // add zeros
let convertedDay = convertedDate.getDay() < 10 ? '0'+convertedDate.getDay(): convertedDate.getDay() let convertedWeek = moment(convertedDate).week() < 10 ? '0' + moment(convertedDate).week() : moment(convertedDate).week()
let dayOfDate = convertedDate.getFullYear()+ '-'+ convertedMonth+ '-' + convertedDay let weekOfDate = yearOfDate + '-' + convertedWeek
console.log('convertedDate', convertedDate,yearOfDate) let convertedMonth = convertedDate.getMonth() < 10 ? '0' + convertedDate.getMonth() : convertedDate.getMonth()
if(!statistics.dates.years[yearOfDate]){ let convertedDay = convertedDate.getDay() < 10 ? '0' + convertedDate.getDay() : convertedDate.getDay()
let dayOfDate = convertedDate.getFullYear() + '-' + convertedMonth + '-' + convertedDay
if (!statistics.dates.years[yearOfDate]) {
statistics.dates.years[yearOfDate] = { statistics.dates.years[yearOfDate] = {
created:0, created: 0,
closed:0, closed: 0,
} }
} }
if(keyword=== 'CLOSED'){ if (keyword === 'CLOSED') {
statistics.dates.years[yearOfDate].closed++; statistics.dates.years[yearOfDate].closed++;
} }
if(keyword=== 'CREATED'){ if (keyword === 'CREATED') {
statistics.dates.years[yearOfDate].created++; statistics.dates.years[yearOfDate].created++;
} }
// par année-semaine
if (!statistics.dates.weeks[weekOfDate]) {
statistics.dates.weeks[weekOfDate] = {
created: 0,
closed: 0,
}
}
if (keyword === 'CLOSED') {
statistics.dates.weeks[weekOfDate].closed++;
}
if (keyword === 'CREATED') {
statistics.dates.weeks[weekOfDate].created++;
}
// décompte par mois // décompte par mois
if(!statistics.dates.months[monthOfDate]){ if (!statistics.dates.months[monthOfDate]) {
statistics.dates.months[monthOfDate] = { statistics.dates.months[monthOfDate] = {
created:0, created: 0,
closed:0, closed: 0,
} }
} }
if(keyword=== 'CLOSED'){ if (keyword === 'CLOSED') {
statistics.dates.months[monthOfDate].closed++; statistics.dates.months[monthOfDate].closed++;
} }
if(keyword=== 'CREATED'){ if (keyword === 'CREATED') {
statistics.dates.months[monthOfDate].created++; statistics.dates.months[monthOfDate].created++;
} }
// décompte par jours // décompte par jours
if(!statistics.dates.days[dayOfDate]){ if (!statistics.dates.days[dayOfDate]) {
statistics.dates.days[dayOfDate] = { statistics.dates.days[dayOfDate] = {
created:0, created: 0,
closed:0, closed: 0,
} }
} }
if(keyword=== 'CLOSED'){ if (keyword === 'CLOSED') {
statistics.dates.days[dayOfDate].closed++; statistics.dates.days[dayOfDate].closed++;
} }
if(keyword=== 'CREATED'){ if (keyword === 'CREATED') {
statistics.dates.days[dayOfDate].created++; statistics.dates.days[dayOfDate].created++;
} }
} }
function findOldestDate(currentDate) {
// trouver la plus ancienne date
if (!statistics.dates.oldEst) {
statistics.dates.oldEst = currentDate;
} else {
var beginningTime = moment(statistics.dates.oldEst);
var endTime = moment(currentDate);
if (!beginningTime.isBefore(endTime)) {
statistics.dates.oldEst = currentDate;
}
}
}
/********************** /**********************
* loop to parse all * loop to parse all
*********************/ *********************/
@ -217,7 +251,7 @@ fs.readFile(sourceFilePath, 'utf8', function (err, data) {
headers.push(cleanHeader(line)) headers.push(cleanHeader(line))
currentTask.header = cleanHeader(line); currentTask.header = cleanHeader(line);
makeWordsStatistics(cleanHeader(line)); // makeWordsStatistics(cleanHeader(line));
stateKeywordList.forEach(keyword => { stateKeywordList.forEach(keyword => {
let keywordIsFound = lineHasKeyword(line, keyword) let keywordIsFound = lineHasKeyword(line, keyword)
@ -228,10 +262,10 @@ fs.readFile(sourceFilePath, 'utf8', function (err, data) {
// trouver les tags // trouver les tags
let tagsFound = line.match(/\:(.*)\:/g) let tagsList = line.match(/\:([\w\_]*)\:/g)
if (tagsFound) { if (tagsList) {
tagsFound = tagsFound[0]; tagsList = tagsList[0];
let tagList = tagsFound.split(':'); let tagList = tagsList.split(':');
if (tagList.length) { if (tagList.length) {
tagList.forEach(tag => { tagList.forEach(tag => {
@ -269,34 +303,36 @@ fs.readFile(sourceFilePath, 'utf8', function (err, data) {
currentTask.dates[keyword] = ''; currentTask.dates[keyword] = '';
} }
let convertedDate = dateFound[0].substring(0, 10) let convertedDate = dateFound[0].substring(0, 10);
if (dateFound[0].length == 15) {
// sans heure: "2022-12-21 mer."
convertedDate = moment(dateFound[0], 'YYYY-MM-DD ddd')
} else if (dateFound[0].length == 21) {
// avec heure: "2022-11-01 mar. 00:44"
convertedDate = moment(dateFound[0], 'YYYY-MM-DD ddd HH:mm')
}
let formattedDate = moment(convertedDate).format() let formattedDate = moment(convertedDate).format()
statisticDateFill(keyword,convertedDate) statisticDateFill(keyword, convertedDate)
findOldestDate(convertedDate)
currentTask.dates[keyword] = formattedDate; currentTask.dates[keyword] = formattedDate;
console.log('formattedDate', keyword, formattedDate)
// trouver la plus ancienne date
if (!statistics.dates.oldEst) {
statistics.dates.oldEst = formattedDate;
} else {
var beginningTime = moment(statistics.dates.oldEst);
var endTime = moment(convertedDate);
if (!beginningTime.isBefore(endTime)) {
statistics.dates.oldEst = formattedDate;
}
}
} else { } else {
// console.log('keyword', keyword) // console.log('keyword', keyword)
} }
}) })
} else { } else {
statistics.dates.havingNoDate += 1; statistics.dates.havingNoDate += 1;
if (line.indexOf(dateKeywordList) !== -1 && line.indexOf(stateKeywordList) !== -1 && line.indexOf(sectionKeywordList) !== -1) { if (
line.indexOf(dateKeywordList) !== -1 &&
line.indexOf(stateKeywordList) !== -1 &&
line.indexOf(sectionKeywordList) !== -1
) {
makeWordsStatistics(line)
// ajouter le corps complet de la section après le header // ajouter le corps complet de la section après le header
if (line.length && !isHeader) { if (line.length && !isHeader) {
@ -305,6 +341,7 @@ fs.readFile(sourceFilePath, 'utf8', function (err, data) {
currentTask.corpus += `${cleanedLine} currentTask.corpus += `${cleanedLine}
` `
makeWordsStatistics(cleanedLine)
} }
} }
} }
@ -317,9 +354,17 @@ fs.readFile(sourceFilePath, 'utf8', function (err, data) {
// ranger par valeur décroissante les tags // ranger par valeur décroissante les tags
let sorted_stats = []; let sorted_stats = [];
sorted_stats = Object.fromEntries( // rangement par valeur et par date
Object.entries(statistics).sort(([, a], [, b]) => a - b) console.log('write file ', outputAbsolutePath, outputFileNameJson);
); statistics.dates.years = sortByKey(statistics.dates.years)
statistics.dates.weeks = sortByKey(statistics.dates.weeks)
statistics.dates.months = sortByKey(statistics.dates.months)
statistics.dates.days = sortByKey(statistics.dates.days)
statistics.tags = sortByValue(statistics.tags)
statistics.words = sortByValue(statistics.tags)
sorted_stats = sortByKey(statistics)
const jsonContent = { const jsonContent = {
@ -340,11 +385,22 @@ fs.readFile(sourceFilePath, 'utf8', function (err, data) {
if (writeJsonAfterParse) { if (writeJsonAfterParse) {
writeFileInOuputFolder(outputFileNameJson, JSON.stringify(jsonContent)); writeFileInOuputFolderFromJsonObject(outputFileNameJson, jsonContent);
} }
}) })
/**
* ranger un objet littéral selon la valeur décroissante de ses paires
* @param literalobject
* @returns {any}
*/
function sortByValue(literalobject) {
return Object.fromEntries(
Object.entries(literalobject).sort(([, a], [, b]) => b - a)
);
}
function lineHasKeyword(line, keyword = 'TODO') { function lineHasKeyword(line, keyword = 'TODO') {
let isFound = (line.indexOf('* ' + keyword) !== -1) let isFound = (line.indexOf('* ' + keyword) !== -1)
@ -401,16 +457,6 @@ function searchDate(line) {
} }
/**
* afin de trouver la première date liée à une tâche parmi celles mentionnées, il faut comparer les dates
* @param date1
* @param date2
*/
function compareDatesAndKeepOldest(date1, date2) {
date1 = moment(date1)
date2 = moment(date2)
}
/** /**
* get the cleaned content of the header * get the cleaned content of the header
* @param line * @param line
@ -428,13 +474,29 @@ function cleanHeader(line) {
return line.trim(); return line.trim();
} }
export async function writeFileInOuputFolder(fileName, fileContent) { /**
console.log('write file ', outputAbsolutePath, fileName); * ranger un objet littéral par ordre alphabétique de ses clés
console.log('date statistics ', statistics.dates); * @param objectStuff
* @returns {{}}
*/
function sortByKey(objectStuff) {
return Object.keys(objectStuff).sort().reduce(
(obj, key) => {
obj[key] = objectStuff[key];
return obj;
},
{}
);
}
export async function writeFileInOuputFolderFromJsonObject(fileName, jsonObjectThing) {
console.log('statistics.words', statistics.words)
return await fs.writeFile( return await fs.writeFile(
`${outputAbsolutePath}${fileName}`, `${outputAbsolutePath}${fileName}`,
fileContent, JSON.stringify(jsonObjectThing),
"utf8", "utf8",
(err) => { (err) => {
if (err) { if (err) {

8
sms_to_csv.mjs
View File

@ -1,6 +1,6 @@
import fs from "node-fs"; import fs from "node-fs";
import convert from "xml-js"; import convert from "xml-js";
import {writeFileInOuputFolder} from "./parse_orgmode_to_json.mjs"; import {writeFileInOuputFolderFromJsonObject} from "./parse_orgmode_to_json.mjs";
/********************** /**********************
* initialize configs * initialize configs
@ -75,7 +75,7 @@ function convertJsonToCsv(sourceFilePath, outputFileName) {
) )
}) })
console.log('events', events) console.log('events', events)
writeFileInOuputFolder(outputFileName, events.join("\n")) writeFileInOuputFolderFromJsonObject(outputFileName, events.join("\n"))
}) })
} }
@ -94,7 +94,7 @@ function openSourceFile() {
// console.log('smses', Object.keys(jsonConversion)) // console.log('smses', Object.keys(jsonConversion))
console.log('jsonConversion[0]', jsonConversion['10']) console.log('jsonConversion[0]', jsonConversion['10'])
writeFileInOuputFolder(outputFileJson, jsonConversion) writeFileInOuputFolderFromJsonObject(outputFileJson, jsonConversion)
convertJsonToCsv(sourceFileJson, outputFileCsv) convertJsonToCsv(sourceFileJson, outputFileCsv)
}) })
@ -153,7 +153,7 @@ function convertJsonToCsv(sourceFilePath, outputFileName) {
) )
}) })
console.log('events', events) console.log('events', events)
writeFileInOuputFolder(outputFileName, events.join("\n")) writeFileInOuputFolderFromJsonObject(outputFileName, events.join("\n"))
}) })
} }