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
39 changes: 23 additions & 16 deletions src/manage/firstrun.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -317,6 +317,7 @@ def __call__(self):
self._shown = True
LOGGER.print("!G!Welcome to the Python installation manager "
"configuration helper.!W!")
line_break()


def line_break():
Expand All@@ -329,18 +330,17 @@ def first_run(cmd):
if not cmd.enabled:
return

shown_any = False

welcome = _Welcome()
if cmd.explicit:
welcome()

shown_any = False
shown_any = True

if cmd.check_app_alias:
r = check_app_alias(cmd)
if not r:
welcome()
line_break()
shown_any = True
LOGGER.print("!Y!Your app execution alias settings are configured to launch "
"other commands besides 'py' and 'python'.!W!",
level=logging.WARN)
Expand All@@ -358,17 +358,18 @@ def first_run(cmd):
"!B!App execution aliases!W! page and scroll to the "
"'!B!Python!W!' entries to enable the new commands.",
wrap=True)
line_break()
shown_any = True
elif cmd.explicit:
if r == "skip":
LOGGER.info("Skipped app execution aliases check")
else:
LOGGER.info("Checked app execution aliases")
line_break()

if cmd.check_long_paths:
if not check_long_paths(cmd):
welcome()
line_break()
shown_any = True
LOGGER.print("!Y!Windows is not configured to allow paths longer than "
"260 characters.!W!", level=logging.WARN)
LOGGER.print("\nPython and some other apps can exceed this limit, "
Expand All@@ -378,33 +379,35 @@ def first_run(cmd):
"path support enabled.\n", wrap=True)
if not cmd.confirm or not cmd.ask_ny("Update setting now?"):
do_configure_long_paths(cmd)
line_break()
shown_any = True
elif cmd.explicit:
LOGGER.info("Checked system long paths setting")
line_break()

if cmd.check_py_on_path:
r = check_py_on_path(cmd)
if not r:
welcome()
line_break()
shown_any = True
LOGGER.print("!Y!The legacy 'py' command is still installed.!W!", level=logging.WARN)
LOGGER.print("\nThis may interfere with launching the new 'py' "
"command, and may be resolved by uninstalling "
"'!B!Python launcher!W!'.\n", wrap=True)
if cmd.confirm and not cmd.ask_ny("Open Installed apps now?"):
os.startfile("ms-settings:appsfeatures")
line_break()
shown_any = True
elif cmd.explicit:
if r == "skip":
LOGGER.info("Skipped check for legacy 'py' command")
else:
LOGGER.info("Checked PATH for legacy 'py' command")
line_break()

if cmd.check_global_dir:
r = check_global_dir(cmd)
if not r:
welcome()
line_break()
shown_any = True
LOGGER.print("!Y!The global shortcuts directory is not "
"configured.!W!", level=logging.WARN)
LOGGER.print("\nConfiguring this enables commands like "
Expand All@@ -423,18 +426,19 @@ def first_run(cmd):
not cmd.ask_ny("Add commands directory to your PATH now?")
):
do_global_dir_on_path(cmd)
line_break()
shown_any = True
elif cmd.explicit:
if r == "skip":
LOGGER.info("Skipped check for commands directory on PATH")
else:
LOGGER.info("Checked PATH for versioned commands directory")
line_break()

# This check must be last, because a failed install may exit the program.
if cmd.check_any_install:
if not check_any_install(cmd):
welcome()
line_break()
shown_any = True
LOGGER.print("!Y!You do not have any Python runtimes installed.!W!",
level=logging.WARN)
LOGGER.print("\nInstall the current latest version of CPython? If "
Expand All@@ -444,14 +448,15 @@ def first_run(cmd):
LOGGER.info("")
if not cmd.confirm or cmd.ask_yn("Install CPython now?"):
do_install(cmd)
line_break()
shown_any = True
elif cmd.explicit:
LOGGER.info("Checked for any Python installs")
line_break()

if cmd.check_latest_install:
if not check_latest_install(cmd):
welcome()
line_break()
shown_any = True
LOGGER.print("!Y!You do not have the latest Python runtime.!W!",
level=logging.WARN)
LOGGER.print("\nInstall the current latest version of CPython? If "
Expand All@@ -460,11 +465,13 @@ def first_run(cmd):
LOGGER.info("")
if not cmd.confirm or cmd.ask_yn("Install CPython now?"):
do_install(cmd)
line_break()
shown_any = True
elif cmd.explicit:
LOGGER.info("Checked for the latest available Python install")
line_break()

if shown_any or cmd.explicit:
line_break()
if shown_any:
LOGGER.print("!G!Configuration checks completed.!W!", level=logging.WARN)
LOGGER.print("\nTo run these checks again, launch !B!Python install "
"manager!W! from your Start menu, or !B!py install "
Expand Down
5 changes: 4 additions & 1 deletion src/manage/list_command.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -324,9 +324,12 @@ def execute(cmd):
cmd.fallback_source,
]:
if source:
downloader = IndexDownloader(source, Index)
if cmd.fallback_source_only:
downloader.quiet = True
try:
installs = _get_installs_from_index(
IndexDownloader(source, Index),
downloader,
tags,
)
break
Expand Down
15 changes: 11 additions & 4 deletions src/manage/urlutils.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -633,6 +633,7 @@ def __init__(self, source, index_cls, auth=None, cache=None):
self._auth = auth if auth is not None else {}
self._cache = cache if cache is not None else {}
self._urlopen = urlopen
self.quiet = False

def __iter__(self):
return self
Expand DownExpand Up@@ -667,17 +668,23 @@ def __next__(self):
on_auth_request=self.on_auth,
)
except FileNotFoundError: # includes 404
LOGGER.error("Unable to find runtimes index at %s", sanitise_url(url))
(LOGGER.verbose if self.quiet else LOGGER.error)(
"Unable to find runtimes index at %s",
sanitise_url(url),
)
raise
except OSError as ex:
LOGGER.error(
(LOGGER.verbose if self.quiet else LOGGER.error)(
"Unable to access runtimes index at %s: %s",
sanitise_url(url),
ex.args[1] if len(ex.args) >= 2 else ex
ex.args[1] if len(ex.args) >= 2 else ex,
)
raise
except RuntimeError as ex:
LOGGER.error("An unexpected error occurred while downloading the index: %s", ex)
(LOGGER.verbose if self.quiet else LOGGER.error)(
"An unexpected error occurred while downloading the index: %s",
ex,
)
raise

j = json.loads(data)
Expand Down
4 changes: 2 additions & 2 deletions tests/test_firstrun.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -124,9 +124,9 @@ def test_welcome(assert_log):
welcome = firstrun._Welcome()
assert_log(assert_log.end_of_log())
welcome()
assert_log(".*Welcome.*", assert_log.end_of_log())
assert_log(".*Welcome.*", "", r"!B!\*+!W!", "", assert_log.end_of_log())
welcome()
assert_log(".*Welcome.*", assert_log.end_of_log())
assert_log(".*Welcome.*", "", r"!B!\*+!W!", "", assert_log.end_of_log())



Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n 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;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
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
39 changes: 23 additions & 16 deletions src/manage/firstrun.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -317,6 +317,7 @@ def __call__(self):
self._shown = True
LOGGER.print("!G!Welcome to the Python installation manager "
"configuration helper.!W!")
line_break()


def line_break():
Expand All@@ -329,18 +330,17 @@ def first_run(cmd):
if not cmd.enabled:
return

shown_any = False

welcome = _Welcome()
if cmd.explicit:
welcome()

shown_any = False
shown_any = True

if cmd.check_app_alias:
r = check_app_alias(cmd)
if not r:
welcome()
line_break()
shown_any = True
LOGGER.print("!Y!Your app execution alias settings are configured to launch "
"other commands besides 'py' and 'python'.!W!",
level=logging.WARN)
Expand All@@ -358,17 +358,18 @@ def first_run(cmd):
"!B!App execution aliases!W! page and scroll to the "
"'!B!Python!W!' entries to enable the new commands.",
wrap=True)
line_break()
shown_any = True
elif cmd.explicit:
if r == "skip":
LOGGER.info("Skipped app execution aliases check")
else:
LOGGER.info("Checked app execution aliases")
line_break()

if cmd.check_long_paths:
if not check_long_paths(cmd):
welcome()
line_break()
shown_any = True
LOGGER.print("!Y!Windows is not configured to allow paths longer than "
"260 characters.!W!", level=logging.WARN)
LOGGER.print("\nPython and some other apps can exceed this limit, "
Expand All@@ -378,33 +379,35 @@ def first_run(cmd):
"path support enabled.\n", wrap=True)
if not cmd.confirm or not cmd.ask_ny("Update setting now?"):
do_configure_long_paths(cmd)
line_break()
shown_any = True
elif cmd.explicit:
LOGGER.info("Checked system long paths setting")
line_break()

if cmd.check_py_on_path:
r = check_py_on_path(cmd)
if not r:
welcome()
line_break()
shown_any = True
LOGGER.print("!Y!The legacy 'py' command is still installed.!W!", level=logging.WARN)
LOGGER.print("\nThis may interfere with launching the new 'py' "
"command, and may be resolved by uninstalling "
"'!B!Python launcher!W!'.\n", wrap=True)
if cmd.confirm and not cmd.ask_ny("Open Installed apps now?"):
os.startfile("ms-settings:appsfeatures")
line_break()
shown_any = True
elif cmd.explicit:
if r == "skip":
LOGGER.info("Skipped check for legacy 'py' command")
else:
LOGGER.info("Checked PATH for legacy 'py' command")
line_break()

if cmd.check_global_dir:
r = check_global_dir(cmd)
if not r:
welcome()
line_break()
shown_any = True
LOGGER.print("!Y!The global shortcuts directory is not "
"configured.!W!", level=logging.WARN)
LOGGER.print("\nConfiguring this enables commands like "
Expand All@@ -423,18 +426,19 @@ def first_run(cmd):
not cmd.ask_ny("Add commands directory to your PATH now?")
):
do_global_dir_on_path(cmd)
line_break()
shown_any = True
elif cmd.explicit:
if r == "skip":
LOGGER.info("Skipped check for commands directory on PATH")
else:
LOGGER.info("Checked PATH for versioned commands directory")
line_break()

# This check must be last, because a failed install may exit the program.
if cmd.check_any_install:
if not check_any_install(cmd):
welcome()
line_break()
shown_any = True
LOGGER.print("!Y!You do not have any Python runtimes installed.!W!",
level=logging.WARN)
LOGGER.print("\nInstall the current latest version of CPython? If "
Expand All@@ -444,14 +448,15 @@ def first_run(cmd):
LOGGER.info("")
if not cmd.confirm or cmd.ask_yn("Install CPython now?"):
do_install(cmd)
line_break()
shown_any = True
elif cmd.explicit:
LOGGER.info("Checked for any Python installs")
line_break()

if cmd.check_latest_install:
if not check_latest_install(cmd):
welcome()
line_break()
shown_any = True
LOGGER.print("!Y!You do not have the latest Python runtime.!W!",
level=logging.WARN)
LOGGER.print("\nInstall the current latest version of CPython? If "
Expand All@@ -460,11 +465,13 @@ def first_run(cmd):
LOGGER.info("")
if not cmd.confirm or cmd.ask_yn("Install CPython now?"):
do_install(cmd)
line_break()
shown_any = True
elif cmd.explicit:
LOGGER.info("Checked for the latest available Python install")
line_break()

if shown_any or cmd.explicit:
line_break()
if shown_any:
LOGGER.print("!G!Configuration checks completed.!W!", level=logging.WARN)
LOGGER.print("\nTo run these checks again, launch !B!Python install "
"manager!W! from your Start menu, or !B!py install "
Expand Down
5 changes: 4 additions & 1 deletion src/manage/list_command.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -324,9 +324,12 @@ def execute(cmd):
cmd.fallback_source,
]:
if source:
downloader = IndexDownloader(source, Index)
if cmd.fallback_source_only:
downloader.quiet = True
try:
installs = _get_installs_from_index(
IndexDownloader(source, Index),
downloader,
tags,
)
break
Expand Down
15 changes: 11 additions & 4 deletions src/manage/urlutils.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -633,6 +633,7 @@ def __init__(self, source, index_cls, auth=None, cache=None):
self._auth = auth if auth is not None else {}
self._cache = cache if cache is not None else {}
self._urlopen = urlopen
self.quiet = False

def __iter__(self):
return self
Expand DownExpand Up@@ -667,17 +668,23 @@ def __next__(self):
on_auth_request=self.on_auth,
)
except FileNotFoundError: # includes 404
LOGGER.error("Unable to find runtimes index at %s", sanitise_url(url))
(LOGGER.verbose if self.quiet else LOGGER.error)(
"Unable to find runtimes index at %s",
sanitise_url(url),
)
raise
except OSError as ex:
LOGGER.error(
(LOGGER.verbose if self.quiet else LOGGER.error)(
"Unable to access runtimes index at %s: %s",
sanitise_url(url),
ex.args[1] if len(ex.args) >= 2 else ex
ex.args[1] if len(ex.args) >= 2 else ex,
)
raise
except RuntimeError as ex:
LOGGER.error("An unexpected error occurred while downloading the index: %s", ex)
(LOGGER.verbose if self.quiet else LOGGER.error)(
"An unexpected error occurred while downloading the index: %s",
ex,
)
raise

j = json.loads(data)
Expand Down
4 changes: 2 additions & 2 deletions tests/test_firstrun.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -124,9 +124,9 @@ def test_welcome(assert_log):
welcome = firstrun._Welcome()
assert_log(assert_log.end_of_log())
welcome()
assert_log(".*Welcome.*", assert_log.end_of_log())
assert_log(".*Welcome.*", "", r"!B!\*+!W!", "", assert_log.end_of_log())
welcome()
assert_log(".*Welcome.*", assert_log.end_of_log())
assert_log(".*Welcome.*", "", r"!B!\*+!W!", "", assert_log.end_of_log())



Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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
39 changes: 23 additions & 16 deletions src/manage/firstrun.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -317,6 +317,7 @@ def __call__(self):
self._shown = True
LOGGER.print("!G!Welcome to the Python installation manager "
"configuration helper.!W!")
line_break()


def line_break():
Expand All@@ -329,18 +330,17 @@ def first_run(cmd):
if not cmd.enabled:
return

shown_any = False

welcome = _Welcome()
if cmd.explicit:
welcome()

shown_any = False
shown_any = True

if cmd.check_app_alias:
r = check_app_alias(cmd)
if not r:
welcome()
line_break()
shown_any = True
LOGGER.print("!Y!Your app execution alias settings are configured to launch "
"other commands besides 'py' and 'python'.!W!",
level=logging.WARN)
Expand All@@ -358,17 +358,18 @@ def first_run(cmd):
"!B!App execution aliases!W! page and scroll to the "
"'!B!Python!W!' entries to enable the new commands.",
wrap=True)
line_break()
shown_any = True
elif cmd.explicit:
if r == "skip":
LOGGER.info("Skipped app execution aliases check")
else:
LOGGER.info("Checked app execution aliases")
line_break()

if cmd.check_long_paths:
if not check_long_paths(cmd):
welcome()
line_break()
shown_any = True
LOGGER.print("!Y!Windows is not configured to allow paths longer than "
"260 characters.!W!", level=logging.WARN)
LOGGER.print("\nPython and some other apps can exceed this limit, "
Expand All@@ -378,33 +379,35 @@ def first_run(cmd):
"path support enabled.\n", wrap=True)
if not cmd.confirm or not cmd.ask_ny("Update setting now?"):
do_configure_long_paths(cmd)
line_break()
shown_any = True
elif cmd.explicit:
LOGGER.info("Checked system long paths setting")
line_break()

if cmd.check_py_on_path:
r = check_py_on_path(cmd)
if not r:
welcome()
line_break()
shown_any = True
LOGGER.print("!Y!The legacy 'py' command is still installed.!W!", level=logging.WARN)
LOGGER.print("\nThis may interfere with launching the new 'py' "
"command, and may be resolved by uninstalling "
"'!B!Python launcher!W!'.\n", wrap=True)
if cmd.confirm and not cmd.ask_ny("Open Installed apps now?"):
os.startfile("ms-settings:appsfeatures")
line_break()
shown_any = True
elif cmd.explicit:
if r == "skip":
LOGGER.info("Skipped check for legacy 'py' command")
else:
LOGGER.info("Checked PATH for legacy 'py' command")
line_break()

if cmd.check_global_dir:
r = check_global_dir(cmd)
if not r:
welcome()
line_break()
shown_any = True
LOGGER.print("!Y!The global shortcuts directory is not "
"configured.!W!", level=logging.WARN)
LOGGER.print("\nConfiguring this enables commands like "
Expand All@@ -423,18 +426,19 @@ def first_run(cmd):
not cmd.ask_ny("Add commands directory to your PATH now?")
):
do_global_dir_on_path(cmd)
line_break()
shown_any = True
elif cmd.explicit:
if r == "skip":
LOGGER.info("Skipped check for commands directory on PATH")
else:
LOGGER.info("Checked PATH for versioned commands directory")
line_break()

# This check must be last, because a failed install may exit the program.
if cmd.check_any_install:
if not check_any_install(cmd):
welcome()
line_break()
shown_any = True
LOGGER.print("!Y!You do not have any Python runtimes installed.!W!",
level=logging.WARN)
LOGGER.print("\nInstall the current latest version of CPython? If "
Expand All@@ -444,14 +448,15 @@ def first_run(cmd):
LOGGER.info("")
if not cmd.confirm or cmd.ask_yn("Install CPython now?"):
do_install(cmd)
line_break()
shown_any = True
elif cmd.explicit:
LOGGER.info("Checked for any Python installs")
line_break()

if cmd.check_latest_install:
if not check_latest_install(cmd):
welcome()
line_break()
shown_any = True
LOGGER.print("!Y!You do not have the latest Python runtime.!W!",
level=logging.WARN)
LOGGER.print("\nInstall the current latest version of CPython? If "
Expand All@@ -460,11 +465,13 @@ def first_run(cmd):
LOGGER.info("")
if not cmd.confirm or cmd.ask_yn("Install CPython now?"):
do_install(cmd)
line_break()
shown_any = True
elif cmd.explicit:
LOGGER.info("Checked for the latest available Python install")
line_break()

if shown_any or cmd.explicit:
line_break()
if shown_any:
LOGGER.print("!G!Configuration checks completed.!W!", level=logging.WARN)
LOGGER.print("\nTo run these checks again, launch !B!Python install "
"manager!W! from your Start menu, or !B!py install "
Expand Down
5 changes: 4 additions & 1 deletion src/manage/list_command.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -324,9 +324,12 @@ def execute(cmd):
cmd.fallback_source,
]:
if source:
downloader = IndexDownloader(source, Index)
if cmd.fallback_source_only:
downloader.quiet = True
try:
installs = _get_installs_from_index(
IndexDownloader(source, Index),
downloader,
tags,
)
break
Expand Down
15 changes: 11 additions & 4 deletions src/manage/urlutils.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -633,6 +633,7 @@ def __init__(self, source, index_cls, auth=None, cache=None):
self._auth = auth if auth is not None else {}
self._cache = cache if cache is not None else {}
self._urlopen = urlopen
self.quiet = False

def __iter__(self):
return self
Expand DownExpand Up@@ -667,17 +668,23 @@ def __next__(self):
on_auth_request=self.on_auth,
)
except FileNotFoundError: # includes 404
LOGGER.error("Unable to find runtimes index at %s", sanitise_url(url))
(LOGGER.verbose if self.quiet else LOGGER.error)(
"Unable to find runtimes index at %s",
sanitise_url(url),
)
raise
except OSError as ex:
LOGGER.error(
(LOGGER.verbose if self.quiet else LOGGER.error)(
"Unable to access runtimes index at %s: %s",
sanitise_url(url),
ex.args[1] if len(ex.args) >= 2 else ex
ex.args[1] if len(ex.args) >= 2 else ex,
)
raise
except RuntimeError as ex:
LOGGER.error("An unexpected error occurred while downloading the index: %s", ex)
(LOGGER.verbose if self.quiet else LOGGER.error)(
"An unexpected error occurred while downloading the index: %s",
ex,
)
raise

j = json.loads(data)
Expand Down
4 changes: 2 additions & 2 deletions tests/test_firstrun.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -124,9 +124,9 @@ def test_welcome(assert_log):
welcome = firstrun._Welcome()
assert_log(assert_log.end_of_log())
welcome()
assert_log(".*Welcome.*", assert_log.end_of_log())
assert_log(".*Welcome.*", "", r"!B!\*+!W!", "", assert_log.end_of_log())
welcome()
assert_log(".*Welcome.*", assert_log.end_of_log())
assert_log(".*Welcome.*", "", r"!B!\*+!W!", "", assert_log.end_of_log())



Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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
39 changes: 23 additions & 16 deletions src/manage/firstrun.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -317,6 +317,7 @@ def __call__(self):
self._shown = True
LOGGER.print("!G!Welcome to the Python installation manager "
"configuration helper.!W!")
line_break()


def line_break():
Expand All@@ -329,18 +330,17 @@ def first_run(cmd):
if not cmd.enabled:
return

shown_any = False

welcome = _Welcome()
if cmd.explicit:
welcome()

shown_any = False
shown_any = True

if cmd.check_app_alias:
r = check_app_alias(cmd)
if not r:
welcome()
line_break()
shown_any = True
LOGGER.print("!Y!Your app execution alias settings are configured to launch "
"other commands besides 'py' and 'python'.!W!",
level=logging.WARN)
Expand All@@ -358,17 +358,18 @@ def first_run(cmd):
"!B!App execution aliases!W! page and scroll to the "
"'!B!Python!W!' entries to enable the new commands.",
wrap=True)
line_break()
shown_any = True
elif cmd.explicit:
if r == "skip":
LOGGER.info("Skipped app execution aliases check")
else:
LOGGER.info("Checked app execution aliases")
line_break()

if cmd.check_long_paths:
if not check_long_paths(cmd):
welcome()
line_break()
shown_any = True
LOGGER.print("!Y!Windows is not configured to allow paths longer than "
"260 characters.!W!", level=logging.WARN)
LOGGER.print("\nPython and some other apps can exceed this limit, "
Expand All@@ -378,33 +379,35 @@ def first_run(cmd):
"path support enabled.\n", wrap=True)
if not cmd.confirm or not cmd.ask_ny("Update setting now?"):
do_configure_long_paths(cmd)
line_break()
shown_any = True
elif cmd.explicit:
LOGGER.info("Checked system long paths setting")
line_break()

if cmd.check_py_on_path:
r = check_py_on_path(cmd)
if not r:
welcome()
line_break()
shown_any = True
LOGGER.print("!Y!The legacy 'py' command is still installed.!W!", level=logging.WARN)
LOGGER.print("\nThis may interfere with launching the new 'py' "
"command, and may be resolved by uninstalling "
"'!B!Python launcher!W!'.\n", wrap=True)
if cmd.confirm and not cmd.ask_ny("Open Installed apps now?"):
os.startfile("ms-settings:appsfeatures")
line_break()
shown_any = True
elif cmd.explicit:
if r == "skip":
LOGGER.info("Skipped check for legacy 'py' command")
else:
LOGGER.info("Checked PATH for legacy 'py' command")
line_break()

if cmd.check_global_dir:
r = check_global_dir(cmd)
if not r:
welcome()
line_break()
shown_any = True
LOGGER.print("!Y!The global shortcuts directory is not "
"configured.!W!", level=logging.WARN)
LOGGER.print("\nConfiguring this enables commands like "
Expand All@@ -423,18 +426,19 @@ def first_run(cmd):
not cmd.ask_ny("Add commands directory to your PATH now?")
):
do_global_dir_on_path(cmd)
line_break()
shown_any = True
elif cmd.explicit:
if r == "skip":
LOGGER.info("Skipped check for commands directory on PATH")
else:
LOGGER.info("Checked PATH for versioned commands directory")
line_break()

# This check must be last, because a failed install may exit the program.
if cmd.check_any_install:
if not check_any_install(cmd):
welcome()
line_break()
shown_any = True
LOGGER.print("!Y!You do not have any Python runtimes installed.!W!",
level=logging.WARN)
LOGGER.print("\nInstall the current latest version of CPython? If "
Expand All@@ -444,14 +448,15 @@ def first_run(cmd):
LOGGER.info("")
if not cmd.confirm or cmd.ask_yn("Install CPython now?"):
do_install(cmd)
line_break()
shown_any = True
elif cmd.explicit:
LOGGER.info("Checked for any Python installs")
line_break()

if cmd.check_latest_install:
if not check_latest_install(cmd):
welcome()
line_break()
shown_any = True
LOGGER.print("!Y!You do not have the latest Python runtime.!W!",
level=logging.WARN)
LOGGER.print("\nInstall the current latest version of CPython? If "
Expand All@@ -460,11 +465,13 @@ def first_run(cmd):
LOGGER.info("")
if not cmd.confirm or cmd.ask_yn("Install CPython now?"):
do_install(cmd)
line_break()
shown_any = True
elif cmd.explicit:
LOGGER.info("Checked for the latest available Python install")
line_break()

if shown_any or cmd.explicit:
line_break()
if shown_any:
LOGGER.print("!G!Configuration checks completed.!W!", level=logging.WARN)
LOGGER.print("\nTo run these checks again, launch !B!Python install "
"manager!W! from your Start menu, or !B!py install "
Expand Down
5 changes: 4 additions & 1 deletion src/manage/list_command.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -324,9 +324,12 @@ def execute(cmd):
cmd.fallback_source,
]:
if source:
downloader = IndexDownloader(source, Index)
if cmd.fallback_source_only:
downloader.quiet = True
try:
installs = _get_installs_from_index(
IndexDownloader(source, Index),
downloader,
tags,
)
break
Expand Down
15 changes: 11 additions & 4 deletions src/manage/urlutils.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -633,6 +633,7 @@ def __init__(self, source, index_cls, auth=None, cache=None):
self._auth = auth if auth is not None else {}
self._cache = cache if cache is not None else {}
self._urlopen = urlopen
self.quiet = False

def __iter__(self):
return self
Expand DownExpand Up@@ -667,17 +668,23 @@ def __next__(self):
on_auth_request=self.on_auth,
)
except FileNotFoundError: # includes 404
LOGGER.error("Unable to find runtimes index at %s", sanitise_url(url))
(LOGGER.verbose if self.quiet else LOGGER.error)(
"Unable to find runtimes index at %s",
sanitise_url(url),
)
raise
except OSError as ex:
LOGGER.error(
(LOGGER.verbose if self.quiet else LOGGER.error)(
"Unable to access runtimes index at %s: %s",
sanitise_url(url),
ex.args[1] if len(ex.args) >= 2 else ex
ex.args[1] if len(ex.args) >= 2 else ex,
)
raise
except RuntimeError as ex:
LOGGER.error("An unexpected error occurred while downloading the index: %s", ex)
(LOGGER.verbose if self.quiet else LOGGER.error)(
"An unexpected error occurred while downloading the index: %s",
ex,
)
raise

j = json.loads(data)
Expand Down
4 changes: 2 additions & 2 deletions tests/test_firstrun.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -124,9 +124,9 @@ def test_welcome(assert_log):
welcome = firstrun._Welcome()
assert_log(assert_log.end_of_log())
welcome()
assert_log(".*Welcome.*", assert_log.end_of_log())
assert_log(".*Welcome.*", "", r"!B!\*+!W!", "", assert_log.end_of_log())
welcome()
assert_log(".*Welcome.*", assert_log.end_of_log())
assert_log(".*Welcome.*", "", r"!B!\*+!W!", "", assert_log.end_of_log())



Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
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
39 changes: 23 additions & 16 deletions src/manage/firstrun.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -317,6 +317,7 @@ def __call__(self):
self._shown = True
LOGGER.print("!G!Welcome to the Python installation manager "
"configuration helper.!W!")
line_break()


def line_break():
Expand All@@ -329,18 +330,17 @@ def first_run(cmd):
if not cmd.enabled:
return

shown_any = False

welcome = _Welcome()
if cmd.explicit:
welcome()

shown_any = False
shown_any = True

if cmd.check_app_alias:
r = check_app_alias(cmd)
if not r:
welcome()
line_break()
shown_any = True
LOGGER.print("!Y!Your app execution alias settings are configured to launch "
"other commands besides 'py' and 'python'.!W!",
level=logging.WARN)
Expand All@@ -358,17 +358,18 @@ def first_run(cmd):
"!B!App execution aliases!W! page and scroll to the "
"'!B!Python!W!' entries to enable the new commands.",
wrap=True)
line_break()
shown_any = True
elif cmd.explicit:
if r == "skip":
LOGGER.info("Skipped app execution aliases check")
else:
LOGGER.info("Checked app execution aliases")
line_break()

if cmd.check_long_paths:
if not check_long_paths(cmd):
welcome()
line_break()
shown_any = True
LOGGER.print("!Y!Windows is not configured to allow paths longer than "
"260 characters.!W!", level=logging.WARN)
LOGGER.print("\nPython and some other apps can exceed this limit, "
Expand All@@ -378,33 +379,35 @@ def first_run(cmd):
"path support enabled.\n", wrap=True)
if not cmd.confirm or not cmd.ask_ny("Update setting now?"):
do_configure_long_paths(cmd)
line_break()
shown_any = True
elif cmd.explicit:
LOGGER.info("Checked system long paths setting")
line_break()

if cmd.check_py_on_path:
r = check_py_on_path(cmd)
if not r:
welcome()
line_break()
shown_any = True
LOGGER.print("!Y!The legacy 'py' command is still installed.!W!", level=logging.WARN)
LOGGER.print("\nThis may interfere with launching the new 'py' "
"command, and may be resolved by uninstalling "
"'!B!Python launcher!W!'.\n", wrap=True)
if cmd.confirm and not cmd.ask_ny("Open Installed apps now?"):
os.startfile("ms-settings:appsfeatures")
line_break()
shown_any = True
elif cmd.explicit:
if r == "skip":
LOGGER.info("Skipped check for legacy 'py' command")
else:
LOGGER.info("Checked PATH for legacy 'py' command")
line_break()

if cmd.check_global_dir:
r = check_global_dir(cmd)
if not r:
welcome()
line_break()
shown_any = True
LOGGER.print("!Y!The global shortcuts directory is not "
"configured.!W!", level=logging.WARN)
LOGGER.print("\nConfiguring this enables commands like "
Expand All@@ -423,18 +426,19 @@ def first_run(cmd):
not cmd.ask_ny("Add commands directory to your PATH now?")
):
do_global_dir_on_path(cmd)
line_break()
shown_any = True
elif cmd.explicit:
if r == "skip":
LOGGER.info("Skipped check for commands directory on PATH")
else:
LOGGER.info("Checked PATH for versioned commands directory")
line_break()

# This check must be last, because a failed install may exit the program.
if cmd.check_any_install:
if not check_any_install(cmd):
welcome()
line_break()
shown_any = True
LOGGER.print("!Y!You do not have any Python runtimes installed.!W!",
level=logging.WARN)
LOGGER.print("\nInstall the current latest version of CPython? If "
Expand All@@ -444,14 +448,15 @@ def first_run(cmd):
LOGGER.info("")
if not cmd.confirm or cmd.ask_yn("Install CPython now?"):
do_install(cmd)
line_break()
shown_any = True
elif cmd.explicit:
LOGGER.info("Checked for any Python installs")
line_break()

if cmd.check_latest_install:
if not check_latest_install(cmd):
welcome()
line_break()
shown_any = True
LOGGER.print("!Y!You do not have the latest Python runtime.!W!",
level=logging.WARN)
LOGGER.print("\nInstall the current latest version of CPython? If "
Expand All@@ -460,11 +465,13 @@ def first_run(cmd):
LOGGER.info("")
if not cmd.confirm or cmd.ask_yn("Install CPython now?"):
do_install(cmd)
line_break()
shown_any = True
elif cmd.explicit:
LOGGER.info("Checked for the latest available Python install")
line_break()

if shown_any or cmd.explicit:
line_break()
if shown_any:
LOGGER.print("!G!Configuration checks completed.!W!", level=logging.WARN)
LOGGER.print("\nTo run these checks again, launch !B!Python install "
"manager!W! from your Start menu, or !B!py install "
Expand Down
5 changes: 4 additions & 1 deletion src/manage/list_command.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -324,9 +324,12 @@ def execute(cmd):
cmd.fallback_source,
]:
if source:
downloader = IndexDownloader(source, Index)
if cmd.fallback_source_only:
downloader.quiet = True
try:
installs = _get_installs_from_index(
IndexDownloader(source, Index),
downloader,
tags,
)
break
Expand Down
15 changes: 11 additions & 4 deletions src/manage/urlutils.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -633,6 +633,7 @@ def __init__(self, source, index_cls, auth=None, cache=None):
self._auth = auth if auth is not None else {}
self._cache = cache if cache is not None else {}
self._urlopen = urlopen
self.quiet = False

def __iter__(self):
return self
Expand DownExpand Up@@ -667,17 +668,23 @@ def __next__(self):
on_auth_request=self.on_auth,
)
except FileNotFoundError: # includes 404
LOGGER.error("Unable to find runtimes index at %s", sanitise_url(url))
(LOGGER.verbose if self.quiet else LOGGER.error)(
"Unable to find runtimes index at %s",
sanitise_url(url),
)
raise
except OSError as ex:
LOGGER.error(
(LOGGER.verbose if self.quiet else LOGGER.error)(
"Unable to access runtimes index at %s: %s",
sanitise_url(url),
ex.args[1] if len(ex.args) >= 2 else ex
ex.args[1] if len(ex.args) >= 2 else ex,
)
raise
except RuntimeError as ex:
LOGGER.error("An unexpected error occurred while downloading the index: %s", ex)
(LOGGER.verbose if self.quiet else LOGGER.error)(
"An unexpected error occurred while downloading the index: %s",
ex,
)
raise

j = json.loads(data)
Expand Down
4 changes: 2 additions & 2 deletions tests/test_firstrun.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -124,9 +124,9 @@ def test_welcome(assert_log):
welcome = firstrun._Welcome()
assert_log(assert_log.end_of_log())
welcome()
assert_log(".*Welcome.*", assert_log.end_of_log())
assert_log(".*Welcome.*", "", r"!B!\*+!W!", "", assert_log.end_of_log())
welcome()
assert_log(".*Welcome.*", assert_log.end_of_log())
assert_log(".*Welcome.*", "", r"!B!\*+!W!", "", assert_log.end_of_log())



Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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
39 changes: 23 additions & 16 deletions src/manage/firstrun.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -317,6 +317,7 @@ def __call__(self):
self._shown = True
LOGGER.print("!G!Welcome to the Python installation manager "
"configuration helper.!W!")
line_break()


def line_break():
Expand All@@ -329,18 +330,17 @@ def first_run(cmd):
if not cmd.enabled:
return

shown_any = False

welcome = _Welcome()
if cmd.explicit:
welcome()

shown_any = False
shown_any = True

if cmd.check_app_alias:
r = check_app_alias(cmd)
if not r:
welcome()
line_break()
shown_any = True
LOGGER.print("!Y!Your app execution alias settings are configured to launch "
"other commands besides 'py' and 'python'.!W!",
level=logging.WARN)
Expand All@@ -358,17 +358,18 @@ def first_run(cmd):
"!B!App execution aliases!W! page and scroll to the "
"'!B!Python!W!' entries to enable the new commands.",
wrap=True)
line_break()
shown_any = True
elif cmd.explicit:
if r == "skip":
LOGGER.info("Skipped app execution aliases check")
else:
LOGGER.info("Checked app execution aliases")
line_break()

if cmd.check_long_paths:
if not check_long_paths(cmd):
welcome()
line_break()
shown_any = True
LOGGER.print("!Y!Windows is not configured to allow paths longer than "
"260 characters.!W!", level=logging.WARN)
LOGGER.print("\nPython and some other apps can exceed this limit, "
Expand All@@ -378,33 +379,35 @@ def first_run(cmd):
"path support enabled.\n", wrap=True)
if not cmd.confirm or not cmd.ask_ny("Update setting now?"):
do_configure_long_paths(cmd)
line_break()
shown_any = True
elif cmd.explicit:
LOGGER.info("Checked system long paths setting")
line_break()

if cmd.check_py_on_path:
r = check_py_on_path(cmd)
if not r:
welcome()
line_break()
shown_any = True
LOGGER.print("!Y!The legacy 'py' command is still installed.!W!", level=logging.WARN)
LOGGER.print("\nThis may interfere with launching the new 'py' "
"command, and may be resolved by uninstalling "
"'!B!Python launcher!W!'.\n", wrap=True)
if cmd.confirm and not cmd.ask_ny("Open Installed apps now?"):
os.startfile("ms-settings:appsfeatures")
line_break()
shown_any = True
elif cmd.explicit:
if r == "skip":
LOGGER.info("Skipped check for legacy 'py' command")
else:
LOGGER.info("Checked PATH for legacy 'py' command")
line_break()

if cmd.check_global_dir:
r = check_global_dir(cmd)
if not r:
welcome()
line_break()
shown_any = True
LOGGER.print("!Y!The global shortcuts directory is not "
"configured.!W!", level=logging.WARN)
LOGGER.print("\nConfiguring this enables commands like "
Expand All@@ -423,18 +426,19 @@ def first_run(cmd):
not cmd.ask_ny("Add commands directory to your PATH now?")
):
do_global_dir_on_path(cmd)
line_break()
shown_any = True
elif cmd.explicit:
if r == "skip":
LOGGER.info("Skipped check for commands directory on PATH")
else:
LOGGER.info("Checked PATH for versioned commands directory")
line_break()

# This check must be last, because a failed install may exit the program.
if cmd.check_any_install:
if not check_any_install(cmd):
welcome()
line_break()
shown_any = True
LOGGER.print("!Y!You do not have any Python runtimes installed.!W!",
level=logging.WARN)
LOGGER.print("\nInstall the current latest version of CPython? If "
Expand All@@ -444,14 +448,15 @@ def first_run(cmd):
LOGGER.info("")
if not cmd.confirm or cmd.ask_yn("Install CPython now?"):
do_install(cmd)
line_break()
shown_any = True
elif cmd.explicit:
LOGGER.info("Checked for any Python installs")
line_break()

if cmd.check_latest_install:
if not check_latest_install(cmd):
welcome()
line_break()
shown_any = True
LOGGER.print("!Y!You do not have the latest Python runtime.!W!",
level=logging.WARN)
LOGGER.print("\nInstall the current latest version of CPython? If "
Expand All@@ -460,11 +465,13 @@ def first_run(cmd):
LOGGER.info("")
if not cmd.confirm or cmd.ask_yn("Install CPython now?"):
do_install(cmd)
line_break()
shown_any = True
elif cmd.explicit:
LOGGER.info("Checked for the latest available Python install")
line_break()

if shown_any or cmd.explicit:
line_break()
if shown_any:
LOGGER.print("!G!Configuration checks completed.!W!", level=logging.WARN)
LOGGER.print("\nTo run these checks again, launch !B!Python install "
"manager!W! from your Start menu, or !B!py install "
Expand Down
5 changes: 4 additions & 1 deletion src/manage/list_command.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -324,9 +324,12 @@ def execute(cmd):
cmd.fallback_source,
]:
if source:
downloader = IndexDownloader(source, Index)
if cmd.fallback_source_only:
downloader.quiet = True
try:
installs = _get_installs_from_index(
IndexDownloader(source, Index),
downloader,
tags,
)
break
Expand Down
15 changes: 11 additions & 4 deletions src/manage/urlutils.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -633,6 +633,7 @@ def __init__(self, source, index_cls, auth=None, cache=None):
self._auth = auth if auth is not None else {}
self._cache = cache if cache is not None else {}
self._urlopen = urlopen
self.quiet = False

def __iter__(self):
return self
Expand DownExpand Up@@ -667,17 +668,23 @@ def __next__(self):
on_auth_request=self.on_auth,
)
except FileNotFoundError: # includes 404
LOGGER.error("Unable to find runtimes index at %s", sanitise_url(url))
(LOGGER.verbose if self.quiet else LOGGER.error)(
"Unable to find runtimes index at %s",
sanitise_url(url),
)
raise
except OSError as ex:
LOGGER.error(
(LOGGER.verbose if self.quiet else LOGGER.error)(
"Unable to access runtimes index at %s: %s",
sanitise_url(url),
ex.args[1] if len(ex.args) >= 2 else ex
ex.args[1] if len(ex.args) >= 2 else ex,
)
raise
except RuntimeError as ex:
LOGGER.error("An unexpected error occurred while downloading the index: %s", ex)
(LOGGER.verbose if self.quiet else LOGGER.error)(
"An unexpected error occurred while downloading the index: %s",
ex,
)
raise

j = json.loads(data)
Expand Down
4 changes: 2 additions & 2 deletions tests/test_firstrun.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -124,9 +124,9 @@ def test_welcome(assert_log):
welcome = firstrun._Welcome()
assert_log(assert_log.end_of_log())
welcome()
assert_log(".*Welcome.*", assert_log.end_of_log())
assert_log(".*Welcome.*", "", r"!B!\*+!W!", "", assert_log.end_of_log())
welcome()
assert_log(".*Welcome.*", assert_log.end_of_log())
assert_log(".*Welcome.*", "", r"!B!\*+!W!", "", assert_log.end_of_log())



Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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
39 changes: 23 additions & 16 deletions src/manage/firstrun.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -317,6 +317,7 @@ def __call__(self):
self._shown = True
LOGGER.print("!G!Welcome to the Python installation manager "
"configuration helper.!W!")
line_break()


def line_break():
Expand All@@ -329,18 +330,17 @@ def first_run(cmd):
if not cmd.enabled:
return

shown_any = False

welcome = _Welcome()
if cmd.explicit:
welcome()

shown_any = False
shown_any = True

if cmd.check_app_alias:
r = check_app_alias(cmd)
if not r:
welcome()
line_break()
shown_any = True
LOGGER.print("!Y!Your app execution alias settings are configured to launch "
"other commands besides 'py' and 'python'.!W!",
level=logging.WARN)
Expand All@@ -358,17 +358,18 @@ def first_run(cmd):
"!B!App execution aliases!W! page and scroll to the "
"'!B!Python!W!' entries to enable the new commands.",
wrap=True)
line_break()
shown_any = True
elif cmd.explicit:
if r == "skip":
LOGGER.info("Skipped app execution aliases check")
else:
LOGGER.info("Checked app execution aliases")
line_break()

if cmd.check_long_paths:
if not check_long_paths(cmd):
welcome()
line_break()
shown_any = True
LOGGER.print("!Y!Windows is not configured to allow paths longer than "
"260 characters.!W!", level=logging.WARN)
LOGGER.print("\nPython and some other apps can exceed this limit, "
Expand All@@ -378,33 +379,35 @@ def first_run(cmd):
"path support enabled.\n", wrap=True)
if not cmd.confirm or not cmd.ask_ny("Update setting now?"):
do_configure_long_paths(cmd)
line_break()
shown_any = True
elif cmd.explicit:
LOGGER.info("Checked system long paths setting")
line_break()

if cmd.check_py_on_path:
r = check_py_on_path(cmd)
if not r:
welcome()
line_break()
shown_any = True
LOGGER.print("!Y!The legacy 'py' command is still installed.!W!", level=logging.WARN)
LOGGER.print("\nThis may interfere with launching the new 'py' "
"command, and may be resolved by uninstalling "
"'!B!Python launcher!W!'.\n", wrap=True)
if cmd.confirm and not cmd.ask_ny("Open Installed apps now?"):
os.startfile("ms-settings:appsfeatures")
line_break()
shown_any = True
elif cmd.explicit:
if r == "skip":
LOGGER.info("Skipped check for legacy 'py' command")
else:
LOGGER.info("Checked PATH for legacy 'py' command")
line_break()

if cmd.check_global_dir:
r = check_global_dir(cmd)
if not r:
welcome()
line_break()
shown_any = True
LOGGER.print("!Y!The global shortcuts directory is not "
"configured.!W!", level=logging.WARN)
LOGGER.print("\nConfiguring this enables commands like "
Expand All@@ -423,18 +426,19 @@ def first_run(cmd):
not cmd.ask_ny("Add commands directory to your PATH now?")
):
do_global_dir_on_path(cmd)
line_break()
shown_any = True
elif cmd.explicit:
if r == "skip":
LOGGER.info("Skipped check for commands directory on PATH")
else:
LOGGER.info("Checked PATH for versioned commands directory")
line_break()

# This check must be last, because a failed install may exit the program.
if cmd.check_any_install:
if not check_any_install(cmd):
welcome()
line_break()
shown_any = True
LOGGER.print("!Y!You do not have any Python runtimes installed.!W!",
level=logging.WARN)
LOGGER.print("\nInstall the current latest version of CPython? If "
Expand All@@ -444,14 +448,15 @@ def first_run(cmd):
LOGGER.info("")
if not cmd.confirm or cmd.ask_yn("Install CPython now?"):
do_install(cmd)
line_break()
shown_any = True
elif cmd.explicit:
LOGGER.info("Checked for any Python installs")
line_break()

if cmd.check_latest_install:
if not check_latest_install(cmd):
welcome()
line_break()
shown_any = True
LOGGER.print("!Y!You do not have the latest Python runtime.!W!",
level=logging.WARN)
LOGGER.print("\nInstall the current latest version of CPython? If "
Expand All@@ -460,11 +465,13 @@ def first_run(cmd):
LOGGER.info("")
if not cmd.confirm or cmd.ask_yn("Install CPython now?"):
do_install(cmd)
line_break()
shown_any = True
elif cmd.explicit:
LOGGER.info("Checked for the latest available Python install")
line_break()

if shown_any or cmd.explicit:
line_break()
if shown_any:
LOGGER.print("!G!Configuration checks completed.!W!", level=logging.WARN)
LOGGER.print("\nTo run these checks again, launch !B!Python install "
"manager!W! from your Start menu, or !B!py install "
Expand Down
5 changes: 4 additions & 1 deletion src/manage/list_command.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -324,9 +324,12 @@ def execute(cmd):
cmd.fallback_source,
]:
if source:
downloader = IndexDownloader(source, Index)
if cmd.fallback_source_only:
downloader.quiet = True
try:
installs = _get_installs_from_index(
IndexDownloader(source, Index),
downloader,
tags,
)
break
Expand Down
15 changes: 11 additions & 4 deletions src/manage/urlutils.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -633,6 +633,7 @@ def __init__(self, source, index_cls, auth=None, cache=None):
self._auth = auth if auth is not None else {}
self._cache = cache if cache is not None else {}
self._urlopen = urlopen
self.quiet = False

def __iter__(self):
return self
Expand DownExpand Up@@ -667,17 +668,23 @@ def __next__(self):
on_auth_request=self.on_auth,
)
except FileNotFoundError: # includes 404
LOGGER.error("Unable to find runtimes index at %s", sanitise_url(url))
(LOGGER.verbose if self.quiet else LOGGER.error)(
"Unable to find runtimes index at %s",
sanitise_url(url),
)
raise
except OSError as ex:
LOGGER.error(
(LOGGER.verbose if self.quiet else LOGGER.error)(
"Unable to access runtimes index at %s: %s",
sanitise_url(url),
ex.args[1] if len(ex.args) >= 2 else ex
ex.args[1] if len(ex.args) >= 2 else ex,
)
raise
except RuntimeError as ex:
LOGGER.error("An unexpected error occurred while downloading the index: %s", ex)
(LOGGER.verbose if self.quiet else LOGGER.error)(
"An unexpected error occurred while downloading the index: %s",
ex,
)
raise

j = json.loads(data)
Expand Down
4 changes: 2 additions & 2 deletions tests/test_firstrun.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -124,9 +124,9 @@ def test_welcome(assert_log):
welcome = firstrun._Welcome()
assert_log(assert_log.end_of_log())
welcome()
assert_log(".*Welcome.*", assert_log.end_of_log())
assert_log(".*Welcome.*", "", r"!B!\*+!W!", "", assert_log.end_of_log())
welcome()
assert_log(".*Welcome.*", assert_log.end_of_log())
assert_log(".*Welcome.*", "", r"!B!\*+!W!", "", assert_log.end_of_log())



Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
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
39 changes: 23 additions & 16 deletions src/manage/firstrun.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -317,6 +317,7 @@ def __call__(self):
self._shown = True
LOGGER.print("!G!Welcome to the Python installation manager "
"configuration helper.!W!")
line_break()


def line_break():
Expand All@@ -329,18 +330,17 @@ def first_run(cmd):
if not cmd.enabled:
return

shown_any = False

welcome = _Welcome()
if cmd.explicit:
welcome()

shown_any = False
shown_any = True

if cmd.check_app_alias:
r = check_app_alias(cmd)
if not r:
welcome()
line_break()
shown_any = True
LOGGER.print("!Y!Your app execution alias settings are configured to launch "
"other commands besides 'py' and 'python'.!W!",
level=logging.WARN)
Expand All@@ -358,17 +358,18 @@ def first_run(cmd):
"!B!App execution aliases!W! page and scroll to the "
"'!B!Python!W!' entries to enable the new commands.",
wrap=True)
line_break()
shown_any = True
elif cmd.explicit:
if r == "skip":
LOGGER.info("Skipped app execution aliases check")
else:
LOGGER.info("Checked app execution aliases")
line_break()

if cmd.check_long_paths:
if not check_long_paths(cmd):
welcome()
line_break()
shown_any = True
LOGGER.print("!Y!Windows is not configured to allow paths longer than "
"260 characters.!W!", level=logging.WARN)
LOGGER.print("\nPython and some other apps can exceed this limit, "
Expand All@@ -378,33 +379,35 @@ def first_run(cmd):
"path support enabled.\n", wrap=True)
if not cmd.confirm or not cmd.ask_ny("Update setting now?"):
do_configure_long_paths(cmd)
line_break()
shown_any = True
elif cmd.explicit:
LOGGER.info("Checked system long paths setting")
line_break()

if cmd.check_py_on_path:
r = check_py_on_path(cmd)
if not r:
welcome()
line_break()
shown_any = True
LOGGER.print("!Y!The legacy 'py' command is still installed.!W!", level=logging.WARN)
LOGGER.print("\nThis may interfere with launching the new 'py' "
"command, and may be resolved by uninstalling "
"'!B!Python launcher!W!'.\n", wrap=True)
if cmd.confirm and not cmd.ask_ny("Open Installed apps now?"):
os.startfile("ms-settings:appsfeatures")
line_break()
shown_any = True
elif cmd.explicit:
if r == "skip":
LOGGER.info("Skipped check for legacy 'py' command")
else:
LOGGER.info("Checked PATH for legacy 'py' command")
line_break()

if cmd.check_global_dir:
r = check_global_dir(cmd)
if not r:
welcome()
line_break()
shown_any = True
LOGGER.print("!Y!The global shortcuts directory is not "
"configured.!W!", level=logging.WARN)
LOGGER.print("\nConfiguring this enables commands like "
Expand All@@ -423,18 +426,19 @@ def first_run(cmd):
not cmd.ask_ny("Add commands directory to your PATH now?")
):
do_global_dir_on_path(cmd)
line_break()
shown_any = True
elif cmd.explicit:
if r == "skip":
LOGGER.info("Skipped check for commands directory on PATH")
else:
LOGGER.info("Checked PATH for versioned commands directory")
line_break()

# This check must be last, because a failed install may exit the program.
if cmd.check_any_install:
if not check_any_install(cmd):
welcome()
line_break()
shown_any = True
LOGGER.print("!Y!You do not have any Python runtimes installed.!W!",
level=logging.WARN)
LOGGER.print("\nInstall the current latest version of CPython? If "
Expand All@@ -444,14 +448,15 @@ def first_run(cmd):
LOGGER.info("")
if not cmd.confirm or cmd.ask_yn("Install CPython now?"):
do_install(cmd)
line_break()
shown_any = True
elif cmd.explicit:
LOGGER.info("Checked for any Python installs")
line_break()

if cmd.check_latest_install:
if not check_latest_install(cmd):
welcome()
line_break()
shown_any = True
LOGGER.print("!Y!You do not have the latest Python runtime.!W!",
level=logging.WARN)
LOGGER.print("\nInstall the current latest version of CPython? If "
Expand All@@ -460,11 +465,13 @@ def first_run(cmd):
LOGGER.info("")
if not cmd.confirm or cmd.ask_yn("Install CPython now?"):
do_install(cmd)
line_break()
shown_any = True
elif cmd.explicit:
LOGGER.info("Checked for the latest available Python install")
line_break()

if shown_any or cmd.explicit:
line_break()
if shown_any:
LOGGER.print("!G!Configuration checks completed.!W!", level=logging.WARN)
LOGGER.print("\nTo run these checks again, launch !B!Python install "
"manager!W! from your Start menu, or !B!py install "
Expand Down
5 changes: 4 additions & 1 deletion src/manage/list_command.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -324,9 +324,12 @@ def execute(cmd):
cmd.fallback_source,
]:
if source:
downloader = IndexDownloader(source, Index)
if cmd.fallback_source_only:
downloader.quiet = True
try:
installs = _get_installs_from_index(
IndexDownloader(source, Index),
downloader,
tags,
)
break
Expand Down
15 changes: 11 additions & 4 deletions src/manage/urlutils.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -633,6 +633,7 @@ def __init__(self, source, index_cls, auth=None, cache=None):
self._auth = auth if auth is not None else {}
self._cache = cache if cache is not None else {}
self._urlopen = urlopen
self.quiet = False

def __iter__(self):
return self
Expand DownExpand Up@@ -667,17 +668,23 @@ def __next__(self):
on_auth_request=self.on_auth,
)
except FileNotFoundError: # includes 404
LOGGER.error("Unable to find runtimes index at %s", sanitise_url(url))
(LOGGER.verbose if self.quiet else LOGGER.error)(
"Unable to find runtimes index at %s",
sanitise_url(url),
)
raise
except OSError as ex:
LOGGER.error(
(LOGGER.verbose if self.quiet else LOGGER.error)(
"Unable to access runtimes index at %s: %s",
sanitise_url(url),
ex.args[1] if len(ex.args) >= 2 else ex
ex.args[1] if len(ex.args) >= 2 else ex,
)
raise
except RuntimeError as ex:
LOGGER.error("An unexpected error occurred while downloading the index: %s", ex)
(LOGGER.verbose if self.quiet else LOGGER.error)(
"An unexpected error occurred while downloading the index: %s",
ex,
)
raise

j = json.loads(data)
Expand Down
4 changes: 2 additions & 2 deletions tests/test_firstrun.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -124,9 +124,9 @@ def test_welcome(assert_log):
welcome = firstrun._Welcome()
assert_log(assert_log.end_of_log())
welcome()
assert_log(".*Welcome.*", assert_log.end_of_log())
assert_log(".*Welcome.*", "", r"!B!\*+!W!", "", assert_log.end_of_log())
welcome()
assert_log(".*Welcome.*", assert_log.end_of_log())
assert_log(".*Welcome.*", "", r"!B!\*+!W!", "", assert_log.end_of_log())



Expand Down