Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 29 additions & 4 deletions src/manage/aliasutils.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -85,7 +85,16 @@ def _if_exists(launcher, plat):
return launcher


def _create_alias(cmd, *, name, target, plat=None, windowed=0, script_code=None, _link=os.link):
def _create_alias(
cmd,
*,
name,
target,
plat=None,
windowed=0,
script_code=None,
allow_link=True,
_link=os.link):
p = cmd.global_dir / name
if not p.match("*.exe"):
p = p.with_name(p.name + ".exe")
Expand DownExpand Up@@ -129,12 +138,27 @@ def _create_alias(cmd, *, name, target, plat=None, windowed=0, script_code=None,
LOGGER.debug("Failed to read existing alias launcher.")

launcher_remap = cmd.scratch.setdefault("aliasutils.create_alias.launcher_remap", {})
if existing_bytes == launcher_bytes:
if not allow_link or not _link:
# If links are disallowed, always replace the target with a copy.
unlink(p)
try:
p.write_bytes(launcher_bytes)
LOGGER.debug("Created %s as copy of %s", p.name, launcher.name)
launcher_remap[launcher.name] = p
except OSError:
LOGGER.error("Failed to create global command %s.", name)
LOGGER.debug("TRACEBACK", exc_info=True)
elif existing_bytes == launcher_bytes:
# Valid existing launcher, so save its path in case we need it later
# for a hard link.
launcher_remap.setdefault(launcher.name, p)
else:
# First try and create a hard link
# Links are allowed and we need to create one, so try to make a link,
# falling back to a link to another existing alias (that we've checked
# already during this run), and then falling back to a copy.
# This handles the case where our links are on a different volume to the
# install (so hard links don't work), but limits us to only a single
# copy (each) of the redirector(s), thus saving space.
unlink(p)
try:
_link(launcher, p)
Expand DownExpand Up@@ -305,7 +329,7 @@ def calculate_aliases(cmd, install, *, _scan=_scan):
yield ai.replace(target=default_alias.target)


def create_aliases(cmd, aliases, *, _create_alias=_create_alias):
def create_aliases(cmd, aliases, *, allow_link=True, _create_alias=_create_alias):
if not cmd.global_dir:
return

Expand DownExpand Up@@ -337,6 +361,7 @@ def create_aliases(cmd, aliases, *, _create_alias=_create_alias):
target=target,
script_code=alias.script_code,
windowed=alias.windowed,
allow_link=allow_link,
)
except NoLauncherTemplateError:
if install_matches_any(alias.install, getattr(cmd, "tags", None)):
Expand Down
2 changes: 2 additions & 0 deletions src/manage/commands.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -258,6 +258,7 @@ def execute(self):
"default_install_tag": (str, None),
"preserve_site_on_upgrade": (config_bool, None),
"enable_entrypoints": (config_bool, None),
"hard_link_entrypoints": (config_bool, None),
},

"first_run": {
Expand DownExpand Up@@ -823,6 +824,7 @@ class InstallCommand(BaseCommand):
default_install_tag = None
preserve_site_on_upgrade = True
enable_entrypoints = True
hard_link_entrypoints = True

def __init__(self, args, root=None):
super().__init__(args, root)
Expand Down
2 changes: 1 addition & 1 deletion src/manage/install_command.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -294,7 +294,7 @@ def update_all_shortcuts(cmd, *, _aliasutils=None):
except LookupError:
LOGGER.warn("Failed to process aliases for %s.", i.get("display-name", i["id"]))
LOGGER.debug("TRACEBACK", exc_info=True)
_aliasutils.create_aliases(cmd, aliases)
_aliasutils.create_aliases(cmd, aliases, allow_link=getattr(cmd, "hard_link_entrypoints", True))
_aliasutils.cleanup_aliases(cmd, preserve=aliases)

for i in installs:
Expand Down
3 changes: 2 additions & 1 deletion src/pymanager.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,8 @@
"install": {
"source": "%PYTHON_MANAGER_SOURCE_URL%",
"fallback_source": "./bundled/fallback-index.json",
"default_install_tag": "3"
"default_install_tag": "3",
"hard_link_entrypoints": false
},
"list": {
"format": "%PYTHON_MANAGER_LIST_FORMAT%"
Expand Down
24 changes: 23 additions & 1 deletion tests/test_alias.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -224,6 +224,28 @@ def fake_link(x, y):
)


def test_write_alias_launcher_no_linking(fake_config, assert_log, tmp_path):
fake_config.scratch = {
"aliasutils.create_alias.launcher_remap": {"launcher.txt": tmp_path / "actual_launcher.txt"},
}
fake_config.launcher_exe = tmp_path / "launcher.txt"
fake_config.launcher_exe.write_bytes(b'Arbitrary contents')
(tmp_path / "actual_launcher.txt").write_bytes(b'Arbitrary contents')
fake_config.default_platform = '-32'
fake_config.global_dir = tmp_path / "bin"
AU._create_alias(
fake_config,
name="test.exe",
target=tmp_path / "target.exe",
_link=None
)
assert_log(
"Create %s linking to %s",
("Created %s as copy of %s", ("test.exe", "launcher.txt")),
assert_log.end_of_log(),
)


def test_parse_entrypoint_line():
for line, expect in [
("", (None, None, None)),
Expand DownExpand Up@@ -305,7 +327,7 @@ def test_create_aliases(fake_config, tmp_path):

created = []
# Full arguments copied from source to ensure callers only pass valid args
def _on_create(cmd, *, name, target, plat=None, windowed=0, script_code=None):
def _on_create(cmd, *, name, target, plat=None, windowed=0, script_code=None, allow_link=True):
created.append((name, windowed, script_code))

aliases = [
Expand Down
2 changes: 1 addition & 1 deletion tests/test_install_command.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -199,7 +199,7 @@ class AliasUtils:
calculate_aliases = staticmethod(AU.calculate_aliases)

@staticmethod
def create_aliases(cmd, aliases):
def create_aliases(cmd, aliases, *, allow_link=True):
created.extend(aliases)

@staticmethod
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Add install.hard_link_entrypoints config option. by zooba · Pull Request #267 · python/pymanager · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 29 additions & 4 deletions src/manage/aliasutils.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -85,7 +85,16 @@ def _if_exists(launcher, plat):
return launcher


def _create_alias(cmd, *, name, target, plat=None, windowed=0, script_code=None, _link=os.link):
def _create_alias(
cmd,
*,
name,
target,
plat=None,
windowed=0,
script_code=None,
allow_link=True,
_link=os.link):
p = cmd.global_dir / name
if not p.match("*.exe"):
p = p.with_name(p.name + ".exe")
Expand DownExpand Up@@ -129,12 +138,27 @@ def _create_alias(cmd, *, name, target, plat=None, windowed=0, script_code=None,
LOGGER.debug("Failed to read existing alias launcher.")

launcher_remap = cmd.scratch.setdefault("aliasutils.create_alias.launcher_remap", {})
if existing_bytes == launcher_bytes:
if not allow_link or not _link:
# If links are disallowed, always replace the target with a copy.
unlink(p)
try:
p.write_bytes(launcher_bytes)
LOGGER.debug("Created %s as copy of %s", p.name, launcher.name)
launcher_remap[launcher.name] = p
except OSError:
LOGGER.error("Failed to create global command %s.", name)
LOGGER.debug("TRACEBACK", exc_info=True)
elif existing_bytes == launcher_bytes:
# Valid existing launcher, so save its path in case we need it later
# for a hard link.
launcher_remap.setdefault(launcher.name, p)
else:
# First try and create a hard link
# Links are allowed and we need to create one, so try to make a link,
# falling back to a link to another existing alias (that we've checked
# already during this run), and then falling back to a copy.
# This handles the case where our links are on a different volume to the
# install (so hard links don't work), but limits us to only a single
# copy (each) of the redirector(s), thus saving space.
unlink(p)
try:
_link(launcher, p)
Expand DownExpand Up@@ -305,7 +329,7 @@ def calculate_aliases(cmd, install, *, _scan=_scan):
yield ai.replace(target=default_alias.target)


def create_aliases(cmd, aliases, *, _create_alias=_create_alias):
def create_aliases(cmd, aliases, *, allow_link=True, _create_alias=_create_alias):
if not cmd.global_dir:
return

Expand DownExpand Up@@ -337,6 +361,7 @@ def create_aliases(cmd, aliases, *, _create_alias=_create_alias):
target=target,
script_code=alias.script_code,
windowed=alias.windowed,
allow_link=allow_link,
)
except NoLauncherTemplateError:
if install_matches_any(alias.install, getattr(cmd, "tags", None)):
Expand Down
2 changes: 2 additions & 0 deletions src/manage/commands.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -258,6 +258,7 @@ def execute(self):
"default_install_tag": (str, None),
"preserve_site_on_upgrade": (config_bool, None),
"enable_entrypoints": (config_bool, None),
"hard_link_entrypoints": (config_bool, None),
},

"first_run": {
Expand DownExpand Up@@ -823,6 +824,7 @@ class InstallCommand(BaseCommand):
default_install_tag = None
preserve_site_on_upgrade = True
enable_entrypoints = True
hard_link_entrypoints = True

def __init__(self, args, root=None):
super().__init__(args, root)
Expand Down
2 changes: 1 addition & 1 deletion src/manage/install_command.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -294,7 +294,7 @@ def update_all_shortcuts(cmd, *, _aliasutils=None):
except LookupError:
LOGGER.warn("Failed to process aliases for %s.", i.get("display-name", i["id"]))
LOGGER.debug("TRACEBACK", exc_info=True)
_aliasutils.create_aliases(cmd, aliases)
_aliasutils.create_aliases(cmd, aliases, allow_link=getattr(cmd, "hard_link_entrypoints", True))
_aliasutils.cleanup_aliases(cmd, preserve=aliases)

for i in installs:
Expand Down
3 changes: 2 additions & 1 deletion src/pymanager.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,8 @@
"install": {
"source": "%PYTHON_MANAGER_SOURCE_URL%",
"fallback_source": "./bundled/fallback-index.json",
"default_install_tag": "3"
"default_install_tag": "3",
"hard_link_entrypoints": false
},
"list": {
"format": "%PYTHON_MANAGER_LIST_FORMAT%"
Expand Down
24 changes: 23 additions & 1 deletion tests/test_alias.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -224,6 +224,28 @@ def fake_link(x, y):
)


def test_write_alias_launcher_no_linking(fake_config, assert_log, tmp_path):
fake_config.scratch = {
"aliasutils.create_alias.launcher_remap": {"launcher.txt": tmp_path / "actual_launcher.txt"},
}
fake_config.launcher_exe = tmp_path / "launcher.txt"
fake_config.launcher_exe.write_bytes(b'Arbitrary contents')
(tmp_path / "actual_launcher.txt").write_bytes(b'Arbitrary contents')
fake_config.default_platform = '-32'
fake_config.global_dir = tmp_path / "bin"
AU._create_alias(
fake_config,
name="test.exe",
target=tmp_path / "target.exe",
_link=None
)
assert_log(
"Create %s linking to %s",
("Created %s as copy of %s", ("test.exe", "launcher.txt")),
assert_log.end_of_log(),
)


def test_parse_entrypoint_line():
for line, expect in [
("", (None, None, None)),
Expand DownExpand Up@@ -305,7 +327,7 @@ def test_create_aliases(fake_config, tmp_path):

created = []
# Full arguments copied from source to ensure callers only pass valid args
def _on_create(cmd, *, name, target, plat=None, windowed=0, script_code=None):
def _on_create(cmd, *, name, target, plat=None, windowed=0, script_code=None, allow_link=True):
created.append((name, windowed, script_code))

aliases = [
Expand Down
2 changes: 1 addition & 1 deletion tests/test_install_command.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -199,7 +199,7 @@ class AliasUtils:
calculate_aliases = staticmethod(AU.calculate_aliases)

@staticmethod
def create_aliases(cmd, aliases):
def create_aliases(cmd, aliases, *, allow_link=True):
created.extend(aliases)

@staticmethod
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Add install.hard_link_entrypoints config option. by zooba · Pull Request #267 · python/pymanager · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 29 additions & 4 deletions src/manage/aliasutils.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -85,7 +85,16 @@ def _if_exists(launcher, plat):
return launcher


def _create_alias(cmd, *, name, target, plat=None, windowed=0, script_code=None, _link=os.link):
def _create_alias(
cmd,
*,
name,
target,
plat=None,
windowed=0,
script_code=None,
allow_link=True,
_link=os.link):
p = cmd.global_dir / name
if not p.match("*.exe"):
p = p.with_name(p.name + ".exe")
Expand DownExpand Up@@ -129,12 +138,27 @@ def _create_alias(cmd, *, name, target, plat=None, windowed=0, script_code=None,
LOGGER.debug("Failed to read existing alias launcher.")

launcher_remap = cmd.scratch.setdefault("aliasutils.create_alias.launcher_remap", {})
if existing_bytes == launcher_bytes:
if not allow_link or not _link:
# If links are disallowed, always replace the target with a copy.
unlink(p)
try:
p.write_bytes(launcher_bytes)
LOGGER.debug("Created %s as copy of %s", p.name, launcher.name)
launcher_remap[launcher.name] = p
except OSError:
LOGGER.error("Failed to create global command %s.", name)
LOGGER.debug("TRACEBACK", exc_info=True)
elif existing_bytes == launcher_bytes:
# Valid existing launcher, so save its path in case we need it later
# for a hard link.
launcher_remap.setdefault(launcher.name, p)
else:
# First try and create a hard link
# Links are allowed and we need to create one, so try to make a link,
# falling back to a link to another existing alias (that we've checked
# already during this run), and then falling back to a copy.
# This handles the case where our links are on a different volume to the
# install (so hard links don't work), but limits us to only a single
# copy (each) of the redirector(s), thus saving space.
unlink(p)
try:
_link(launcher, p)
Expand DownExpand Up@@ -305,7 +329,7 @@ def calculate_aliases(cmd, install, *, _scan=_scan):
yield ai.replace(target=default_alias.target)


def create_aliases(cmd, aliases, *, _create_alias=_create_alias):
def create_aliases(cmd, aliases, *, allow_link=True, _create_alias=_create_alias):
if not cmd.global_dir:
return

Expand DownExpand Up@@ -337,6 +361,7 @@ def create_aliases(cmd, aliases, *, _create_alias=_create_alias):
target=target,
script_code=alias.script_code,
windowed=alias.windowed,
allow_link=allow_link,
)
except NoLauncherTemplateError:
if install_matches_any(alias.install, getattr(cmd, "tags", None)):
Expand Down
2 changes: 2 additions & 0 deletions src/manage/commands.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -258,6 +258,7 @@ def execute(self):
"default_install_tag": (str, None),
"preserve_site_on_upgrade": (config_bool, None),
"enable_entrypoints": (config_bool, None),
"hard_link_entrypoints": (config_bool, None),
},

"first_run": {
Expand DownExpand Up@@ -823,6 +824,7 @@ class InstallCommand(BaseCommand):
default_install_tag = None
preserve_site_on_upgrade = True
enable_entrypoints = True
hard_link_entrypoints = True

def __init__(self, args, root=None):
super().__init__(args, root)
Expand Down
2 changes: 1 addition & 1 deletion src/manage/install_command.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -294,7 +294,7 @@ def update_all_shortcuts(cmd, *, _aliasutils=None):
except LookupError:
LOGGER.warn("Failed to process aliases for %s.", i.get("display-name", i["id"]))
LOGGER.debug("TRACEBACK", exc_info=True)
_aliasutils.create_aliases(cmd, aliases)
_aliasutils.create_aliases(cmd, aliases, allow_link=getattr(cmd, "hard_link_entrypoints", True))
_aliasutils.cleanup_aliases(cmd, preserve=aliases)

for i in installs:
Expand Down
3 changes: 2 additions & 1 deletion src/pymanager.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,8 @@
"install": {
"source": "%PYTHON_MANAGER_SOURCE_URL%",
"fallback_source": "./bundled/fallback-index.json",
"default_install_tag": "3"
"default_install_tag": "3",
"hard_link_entrypoints": false
},
"list": {
"format": "%PYTHON_MANAGER_LIST_FORMAT%"
Expand Down
24 changes: 23 additions & 1 deletion tests/test_alias.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -224,6 +224,28 @@ def fake_link(x, y):
)


def test_write_alias_launcher_no_linking(fake_config, assert_log, tmp_path):
fake_config.scratch = {
"aliasutils.create_alias.launcher_remap": {"launcher.txt": tmp_path / "actual_launcher.txt"},
}
fake_config.launcher_exe = tmp_path / "launcher.txt"
fake_config.launcher_exe.write_bytes(b'Arbitrary contents')
(tmp_path / "actual_launcher.txt").write_bytes(b'Arbitrary contents')
fake_config.default_platform = '-32'
fake_config.global_dir = tmp_path / "bin"
AU._create_alias(
fake_config,
name="test.exe",
target=tmp_path / "target.exe",
_link=None
)
assert_log(
"Create %s linking to %s",
("Created %s as copy of %s", ("test.exe", "launcher.txt")),
assert_log.end_of_log(),
)


def test_parse_entrypoint_line():
for line, expect in [
("", (None, None, None)),
Expand DownExpand Up@@ -305,7 +327,7 @@ def test_create_aliases(fake_config, tmp_path):

created = []
# Full arguments copied from source to ensure callers only pass valid args
def _on_create(cmd, *, name, target, plat=None, windowed=0, script_code=None):
def _on_create(cmd, *, name, target, plat=None, windowed=0, script_code=None, allow_link=True):
created.append((name, windowed, script_code))

aliases = [
Expand Down
2 changes: 1 addition & 1 deletion tests/test_install_command.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -199,7 +199,7 @@ class AliasUtils:
calculate_aliases = staticmethod(AU.calculate_aliases)

@staticmethod
def create_aliases(cmd, aliases):
def create_aliases(cmd, aliases, *, allow_link=True):
created.extend(aliases)

@staticmethod
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Add install.hard_link_entrypoints config option. by zooba · Pull Request #267 · python/pymanager · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 29 additions & 4 deletions src/manage/aliasutils.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -85,7 +85,16 @@ def _if_exists(launcher, plat):
return launcher


def _create_alias(cmd, *, name, target, plat=None, windowed=0, script_code=None, _link=os.link):
def _create_alias(
cmd,
*,
name,
target,
plat=None,
windowed=0,
script_code=None,
allow_link=True,
_link=os.link):
p = cmd.global_dir / name
if not p.match("*.exe"):
p = p.with_name(p.name + ".exe")
Expand DownExpand Up@@ -129,12 +138,27 @@ def _create_alias(cmd, *, name, target, plat=None, windowed=0, script_code=None,
LOGGER.debug("Failed to read existing alias launcher.")

launcher_remap = cmd.scratch.setdefault("aliasutils.create_alias.launcher_remap", {})
if existing_bytes == launcher_bytes:
if not allow_link or not _link:
# If links are disallowed, always replace the target with a copy.
unlink(p)
try:
p.write_bytes(launcher_bytes)
LOGGER.debug("Created %s as copy of %s", p.name, launcher.name)
launcher_remap[launcher.name] = p
except OSError:
LOGGER.error("Failed to create global command %s.", name)
LOGGER.debug("TRACEBACK", exc_info=True)
elif existing_bytes == launcher_bytes:
# Valid existing launcher, so save its path in case we need it later
# for a hard link.
launcher_remap.setdefault(launcher.name, p)
else:
# First try and create a hard link
# Links are allowed and we need to create one, so try to make a link,
# falling back to a link to another existing alias (that we've checked
# already during this run), and then falling back to a copy.
# This handles the case where our links are on a different volume to the
# install (so hard links don't work), but limits us to only a single
# copy (each) of the redirector(s), thus saving space.
unlink(p)
try:
_link(launcher, p)
Expand DownExpand Up@@ -305,7 +329,7 @@ def calculate_aliases(cmd, install, *, _scan=_scan):
yield ai.replace(target=default_alias.target)


def create_aliases(cmd, aliases, *, _create_alias=_create_alias):
def create_aliases(cmd, aliases, *, allow_link=True, _create_alias=_create_alias):
if not cmd.global_dir:
return

Expand DownExpand Up@@ -337,6 +361,7 @@ def create_aliases(cmd, aliases, *, _create_alias=_create_alias):
target=target,
script_code=alias.script_code,
windowed=alias.windowed,
allow_link=allow_link,
)
except NoLauncherTemplateError:
if install_matches_any(alias.install, getattr(cmd, "tags", None)):
Expand Down
2 changes: 2 additions & 0 deletions src/manage/commands.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -258,6 +258,7 @@ def execute(self):
"default_install_tag": (str, None),
"preserve_site_on_upgrade": (config_bool, None),
"enable_entrypoints": (config_bool, None),
"hard_link_entrypoints": (config_bool, None),
},

"first_run": {
Expand DownExpand Up@@ -823,6 +824,7 @@ class InstallCommand(BaseCommand):
default_install_tag = None
preserve_site_on_upgrade = True
enable_entrypoints = True
hard_link_entrypoints = True

def __init__(self, args, root=None):
super().__init__(args, root)
Expand Down
2 changes: 1 addition & 1 deletion src/manage/install_command.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -294,7 +294,7 @@ def update_all_shortcuts(cmd, *, _aliasutils=None):
except LookupError:
LOGGER.warn("Failed to process aliases for %s.", i.get("display-name", i["id"]))
LOGGER.debug("TRACEBACK", exc_info=True)
_aliasutils.create_aliases(cmd, aliases)
_aliasutils.create_aliases(cmd, aliases, allow_link=getattr(cmd, "hard_link_entrypoints", True))
_aliasutils.cleanup_aliases(cmd, preserve=aliases)

for i in installs:
Expand Down
3 changes: 2 additions & 1 deletion src/pymanager.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,8 @@
"install": {
"source": "%PYTHON_MANAGER_SOURCE_URL%",
"fallback_source": "./bundled/fallback-index.json",
"default_install_tag": "3"
"default_install_tag": "3",
"hard_link_entrypoints": false
},
"list": {
"format": "%PYTHON_MANAGER_LIST_FORMAT%"
Expand Down
24 changes: 23 additions & 1 deletion tests/test_alias.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -224,6 +224,28 @@ def fake_link(x, y):
)


def test_write_alias_launcher_no_linking(fake_config, assert_log, tmp_path):
fake_config.scratch = {
"aliasutils.create_alias.launcher_remap": {"launcher.txt": tmp_path / "actual_launcher.txt"},
}
fake_config.launcher_exe = tmp_path / "launcher.txt"
fake_config.launcher_exe.write_bytes(b'Arbitrary contents')
(tmp_path / "actual_launcher.txt").write_bytes(b'Arbitrary contents')
fake_config.default_platform = '-32'
fake_config.global_dir = tmp_path / "bin"
AU._create_alias(
fake_config,
name="test.exe",
target=tmp_path / "target.exe",
_link=None
)
assert_log(
"Create %s linking to %s",
("Created %s as copy of %s", ("test.exe", "launcher.txt")),
assert_log.end_of_log(),
)


def test_parse_entrypoint_line():
for line, expect in [
("", (None, None, None)),
Expand DownExpand Up@@ -305,7 +327,7 @@ def test_create_aliases(fake_config, tmp_path):

created = []
# Full arguments copied from source to ensure callers only pass valid args
def _on_create(cmd, *, name, target, plat=None, windowed=0, script_code=None):
def _on_create(cmd, *, name, target, plat=None, windowed=0, script_code=None, allow_link=True):
created.append((name, windowed, script_code))

aliases = [
Expand Down
2 changes: 1 addition & 1 deletion tests/test_install_command.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -199,7 +199,7 @@ class AliasUtils:
calculate_aliases = staticmethod(AU.calculate_aliases)

@staticmethod
def create_aliases(cmd, aliases):
def create_aliases(cmd, aliases, *, allow_link=True):
created.extend(aliases)

@staticmethod
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' Add install.hard_link_entrypoints config option. by zooba · Pull Request #267 · python/pymanager · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 29 additions & 4 deletions src/manage/aliasutils.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -85,7 +85,16 @@ def _if_exists(launcher, plat):
return launcher


def _create_alias(cmd, *, name, target, plat=None, windowed=0, script_code=None, _link=os.link):
def _create_alias(
cmd,
*,
name,
target,
plat=None,
windowed=0,
script_code=None,
allow_link=True,
_link=os.link):
p = cmd.global_dir / name
if not p.match("*.exe"):
p = p.with_name(p.name + ".exe")
Expand DownExpand Up@@ -129,12 +138,27 @@ def _create_alias(cmd, *, name, target, plat=None, windowed=0, script_code=None,
LOGGER.debug("Failed to read existing alias launcher.")

launcher_remap = cmd.scratch.setdefault("aliasutils.create_alias.launcher_remap", {})
if existing_bytes == launcher_bytes:
if not allow_link or not _link:
# If links are disallowed, always replace the target with a copy.
unlink(p)
try:
p.write_bytes(launcher_bytes)
LOGGER.debug("Created %s as copy of %s", p.name, launcher.name)
launcher_remap[launcher.name] = p
except OSError:
LOGGER.error("Failed to create global command %s.", name)
LOGGER.debug("TRACEBACK", exc_info=True)
elif existing_bytes == launcher_bytes:
# Valid existing launcher, so save its path in case we need it later
# for a hard link.
launcher_remap.setdefault(launcher.name, p)
else:
# First try and create a hard link
# Links are allowed and we need to create one, so try to make a link,
# falling back to a link to another existing alias (that we've checked
# already during this run), and then falling back to a copy.
# This handles the case where our links are on a different volume to the
# install (so hard links don't work), but limits us to only a single
# copy (each) of the redirector(s), thus saving space.
unlink(p)
try:
_link(launcher, p)
Expand DownExpand Up@@ -305,7 +329,7 @@ def calculate_aliases(cmd, install, *, _scan=_scan):
yield ai.replace(target=default_alias.target)


def create_aliases(cmd, aliases, *, _create_alias=_create_alias):
def create_aliases(cmd, aliases, *, allow_link=True, _create_alias=_create_alias):
if not cmd.global_dir:
return

Expand DownExpand Up@@ -337,6 +361,7 @@ def create_aliases(cmd, aliases, *, _create_alias=_create_alias):
target=target,
script_code=alias.script_code,
windowed=alias.windowed,
allow_link=allow_link,
)
except NoLauncherTemplateError:
if install_matches_any(alias.install, getattr(cmd, "tags", None)):
Expand Down
2 changes: 2 additions & 0 deletions src/manage/commands.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -258,6 +258,7 @@ def execute(self):
"default_install_tag": (str, None),
"preserve_site_on_upgrade": (config_bool, None),
"enable_entrypoints": (config_bool, None),
"hard_link_entrypoints": (config_bool, None),
},

"first_run": {
Expand DownExpand Up@@ -823,6 +824,7 @@ class InstallCommand(BaseCommand):
default_install_tag = None
preserve_site_on_upgrade = True
enable_entrypoints = True
hard_link_entrypoints = True

def __init__(self, args, root=None):
super().__init__(args, root)
Expand Down
2 changes: 1 addition & 1 deletion src/manage/install_command.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -294,7 +294,7 @@ def update_all_shortcuts(cmd, *, _aliasutils=None):
except LookupError:
LOGGER.warn("Failed to process aliases for %s.", i.get("display-name", i["id"]))
LOGGER.debug("TRACEBACK", exc_info=True)
_aliasutils.create_aliases(cmd, aliases)
_aliasutils.create_aliases(cmd, aliases, allow_link=getattr(cmd, "hard_link_entrypoints", True))
_aliasutils.cleanup_aliases(cmd, preserve=aliases)

for i in installs:
Expand Down
3 changes: 2 additions & 1 deletion src/pymanager.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,8 @@
"install": {
"source": "%PYTHON_MANAGER_SOURCE_URL%",
"fallback_source": "./bundled/fallback-index.json",
"default_install_tag": "3"
"default_install_tag": "3",
"hard_link_entrypoints": false
},
"list": {
"format": "%PYTHON_MANAGER_LIST_FORMAT%"
Expand Down
24 changes: 23 additions & 1 deletion tests/test_alias.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -224,6 +224,28 @@ def fake_link(x, y):
)


def test_write_alias_launcher_no_linking(fake_config, assert_log, tmp_path):
fake_config.scratch = {
"aliasutils.create_alias.launcher_remap": {"launcher.txt": tmp_path / "actual_launcher.txt"},
}
fake_config.launcher_exe = tmp_path / "launcher.txt"
fake_config.launcher_exe.write_bytes(b'Arbitrary contents')
(tmp_path / "actual_launcher.txt").write_bytes(b'Arbitrary contents')
fake_config.default_platform = '-32'
fake_config.global_dir = tmp_path / "bin"
AU._create_alias(
fake_config,
name="test.exe",
target=tmp_path / "target.exe",
_link=None
)
assert_log(
"Create %s linking to %s",
("Created %s as copy of %s", ("test.exe", "launcher.txt")),
assert_log.end_of_log(),
)


def test_parse_entrypoint_line():
for line, expect in [
("", (None, None, None)),
Expand DownExpand Up@@ -305,7 +327,7 @@ def test_create_aliases(fake_config, tmp_path):

created = []
# Full arguments copied from source to ensure callers only pass valid args
def _on_create(cmd, *, name, target, plat=None, windowed=0, script_code=None):
def _on_create(cmd, *, name, target, plat=None, windowed=0, script_code=None, allow_link=True):
created.append((name, windowed, script_code))

aliases = [
Expand Down
2 changes: 1 addition & 1 deletion tests/test_install_command.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -199,7 +199,7 @@ class AliasUtils:
calculate_aliases = staticmethod(AU.calculate_aliases)

@staticmethod
def create_aliases(cmd, aliases):
def create_aliases(cmd, aliases, *, allow_link=True):
created.extend(aliases)

@staticmethod
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Add install.hard_link_entrypoints config option. by zooba · Pull Request #267 · python/pymanager · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 29 additions & 4 deletions src/manage/aliasutils.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -85,7 +85,16 @@ def _if_exists(launcher, plat):
return launcher


def _create_alias(cmd, *, name, target, plat=None, windowed=0, script_code=None, _link=os.link):
def _create_alias(
cmd,
*,
name,
target,
plat=None,
windowed=0,
script_code=None,
allow_link=True,
_link=os.link):
p = cmd.global_dir / name
if not p.match("*.exe"):
p = p.with_name(p.name + ".exe")
Expand DownExpand Up@@ -129,12 +138,27 @@ def _create_alias(cmd, *, name, target, plat=None, windowed=0, script_code=None,
LOGGER.debug("Failed to read existing alias launcher.")

launcher_remap = cmd.scratch.setdefault("aliasutils.create_alias.launcher_remap", {})
if existing_bytes == launcher_bytes:
if not allow_link or not _link:
# If links are disallowed, always replace the target with a copy.
unlink(p)
try:
p.write_bytes(launcher_bytes)
LOGGER.debug("Created %s as copy of %s", p.name, launcher.name)
launcher_remap[launcher.name] = p
except OSError:
LOGGER.error("Failed to create global command %s.", name)
LOGGER.debug("TRACEBACK", exc_info=True)
elif existing_bytes == launcher_bytes:
# Valid existing launcher, so save its path in case we need it later
# for a hard link.
launcher_remap.setdefault(launcher.name, p)
else:
# First try and create a hard link
# Links are allowed and we need to create one, so try to make a link,
# falling back to a link to another existing alias (that we've checked
# already during this run), and then falling back to a copy.
# This handles the case where our links are on a different volume to the
# install (so hard links don't work), but limits us to only a single
# copy (each) of the redirector(s), thus saving space.
unlink(p)
try:
_link(launcher, p)
Expand DownExpand Up@@ -305,7 +329,7 @@ def calculate_aliases(cmd, install, *, _scan=_scan):
yield ai.replace(target=default_alias.target)


def create_aliases(cmd, aliases, *, _create_alias=_create_alias):
def create_aliases(cmd, aliases, *, allow_link=True, _create_alias=_create_alias):
if not cmd.global_dir:
return

Expand DownExpand Up@@ -337,6 +361,7 @@ def create_aliases(cmd, aliases, *, _create_alias=_create_alias):
target=target,
script_code=alias.script_code,
windowed=alias.windowed,
allow_link=allow_link,
)
except NoLauncherTemplateError:
if install_matches_any(alias.install, getattr(cmd, "tags", None)):
Expand Down
2 changes: 2 additions & 0 deletions src/manage/commands.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -258,6 +258,7 @@ def execute(self):
"default_install_tag": (str, None),
"preserve_site_on_upgrade": (config_bool, None),
"enable_entrypoints": (config_bool, None),
"hard_link_entrypoints": (config_bool, None),
},

"first_run": {
Expand DownExpand Up@@ -823,6 +824,7 @@ class InstallCommand(BaseCommand):
default_install_tag = None
preserve_site_on_upgrade = True
enable_entrypoints = True
hard_link_entrypoints = True

def __init__(self, args, root=None):
super().__init__(args, root)
Expand Down
2 changes: 1 addition & 1 deletion src/manage/install_command.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -294,7 +294,7 @@ def update_all_shortcuts(cmd, *, _aliasutils=None):
except LookupError:
LOGGER.warn("Failed to process aliases for %s.", i.get("display-name", i["id"]))
LOGGER.debug("TRACEBACK", exc_info=True)
_aliasutils.create_aliases(cmd, aliases)
_aliasutils.create_aliases(cmd, aliases, allow_link=getattr(cmd, "hard_link_entrypoints", True))
_aliasutils.cleanup_aliases(cmd, preserve=aliases)

for i in installs:
Expand Down
3 changes: 2 additions & 1 deletion src/pymanager.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,8 @@
"install": {
"source": "%PYTHON_MANAGER_SOURCE_URL%",
"fallback_source": "./bundled/fallback-index.json",
"default_install_tag": "3"
"default_install_tag": "3",
"hard_link_entrypoints": false
},
"list": {
"format": "%PYTHON_MANAGER_LIST_FORMAT%"
Expand Down
24 changes: 23 additions & 1 deletion tests/test_alias.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -224,6 +224,28 @@ def fake_link(x, y):
)


def test_write_alias_launcher_no_linking(fake_config, assert_log, tmp_path):
fake_config.scratch = {
"aliasutils.create_alias.launcher_remap": {"launcher.txt": tmp_path / "actual_launcher.txt"},
}
fake_config.launcher_exe = tmp_path / "launcher.txt"
fake_config.launcher_exe.write_bytes(b'Arbitrary contents')
(tmp_path / "actual_launcher.txt").write_bytes(b'Arbitrary contents')
fake_config.default_platform = '-32'
fake_config.global_dir = tmp_path / "bin"
AU._create_alias(
fake_config,
name="test.exe",
target=tmp_path / "target.exe",
_link=None
)
assert_log(
"Create %s linking to %s",
("Created %s as copy of %s", ("test.exe", "launcher.txt")),
assert_log.end_of_log(),
)


def test_parse_entrypoint_line():
for line, expect in [
("", (None, None, None)),
Expand DownExpand Up@@ -305,7 +327,7 @@ def test_create_aliases(fake_config, tmp_path):

created = []
# Full arguments copied from source to ensure callers only pass valid args
def _on_create(cmd, *, name, target, plat=None, windowed=0, script_code=None):
def _on_create(cmd, *, name, target, plat=None, windowed=0, script_code=None, allow_link=True):
created.append((name, windowed, script_code))

aliases = [
Expand Down
2 changes: 1 addition & 1 deletion tests/test_install_command.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -199,7 +199,7 @@ class AliasUtils:
calculate_aliases = staticmethod(AU.calculate_aliases)

@staticmethod
def create_aliases(cmd, aliases):
def create_aliases(cmd, aliases, *, allow_link=True):
created.extend(aliases)

@staticmethod
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Add install.hard_link_entrypoints config option. by zooba · Pull Request #267 · python/pymanager · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 29 additions & 4 deletions src/manage/aliasutils.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -85,7 +85,16 @@ def _if_exists(launcher, plat):
return launcher


def _create_alias(cmd, *, name, target, plat=None, windowed=0, script_code=None, _link=os.link):
def _create_alias(
cmd,
*,
name,
target,
plat=None,
windowed=0,
script_code=None,
allow_link=True,
_link=os.link):
p = cmd.global_dir / name
if not p.match("*.exe"):
p = p.with_name(p.name + ".exe")
Expand DownExpand Up@@ -129,12 +138,27 @@ def _create_alias(cmd, *, name, target, plat=None, windowed=0, script_code=None,
LOGGER.debug("Failed to read existing alias launcher.")

launcher_remap = cmd.scratch.setdefault("aliasutils.create_alias.launcher_remap", {})
if existing_bytes == launcher_bytes:
if not allow_link or not _link:
# If links are disallowed, always replace the target with a copy.
unlink(p)
try:
p.write_bytes(launcher_bytes)
LOGGER.debug("Created %s as copy of %s", p.name, launcher.name)
launcher_remap[launcher.name] = p
except OSError:
LOGGER.error("Failed to create global command %s.", name)
LOGGER.debug("TRACEBACK", exc_info=True)
elif existing_bytes == launcher_bytes:
# Valid existing launcher, so save its path in case we need it later
# for a hard link.
launcher_remap.setdefault(launcher.name, p)
else:
# First try and create a hard link
# Links are allowed and we need to create one, so try to make a link,
# falling back to a link to another existing alias (that we've checked
# already during this run), and then falling back to a copy.
# This handles the case where our links are on a different volume to the
# install (so hard links don't work), but limits us to only a single
# copy (each) of the redirector(s), thus saving space.
unlink(p)
try:
_link(launcher, p)
Expand DownExpand Up@@ -305,7 +329,7 @@ def calculate_aliases(cmd, install, *, _scan=_scan):
yield ai.replace(target=default_alias.target)


def create_aliases(cmd, aliases, *, _create_alias=_create_alias):
def create_aliases(cmd, aliases, *, allow_link=True, _create_alias=_create_alias):
if not cmd.global_dir:
return

Expand DownExpand Up@@ -337,6 +361,7 @@ def create_aliases(cmd, aliases, *, _create_alias=_create_alias):
target=target,
script_code=alias.script_code,
windowed=alias.windowed,
allow_link=allow_link,
)
except NoLauncherTemplateError:
if install_matches_any(alias.install, getattr(cmd, "tags", None)):
Expand Down
2 changes: 2 additions & 0 deletions src/manage/commands.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -258,6 +258,7 @@ def execute(self):
"default_install_tag": (str, None),
"preserve_site_on_upgrade": (config_bool, None),
"enable_entrypoints": (config_bool, None),
"hard_link_entrypoints": (config_bool, None),
},

"first_run": {
Expand DownExpand Up@@ -823,6 +824,7 @@ class InstallCommand(BaseCommand):
default_install_tag = None
preserve_site_on_upgrade = True
enable_entrypoints = True
hard_link_entrypoints = True

def __init__(self, args, root=None):
super().__init__(args, root)
Expand Down
2 changes: 1 addition & 1 deletion src/manage/install_command.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -294,7 +294,7 @@ def update_all_shortcuts(cmd, *, _aliasutils=None):
except LookupError:
LOGGER.warn("Failed to process aliases for %s.", i.get("display-name", i["id"]))
LOGGER.debug("TRACEBACK", exc_info=True)
_aliasutils.create_aliases(cmd, aliases)
_aliasutils.create_aliases(cmd, aliases, allow_link=getattr(cmd, "hard_link_entrypoints", True))
_aliasutils.cleanup_aliases(cmd, preserve=aliases)

for i in installs:
Expand Down
3 changes: 2 additions & 1 deletion src/pymanager.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,8 @@
"install": {
"source": "%PYTHON_MANAGER_SOURCE_URL%",
"fallback_source": "./bundled/fallback-index.json",
"default_install_tag": "3"
"default_install_tag": "3",
"hard_link_entrypoints": false
},
"list": {
"format": "%PYTHON_MANAGER_LIST_FORMAT%"
Expand Down
24 changes: 23 additions & 1 deletion tests/test_alias.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -224,6 +224,28 @@ def fake_link(x, y):
)


def test_write_alias_launcher_no_linking(fake_config, assert_log, tmp_path):
fake_config.scratch = {
"aliasutils.create_alias.launcher_remap": {"launcher.txt": tmp_path / "actual_launcher.txt"},
}
fake_config.launcher_exe = tmp_path / "launcher.txt"
fake_config.launcher_exe.write_bytes(b'Arbitrary contents')
(tmp_path / "actual_launcher.txt").write_bytes(b'Arbitrary contents')
fake_config.default_platform = '-32'
fake_config.global_dir = tmp_path / "bin"
AU._create_alias(
fake_config,
name="test.exe",
target=tmp_path / "target.exe",
_link=None
)
assert_log(
"Create %s linking to %s",
("Created %s as copy of %s", ("test.exe", "launcher.txt")),
assert_log.end_of_log(),
)


def test_parse_entrypoint_line():
for line, expect in [
("", (None, None, None)),
Expand DownExpand Up@@ -305,7 +327,7 @@ def test_create_aliases(fake_config, tmp_path):

created = []
# Full arguments copied from source to ensure callers only pass valid args
def _on_create(cmd, *, name, target, plat=None, windowed=0, script_code=None):
def _on_create(cmd, *, name, target, plat=None, windowed=0, script_code=None, allow_link=True):
created.append((name, windowed, script_code))

aliases = [
Expand Down
2 changes: 1 addition & 1 deletion tests/test_install_command.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -199,7 +199,7 @@ class AliasUtils:
calculate_aliases = staticmethod(AU.calculate_aliases)

@staticmethod
def create_aliases(cmd, aliases):
def create_aliases(cmd, aliases, *, allow_link=True):
created.extend(aliases)

@staticmethod
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })(); Add install.hard_link_entrypoints config option. by zooba · Pull Request #267 · python/pymanager · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 29 additions & 4 deletions src/manage/aliasutils.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -85,7 +85,16 @@ def _if_exists(launcher, plat):
return launcher


def _create_alias(cmd, *, name, target, plat=None, windowed=0, script_code=None, _link=os.link):
def _create_alias(
cmd,
*,
name,
target,
plat=None,
windowed=0,
script_code=None,
allow_link=True,
_link=os.link):
p = cmd.global_dir / name
if not p.match("*.exe"):
p = p.with_name(p.name + ".exe")
Expand DownExpand Up@@ -129,12 +138,27 @@ def _create_alias(cmd, *, name, target, plat=None, windowed=0, script_code=None,
LOGGER.debug("Failed to read existing alias launcher.")

launcher_remap = cmd.scratch.setdefault("aliasutils.create_alias.launcher_remap", {})
if existing_bytes == launcher_bytes:
if not allow_link or not _link:
# If links are disallowed, always replace the target with a copy.
unlink(p)
try:
p.write_bytes(launcher_bytes)
LOGGER.debug("Created %s as copy of %s", p.name, launcher.name)
launcher_remap[launcher.name] = p
except OSError:
LOGGER.error("Failed to create global command %s.", name)
LOGGER.debug("TRACEBACK", exc_info=True)
elif existing_bytes == launcher_bytes:
# Valid existing launcher, so save its path in case we need it later
# for a hard link.
launcher_remap.setdefault(launcher.name, p)
else:
# First try and create a hard link
# Links are allowed and we need to create one, so try to make a link,
# falling back to a link to another existing alias (that we've checked
# already during this run), and then falling back to a copy.
# This handles the case where our links are on a different volume to the
# install (so hard links don't work), but limits us to only a single
# copy (each) of the redirector(s), thus saving space.
unlink(p)
try:
_link(launcher, p)
Expand DownExpand Up@@ -305,7 +329,7 @@ def calculate_aliases(cmd, install, *, _scan=_scan):
yield ai.replace(target=default_alias.target)


def create_aliases(cmd, aliases, *, _create_alias=_create_alias):
def create_aliases(cmd, aliases, *, allow_link=True, _create_alias=_create_alias):
if not cmd.global_dir:
return

Expand DownExpand Up@@ -337,6 +361,7 @@ def create_aliases(cmd, aliases, *, _create_alias=_create_alias):
target=target,
script_code=alias.script_code,
windowed=alias.windowed,
allow_link=allow_link,
)
except NoLauncherTemplateError:
if install_matches_any(alias.install, getattr(cmd, "tags", None)):
Expand Down
2 changes: 2 additions & 0 deletions src/manage/commands.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -258,6 +258,7 @@ def execute(self):
"default_install_tag": (str, None),
"preserve_site_on_upgrade": (config_bool, None),
"enable_entrypoints": (config_bool, None),
"hard_link_entrypoints": (config_bool, None),
},

"first_run": {
Expand DownExpand Up@@ -823,6 +824,7 @@ class InstallCommand(BaseCommand):
default_install_tag = None
preserve_site_on_upgrade = True
enable_entrypoints = True
hard_link_entrypoints = True

def __init__(self, args, root=None):
super().__init__(args, root)
Expand Down
2 changes: 1 addition & 1 deletion src/manage/install_command.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -294,7 +294,7 @@ def update_all_shortcuts(cmd, *, _aliasutils=None):
except LookupError:
LOGGER.warn("Failed to process aliases for %s.", i.get("display-name", i["id"]))
LOGGER.debug("TRACEBACK", exc_info=True)
_aliasutils.create_aliases(cmd, aliases)
_aliasutils.create_aliases(cmd, aliases, allow_link=getattr(cmd, "hard_link_entrypoints", True))
_aliasutils.cleanup_aliases(cmd, preserve=aliases)

for i in installs:
Expand Down
3 changes: 2 additions & 1 deletion src/pymanager.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,8 @@
"install": {
"source": "%PYTHON_MANAGER_SOURCE_URL%",
"fallback_source": "./bundled/fallback-index.json",
"default_install_tag": "3"
"default_install_tag": "3",
"hard_link_entrypoints": false
},
"list": {
"format": "%PYTHON_MANAGER_LIST_FORMAT%"
Expand Down
24 changes: 23 additions & 1 deletion tests/test_alias.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -224,6 +224,28 @@ def fake_link(x, y):
)


def test_write_alias_launcher_no_linking(fake_config, assert_log, tmp_path):
fake_config.scratch = {
"aliasutils.create_alias.launcher_remap": {"launcher.txt": tmp_path / "actual_launcher.txt"},
}
fake_config.launcher_exe = tmp_path / "launcher.txt"
fake_config.launcher_exe.write_bytes(b'Arbitrary contents')
(tmp_path / "actual_launcher.txt").write_bytes(b'Arbitrary contents')
fake_config.default_platform = '-32'
fake_config.global_dir = tmp_path / "bin"
AU._create_alias(
fake_config,
name="test.exe",
target=tmp_path / "target.exe",
_link=None
)
assert_log(
"Create %s linking to %s",
("Created %s as copy of %s", ("test.exe", "launcher.txt")),
assert_log.end_of_log(),
)


def test_parse_entrypoint_line():
for line, expect in [
("", (None, None, None)),
Expand DownExpand Up@@ -305,7 +327,7 @@ def test_create_aliases(fake_config, tmp_path):

created = []
# Full arguments copied from source to ensure callers only pass valid args
def _on_create(cmd, *, name, target, plat=None, windowed=0, script_code=None):
def _on_create(cmd, *, name, target, plat=None, windowed=0, script_code=None, allow_link=True):
created.append((name, windowed, script_code))

aliases = [
Expand Down
2 changes: 1 addition & 1 deletion tests/test_install_command.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -199,7 +199,7 @@ class AliasUtils:
calculate_aliases = staticmethod(AU.calculate_aliases)

@staticmethod
def create_aliases(cmd, aliases):
def create_aliases(cmd, aliases, *, allow_link=True):
created.extend(aliases)

@staticmethod
Expand Down