Edward Betts
ea4980a5d7
Adjust European short trip heuristic from >3 days to >1 day to correctly detect when user has returned home from European trips. This fixes the April 29-30, 2023 case where the location incorrectly showed "Sankt Georg, Hamburg" instead of "Bristol" when the user was free (no events scheduled) after the foss-north trip ended on April 27. The previous logic required more than 3 days to pass before assuming return home from European countries, but for short European trips by rail/ferry, users typically return within 1-2 days. 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com>
25 lines
1.4 KiB
JavaScript
25 lines
1.4 KiB
JavaScript
'use strict';
|
|
const path = require('path');
|
|
const {fileURLToPath} = require('url');
|
|
const resolveCwd = require('resolve-cwd');
|
|
const pkgDir = require('pkg-dir');
|
|
|
|
module.exports = filename => {
|
|
const normalizedFilename = filename.startsWith('file://') ? fileURLToPath(filename) : filename;
|
|
const globalDir = pkgDir.sync(path.dirname(normalizedFilename));
|
|
const relativePath = path.relative(globalDir, normalizedFilename);
|
|
const pkg = require(path.join(globalDir, 'package.json'));
|
|
const localFile = resolveCwd.silent(path.join(pkg.name, relativePath));
|
|
const localNodeModules = path.join(process.cwd(), 'node_modules');
|
|
|
|
const filenameInLocalNodeModules = !path.relative(localNodeModules, normalizedFilename).startsWith('..') &&
|
|
// On Windows, if `localNodeModules` and `normalizedFilename` are on different partitions, `path.relative()` returns the value of `normalizedFilename`, resulting in `filenameInLocalNodeModules` incorrectly becoming `true`.
|
|
path.parse(localNodeModules).root === path.parse(normalizedFilename).root;
|
|
|
|
// Use `path.relative()` to detect local package installation,
|
|
// because __filename's case is inconsistent on Windows
|
|
// Can use `===` when targeting Node.js 8
|
|
// See https://github.com/nodejs/node/issues/6624
|
|
return !filenameInLocalNodeModules && localFile && path.relative(localFile, normalizedFilename) !== '' && require(localFile);
|
|
};
|