klio 1.5.4 → 1.5.6

package/README.md

@@ -118,8 +118,12 @@ It's possible to analyze a csv with a column of either ISO date time or unix tim
 
 - **Show house and sign distribution of the datetime column**: `klio [planet] --csv <file-path>`
 - **Show aspect type distribution between two planets:** `klio [planet1] [planet2] --csv <file-path> --a`
+- **Specify date column name:** `klio [planet] --csv <file-path> --date-col "Buchungsdatum"` (e.g., `--date-col "Date"`)
 - **Filter CSV data by column value:** `klio [planet] --csv <file-path> --filter "column:value"` (e.g., `--filter "Item:coffee"`)
+- **Filter CSV data by contains operator:** `klio [planet] --csv <file-path> --filter "column*text"` (e.g., `--filter "Buchungstext*Gutschrift"`)
+- **Filter CSV data by excludes operator:** `klio [planet] --csv <file-path> --filter "column!text"` (e.g., `--filter "Buchungstext!Gutschrift"`)
 - **Filter CSV data by multiple conditions:** `klio [planet] --csv <file-path> --filter "column1:value1,column2:value2"` (e.g., `--filter "FTR:H,HomeTeam:Liverpool"`)
+- **Filter CSV data with comparison operators:** `klio [planet] --csv <file-path> --filter "column>value"` (e.g., `--filter "Amount>100"`)
 - **Creating a bar chart**: Create a bar chart and save the image to the downloads' folder. The image shows the aspect distribution of your csv datetime values: `klio moon sun --csv /home/user/Downloads/coffee.csv  --filter "Item:cookie" --a --title "Eaten cookies during sun-moon aspects"`
 
 - The command also returns a Chi-Square. 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "klio",
-  "version": "1.5.4",
+  "version": "1.5.6",
   "description": "A CLI for astrological calculations",
   "main": "src/main.js",
   "bin": {

package/src/astrology/astrologyConstants.js

@@ -9,7 +9,8 @@ const planets = {
   saturn: 6,
   uranus: 7,
   neptune: 8,
-  pluto: 9
+  pluto: 9,
+  chiron: 15
 };
 
 // Zodiac signs (English)
@@ -49,7 +50,8 @@ const dignities = {
   6: { sign: 'Capricorn', exaltation: 'Libra', fall: 'Aries', detriment: 'Cancer' }, // Saturn
   7: { sign: 'Aquarius', exaltation: 'Sagittarius', fall: 'Leo', detriment: 'Taurus' }, // Uranus
   8: { sign: 'Pisces', exaltation: 'Leo', fall: 'Aquarius', detriment: 'Virgo' }, // Neptune
-  9: { sign: 'Scorpio', exaltation: 'Aries', fall: 'Taurus', detriment: 'Scorpio' } // Pluto
+  9: { sign: 'Scorpio', exaltation: 'Aries', fall: 'Taurus', detriment: 'Scorpio' }, // Pluto
+  15: { sign: 'Virgo', exaltation: 'Pisces', fall: 'Virgo', detriment: 'Pisces' } // Chiron
 };
 
 module.exports = {

package/src/astrology/astrologyService.js

@@ -1859,7 +1859,7 @@ function parseFilterCriteria(filterString) {
   const filterConditions = filterString.split(',').map(cond => cond.trim());
   
   const criteria = [];
-  const operatorRegex = /^(.+?)\s*(>=|<=|!=|=|>|<)\s*(.+)$/;
+  const operatorRegex = /^(.+?)\s*(>=|<=|!=|=|>|<|\*|!)\s*(.+)$/;
   
   for (const condition of filterConditions) {
     const operatorMatch = condition.match(operatorRegex);
@@ -1872,6 +1872,27 @@ function parseFilterCriteria(filterString) {
       continue;
     }
 
+    // Check for contains (*) or excludes (!) operators in the value part
+    const containsMatch = condition.match(/^(.+?):\*(.+)$/);
+    if (containsMatch) {
+      criteria.push({
+        column: containsMatch[1].trim(),
+        operator: '*',
+        value: containsMatch[2].trim()
+      });
+      continue;
+    }
+
+    const excludesMatch = condition.match(/^(.+?):!(.+)$/);
+    if (excludesMatch) {
+      criteria.push({
+        column: excludesMatch[1].trim(),
+        operator: '!',
+        value: excludesMatch[2].trim()
+      });
+      continue;
+    }
+
     const parts = condition.split(':');
     if (parts.length !== 2) {
       console.warn(`Invalid filter format. Expected "column:value" or "column > value" but got "${condition}"`);
@@ -1919,6 +1940,12 @@ function applyFilter(records, filterCriteria) {
         return bothNumeric ? recordNum < valueNum : false;
       case '<=':
         return bothNumeric ? recordNum <= valueNum : false;
+      case '*':
+        // Contains operator - check if record value contains the search string
+        return recordValueStr.includes(valueStr);
+      case '!':
+        // Excludes operator - check if record value does NOT contain the search string
+        return !recordValueStr.includes(valueStr);
       default:
         return false;
     }
@@ -1941,7 +1968,7 @@ function applyFilter(records, filterCriteria) {
   }
 }
 
-function analyzeCSVWithDatetime(filePath, planetName = 'moon', houseSystem = 'koch', analyzeAspects = false, partnerPlanet = null, filterCriteria = null) {
+function analyzeCSVWithDatetime(filePath, planetName = 'moon', houseSystem = 'koch', analyzeAspects = false, partnerPlanet = null, filterCriteria = null, dateColumn = null) {
   return new Promise(async (resolve, reject) => {
     const results = [];
     let pendingOperations = 0;
@@ -2014,8 +2041,25 @@ function analyzeCSVWithDatetime(filePath, planetName = 'moon', houseSystem = 'ko
 
         // Process each row
         for (const data of filteredRecords) {
-          // Look for a column with datetime values, prioritizing specific date formats
-          const datetimeColumns = [];
+          // Use specified date column if provided, otherwise auto-detect
+          let datetimeColumns = [];
+          let datetimeValue = null;
+          
+          if (dateColumn) {
+            // Use the specified date column
+            if (data.hasOwnProperty(dateColumn)) {
+              datetimeValue = data[dateColumn];
+              datetimeColumns = [dateColumn];
+            } else {
+              console.warn(`⚠️  Specified date column "${dateColumn}" not found in CSV. Trying auto-detection...`);
+              // Fall back to auto-detection
+            }
+          }
+          
+          // If no date column was specified or it wasn't found, auto-detect
+          if (datetimeColumns.length === 0) {
+            // Look for a column with datetime values, prioritizing specific date formats
+            datetimeColumns = [];
           
           // First pass: look for YYYY-MM-DD format (most specific)
           const yyyyMmDdColumns = Object.keys(data).filter(key => {
@@ -2049,11 +2093,15 @@ function analyzeCSVWithDatetime(filePath, planetName = 'moon', houseSystem = 'ko
             return moment(trimmed, moment.ISO_8601, true).isValid();
           });
           
-          // Prioritize columns: YYYY-MM-DD, DD/MM/YYYY, Unix timestamps, then ISO dates
-          datetimeColumns.push(...yyyyMmDdColumns, ...ddMmYyyyColumns, ...unixTimestampColumns, ...isoDateColumns);
+            // Prioritize columns: YYYY-MM-DD, DD/MM/YYYY, Unix timestamps, then ISO dates
+            datetimeColumns.push(...yyyyMmDdColumns, ...ddMmYyyyColumns, ...unixTimestampColumns, ...isoDateColumns);
+            
+            if (datetimeColumns.length > 0) {
+              datetimeValue = data[datetimeColumns[0]];
+            }
+          }
 
-          if (datetimeColumns.length > 0) {
-            const datetimeValue = data[datetimeColumns[0]];
+          if (datetimeColumns.length > 0 && datetimeValue !== null) {
             const datetimeValueTrimmed = datetimeValue != null ? datetimeValue.toString().trim() : '';
             let datetime;
 
@@ -2249,9 +2297,25 @@ function analyzeCSVWithDatetime(filePath, planetName = 'moon', houseSystem = 'ko
 
         // Process each record
         for (const data of filteredRecords) {
-
-          // Look for a column with ISO-Datetime values, YYYY-MM-DD dates, DD/MM/YYYY dates (optional time), or Unix-Timestamps
-          const datetimeColumns = Object.keys(data).filter(key => {
+          // Use specified date column if provided, otherwise auto-detect
+          let datetimeColumns = [];
+          let datetimeValue = null;
+          
+          if (dateColumn) {
+            // Use the specified date column
+            if (data.hasOwnProperty(dateColumn)) {
+              datetimeValue = data[dateColumn];
+              datetimeColumns = [dateColumn];
+            } else {
+              console.warn(`⚠️  Specified date column "${dateColumn}" not found in CSV. Trying auto-detection...`);
+              // Fall back to auto-detection
+            }
+          }
+          
+          // If no date column was specified or it wasn't found, auto-detect
+          if (datetimeColumns.length === 0) {
+            // Look for a column with ISO-Datetime values, YYYY-MM-DD dates, DD/MM/YYYY dates (optional time), or Unix-Timestamps
+            datetimeColumns = Object.keys(data).filter(key => {
             const value = data[key];
             const trimmed = value != null ? value.toString().trim() : '';
             // Check for ISO-8601 date
@@ -2265,8 +2329,12 @@ function analyzeCSVWithDatetime(filePath, planetName = 'moon', houseSystem = 'ko
             return isISO || isYYYYMMDD || isDDMMYYYY || isUnixTimestamp;
           });
 
-          if (datetimeColumns.length > 0) {
-            const datetimeValue = data[datetimeColumns[0]];
+            if (datetimeColumns.length > 0) {
+              datetimeValue = data[datetimeColumns[0]];
+            }
+          }
+
+          if (datetimeColumns.length > 0 && datetimeValue !== null) {
             const datetimeValueTrimmed = datetimeValue != null ? datetimeValue.toString().trim() : '';
             let datetime;
 

package/src/cli/cli.js

@@ -392,6 +392,7 @@ program
   .option('--v <count>', 'Shows past aspects between two planets (Format: --v <count> planet1 aspectType planet2)')
   .option('--z <count>', 'Shows future aspects between two planets (Format: --z <count> planet1 aspectType planet2)')
   .option('--csv <filepath>', 'Analyzes a CSV file with ISO-Datetime values or Unix timestamps')
+  .option('--date-col <column>', 'Specifies the column name containing date values (e.g., --date-col "Buchungsdatum")')
   .option('--filter <column:value>', 'Filters CSV data by column:value (e.g., --filter "Item:coffee")')
   .option('--title <title>', 'Title for the chart image (generates PNG image when provided)')
   .option('--in [count]', 'Shows next planet ingress (entering new sign). Optional count for multiple ingresses')
@@ -1560,8 +1561,8 @@ program
         };
       }
       
-      // Check if we should use natal positions (when --i is used without custom date)
-      if (shouldUseBirthData(options) && !options.d) {
+      // Check if we should use natal positions (when --i, --p1, --p2, --wp, or --up is used without custom date)
+      if ((shouldUseBirthData(options) || shouldUsePersonData(options)) && !options.d) {
         useNatalPositions = true;
         customDate = birthData; // Use birth data for planet positions
         console.log('Using natal positions from birth data.');
@@ -1742,7 +1743,9 @@ program
       const analyzeAspects = actualOptions.a || false;
       const filterCriteria = actualOptions.filter;
       
-      analyzeCSVWithDatetime(actualOptions.csv, planet, houseSystem, analyzeAspects, planet2, filterCriteria)
+      const dateColumn = actualOptions.dateCol;
+
+      analyzeCSVWithDatetime(actualOptions.csv, planet, houseSystem, analyzeAspects, planet2, filterCriteria, dateColumn)
         .then(({ results, houseDistribution, signDistribution, aspectStatistics }) => {
           if (results.length === 0) {
             console.log('No valid ISO-Datetime values found in the CSV file.');
@@ -2785,7 +2788,9 @@ program
       const analyzeAspects = actualOptions.a || false;
       const filterCriteria = actualOptions.filter;
       
-      analyzeCSVWithDatetime(actualOptions.csv, planet, houseSystem, analyzeAspects, planet2, filterCriteria)
+      const dateColumn = actualOptions.dateCol;
+
+      analyzeCSVWithDatetime(actualOptions.csv, planet, houseSystem, analyzeAspects, planet2, filterCriteria, dateColumn)
         .then(({ results, houseDistribution, signDistribution, aspectStatistics }) => {
           if (results.length === 0) {
             console.log('No valid ISO-Datetime values found in the CSV file.');