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
22 changes: 18 additions & 4 deletions openkb/images.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -224,6 +224,13 @@ def copy_relative_images(markdown: str, source_dir: Path, doc_name: str, images_
- Missing source file: log a warning and leave the original text unchanged.
"""
result = markdown
# Track the destination chosen for each already-copied source so the same
# image referenced twice isn't duplicated, plus the set of taken names so
# two *different* sources that share a basename (e.g. ``a/logo.png`` and
# ``b/logo.png``) don't overwrite each other and collapse both links onto a
# single image.
assigned: dict[Path, str] = {}
taken: set[str] = set()

for match in _RELATIVE_RE.finditer(markdown):
alt, rel_path = match.group(1), match.group(2)
Expand All@@ -235,10 +242,17 @@ def copy_relative_images(markdown: str, source_dir: Path, doc_name: str, images_
logger.warning("Relative image not found: %s; leaving original link.", src)
continue

filename = src.name
dest = images_dir / filename
images_dir.mkdir(parents=True, exist_ok=True)
shutil.copy2(src, dest)
filename = assigned.get(src)
if filename is None:
filename = src.name
n = 1
while filename in taken:
filename = f"{src.stem}_{n}{src.suffix}"
n += 1
assigned[src] = filename
taken.add(filename)
images_dir.mkdir(parents=True, exist_ok=True)
shutil.copy2(src, images_dir / filename)

new_ref = f"![{alt}](sources/images/{doc_name}/{filename})"
result = result.replace(match.group(0), new_ref, 1)
Expand Down
35 changes: 35 additions & 0 deletions tests/test_images.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -161,3 +161,38 @@ def test_multiple_relative_images_all_copied(self, tmp_path):
assert "![b](sources/images/doc/b.jpg)" in result
assert (images_dir / "a.png").exists()
assert (images_dir / "b.jpg").exists()

def test_same_basename_different_dirs_no_overwrite(self, tmp_path):
# Two distinct images sharing a basename must not overwrite each other
# (which would lose one image and point both links at the survivor).
source_dir = tmp_path / "source"
(source_dir / "a").mkdir(parents=True)
(source_dir / "b").mkdir(parents=True)
(source_dir / "a" / "logo.png").write_bytes(FAKE_PNG)
(source_dir / "b" / "logo.png").write_bytes(FAKE_JPG)

images_dir = tmp_path / "images" / "doc"
images_dir.mkdir(parents=True)

md = "![a](a/logo.png)\n![b](b/logo.png)"
result = copy_relative_images(md, source_dir, "doc", images_dir)

saved = sorted(p.name for p in images_dir.iterdir())
assert len(saved) == 2 # both copied, neither overwritten
assert {(images_dir / n).read_bytes() for n in saved} == {FAKE_PNG, FAKE_JPG}
links = sorted(line.split("](")[1].rstrip(")") for line in result.strip().splitlines())
assert links[0] != links[1] # links point at different files

def test_same_image_referenced_twice_is_copied_once(self, tmp_path):
# Identical source referenced twice: copy once, both links agree.
source_dir = tmp_path / "source"
source_dir.mkdir()
(source_dir / "logo.png").write_bytes(FAKE_PNG)
images_dir = tmp_path / "images" / "doc"
images_dir.mkdir(parents=True)

md = "![x](logo.png)\n![y](logo.png)"
result = copy_relative_images(md, source_dir, "doc", images_dir)

assert [p.name for p in images_dir.iterdir()] == ["logo.png"]
assert result.count("sources/images/doc/logo.png") == 2
Loading
, '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" + '
fix(images): disambiguate relative images that share a basename by KylinMountain · Pull Request #160 · VectifyAI/OpenKB · 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
22 changes: 18 additions & 4 deletions openkb/images.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -224,6 +224,13 @@ def copy_relative_images(markdown: str, source_dir: Path, doc_name: str, images_
- Missing source file: log a warning and leave the original text unchanged.
"""
result = markdown
# Track the destination chosen for each already-copied source so the same
# image referenced twice isn't duplicated, plus the set of taken names so
# two *different* sources that share a basename (e.g. ``a/logo.png`` and
# ``b/logo.png``) don't overwrite each other and collapse both links onto a
# single image.
assigned: dict[Path, str] = {}
taken: set[str] = set()

for match in _RELATIVE_RE.finditer(markdown):
alt, rel_path = match.group(1), match.group(2)
Expand All@@ -235,10 +242,17 @@ def copy_relative_images(markdown: str, source_dir: Path, doc_name: str, images_
logger.warning("Relative image not found: %s; leaving original link.", src)
continue

filename = src.name
dest = images_dir / filename
images_dir.mkdir(parents=True, exist_ok=True)
shutil.copy2(src, dest)
filename = assigned.get(src)
if filename is None:
filename = src.name
n = 1
while filename in taken:
filename = f"{src.stem}_{n}{src.suffix}"
n += 1
assigned[src] = filename
taken.add(filename)
images_dir.mkdir(parents=True, exist_ok=True)
shutil.copy2(src, images_dir / filename)

new_ref = f"![{alt}](sources/images/{doc_name}/{filename})"
result = result.replace(match.group(0), new_ref, 1)
Expand Down
35 changes: 35 additions & 0 deletions tests/test_images.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -161,3 +161,38 @@ def test_multiple_relative_images_all_copied(self, tmp_path):
assert "![b](sources/images/doc/b.jpg)" in result
assert (images_dir / "a.png").exists()
assert (images_dir / "b.jpg").exists()

def test_same_basename_different_dirs_no_overwrite(self, tmp_path):
# Two distinct images sharing a basename must not overwrite each other
# (which would lose one image and point both links at the survivor).
source_dir = tmp_path / "source"
(source_dir / "a").mkdir(parents=True)
(source_dir / "b").mkdir(parents=True)
(source_dir / "a" / "logo.png").write_bytes(FAKE_PNG)
(source_dir / "b" / "logo.png").write_bytes(FAKE_JPG)

images_dir = tmp_path / "images" / "doc"
images_dir.mkdir(parents=True)

md = "![a](a/logo.png)\n![b](b/logo.png)"
result = copy_relative_images(md, source_dir, "doc", images_dir)

saved = sorted(p.name for p in images_dir.iterdir())
assert len(saved) == 2 # both copied, neither overwritten
assert {(images_dir / n).read_bytes() for n in saved} == {FAKE_PNG, FAKE_JPG}
links = sorted(line.split("](")[1].rstrip(")") for line in result.strip().splitlines())
assert links[0] != links[1] # links point at different files

def test_same_image_referenced_twice_is_copied_once(self, tmp_path):
# Identical source referenced twice: copy once, both links agree.
source_dir = tmp_path / "source"
source_dir.mkdir()
(source_dir / "logo.png").write_bytes(FAKE_PNG)
images_dir = tmp_path / "images" / "doc"
images_dir.mkdir(parents=True)

md = "![x](logo.png)\n![y](logo.png)"
result = copy_relative_images(md, source_dir, "doc", images_dir)

assert [p.name for p in images_dir.iterdir()] == ["logo.png"]
assert result.count("sources/images/doc/logo.png") == 2
Loading
, '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('^' + ".*" + ' fix(images): disambiguate relative images that share a basename by KylinMountain · Pull Request #160 · VectifyAI/OpenKB · 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
22 changes: 18 additions & 4 deletions openkb/images.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -224,6 +224,13 @@ def copy_relative_images(markdown: str, source_dir: Path, doc_name: str, images_
- Missing source file: log a warning and leave the original text unchanged.
"""
result = markdown
# Track the destination chosen for each already-copied source so the same
# image referenced twice isn't duplicated, plus the set of taken names so
# two *different* sources that share a basename (e.g. ``a/logo.png`` and
# ``b/logo.png``) don't overwrite each other and collapse both links onto a
# single image.
assigned: dict[Path, str] = {}
taken: set[str] = set()

for match in _RELATIVE_RE.finditer(markdown):
alt, rel_path = match.group(1), match.group(2)
Expand All@@ -235,10 +242,17 @@ def copy_relative_images(markdown: str, source_dir: Path, doc_name: str, images_
logger.warning("Relative image not found: %s; leaving original link.", src)
continue

filename = src.name
dest = images_dir / filename
images_dir.mkdir(parents=True, exist_ok=True)
shutil.copy2(src, dest)
filename = assigned.get(src)
if filename is None:
filename = src.name
n = 1
while filename in taken:
filename = f"{src.stem}_{n}{src.suffix}"
n += 1
assigned[src] = filename
taken.add(filename)
images_dir.mkdir(parents=True, exist_ok=True)
shutil.copy2(src, images_dir / filename)

new_ref = f"![{alt}](sources/images/{doc_name}/{filename})"
result = result.replace(match.group(0), new_ref, 1)
Expand Down
35 changes: 35 additions & 0 deletions tests/test_images.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -161,3 +161,38 @@ def test_multiple_relative_images_all_copied(self, tmp_path):
assert "![b](sources/images/doc/b.jpg)" in result
assert (images_dir / "a.png").exists()
assert (images_dir / "b.jpg").exists()

def test_same_basename_different_dirs_no_overwrite(self, tmp_path):
# Two distinct images sharing a basename must not overwrite each other
# (which would lose one image and point both links at the survivor).
source_dir = tmp_path / "source"
(source_dir / "a").mkdir(parents=True)
(source_dir / "b").mkdir(parents=True)
(source_dir / "a" / "logo.png").write_bytes(FAKE_PNG)
(source_dir / "b" / "logo.png").write_bytes(FAKE_JPG)

images_dir = tmp_path / "images" / "doc"
images_dir.mkdir(parents=True)

md = "![a](a/logo.png)\n![b](b/logo.png)"
result = copy_relative_images(md, source_dir, "doc", images_dir)

saved = sorted(p.name for p in images_dir.iterdir())
assert len(saved) == 2 # both copied, neither overwritten
assert {(images_dir / n).read_bytes() for n in saved} == {FAKE_PNG, FAKE_JPG}
links = sorted(line.split("](")[1].rstrip(")") for line in result.strip().splitlines())
assert links[0] != links[1] # links point at different files

def test_same_image_referenced_twice_is_copied_once(self, tmp_path):
# Identical source referenced twice: copy once, both links agree.
source_dir = tmp_path / "source"
source_dir.mkdir()
(source_dir / "logo.png").write_bytes(FAKE_PNG)
images_dir = tmp_path / "images" / "doc"
images_dir.mkdir(parents=True)

md = "![x](logo.png)\n![y](logo.png)"
result = copy_relative_images(md, source_dir, "doc", images_dir)

assert [p.name for p in images_dir.iterdir()] == ["logo.png"]
assert result.count("sources/images/doc/logo.png") == 2
Loading
, '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('^' + ".*" + ' fix(images): disambiguate relative images that share a basename by KylinMountain · Pull Request #160 · VectifyAI/OpenKB · 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
22 changes: 18 additions & 4 deletions openkb/images.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -224,6 +224,13 @@ def copy_relative_images(markdown: str, source_dir: Path, doc_name: str, images_
- Missing source file: log a warning and leave the original text unchanged.
"""
result = markdown
# Track the destination chosen for each already-copied source so the same
# image referenced twice isn't duplicated, plus the set of taken names so
# two *different* sources that share a basename (e.g. ``a/logo.png`` and
# ``b/logo.png``) don't overwrite each other and collapse both links onto a
# single image.
assigned: dict[Path, str] = {}
taken: set[str] = set()

for match in _RELATIVE_RE.finditer(markdown):
alt, rel_path = match.group(1), match.group(2)
Expand All@@ -235,10 +242,17 @@ def copy_relative_images(markdown: str, source_dir: Path, doc_name: str, images_
logger.warning("Relative image not found: %s; leaving original link.", src)
continue

filename = src.name
dest = images_dir / filename
images_dir.mkdir(parents=True, exist_ok=True)
shutil.copy2(src, dest)
filename = assigned.get(src)
if filename is None:
filename = src.name
n = 1
while filename in taken:
filename = f"{src.stem}_{n}{src.suffix}"
n += 1
assigned[src] = filename
taken.add(filename)
images_dir.mkdir(parents=True, exist_ok=True)
shutil.copy2(src, images_dir / filename)

new_ref = f"![{alt}](sources/images/{doc_name}/{filename})"
result = result.replace(match.group(0), new_ref, 1)
Expand Down
35 changes: 35 additions & 0 deletions tests/test_images.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -161,3 +161,38 @@ def test_multiple_relative_images_all_copied(self, tmp_path):
assert "![b](sources/images/doc/b.jpg)" in result
assert (images_dir / "a.png").exists()
assert (images_dir / "b.jpg").exists()

def test_same_basename_different_dirs_no_overwrite(self, tmp_path):
# Two distinct images sharing a basename must not overwrite each other
# (which would lose one image and point both links at the survivor).
source_dir = tmp_path / "source"
(source_dir / "a").mkdir(parents=True)
(source_dir / "b").mkdir(parents=True)
(source_dir / "a" / "logo.png").write_bytes(FAKE_PNG)
(source_dir / "b" / "logo.png").write_bytes(FAKE_JPG)

images_dir = tmp_path / "images" / "doc"
images_dir.mkdir(parents=True)

md = "![a](a/logo.png)\n![b](b/logo.png)"
result = copy_relative_images(md, source_dir, "doc", images_dir)

saved = sorted(p.name for p in images_dir.iterdir())
assert len(saved) == 2 # both copied, neither overwritten
assert {(images_dir / n).read_bytes() for n in saved} == {FAKE_PNG, FAKE_JPG}
links = sorted(line.split("](")[1].rstrip(")") for line in result.strip().splitlines())
assert links[0] != links[1] # links point at different files

def test_same_image_referenced_twice_is_copied_once(self, tmp_path):
# Identical source referenced twice: copy once, both links agree.
source_dir = tmp_path / "source"
source_dir.mkdir()
(source_dir / "logo.png").write_bytes(FAKE_PNG)
images_dir = tmp_path / "images" / "doc"
images_dir.mkdir(parents=True)

md = "![x](logo.png)\n![y](logo.png)"
result = copy_relative_images(md, source_dir, "doc", images_dir)

assert [p.name for p in images_dir.iterdir()] == ["logo.png"]
assert result.count("sources/images/doc/logo.png") == 2
Loading
, '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" + ' fix(images): disambiguate relative images that share a basename by KylinMountain · Pull Request #160 · VectifyAI/OpenKB · 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
22 changes: 18 additions & 4 deletions openkb/images.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -224,6 +224,13 @@ def copy_relative_images(markdown: str, source_dir: Path, doc_name: str, images_
- Missing source file: log a warning and leave the original text unchanged.
"""
result = markdown
# Track the destination chosen for each already-copied source so the same
# image referenced twice isn't duplicated, plus the set of taken names so
# two *different* sources that share a basename (e.g. ``a/logo.png`` and
# ``b/logo.png``) don't overwrite each other and collapse both links onto a
# single image.
assigned: dict[Path, str] = {}
taken: set[str] = set()

for match in _RELATIVE_RE.finditer(markdown):
alt, rel_path = match.group(1), match.group(2)
Expand All@@ -235,10 +242,17 @@ def copy_relative_images(markdown: str, source_dir: Path, doc_name: str, images_
logger.warning("Relative image not found: %s; leaving original link.", src)
continue

filename = src.name
dest = images_dir / filename
images_dir.mkdir(parents=True, exist_ok=True)
shutil.copy2(src, dest)
filename = assigned.get(src)
if filename is None:
filename = src.name
n = 1
while filename in taken:
filename = f"{src.stem}_{n}{src.suffix}"
n += 1
assigned[src] = filename
taken.add(filename)
images_dir.mkdir(parents=True, exist_ok=True)
shutil.copy2(src, images_dir / filename)

new_ref = f"![{alt}](sources/images/{doc_name}/{filename})"
result = result.replace(match.group(0), new_ref, 1)
Expand Down
35 changes: 35 additions & 0 deletions tests/test_images.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -161,3 +161,38 @@ def test_multiple_relative_images_all_copied(self, tmp_path):
assert "![b](sources/images/doc/b.jpg)" in result
assert (images_dir / "a.png").exists()
assert (images_dir / "b.jpg").exists()

def test_same_basename_different_dirs_no_overwrite(self, tmp_path):
# Two distinct images sharing a basename must not overwrite each other
# (which would lose one image and point both links at the survivor).
source_dir = tmp_path / "source"
(source_dir / "a").mkdir(parents=True)
(source_dir / "b").mkdir(parents=True)
(source_dir / "a" / "logo.png").write_bytes(FAKE_PNG)
(source_dir / "b" / "logo.png").write_bytes(FAKE_JPG)

images_dir = tmp_path / "images" / "doc"
images_dir.mkdir(parents=True)

md = "![a](a/logo.png)\n![b](b/logo.png)"
result = copy_relative_images(md, source_dir, "doc", images_dir)

saved = sorted(p.name for p in images_dir.iterdir())
assert len(saved) == 2 # both copied, neither overwritten
assert {(images_dir / n).read_bytes() for n in saved} == {FAKE_PNG, FAKE_JPG}
links = sorted(line.split("](")[1].rstrip(")") for line in result.strip().splitlines())
assert links[0] != links[1] # links point at different files

def test_same_image_referenced_twice_is_copied_once(self, tmp_path):
# Identical source referenced twice: copy once, both links agree.
source_dir = tmp_path / "source"
source_dir.mkdir()
(source_dir / "logo.png").write_bytes(FAKE_PNG)
images_dir = tmp_path / "images" / "doc"
images_dir.mkdir(parents=True)

md = "![x](logo.png)\n![y](logo.png)"
result = copy_relative_images(md, source_dir, "doc", images_dir)

assert [p.name for p in images_dir.iterdir()] == ["logo.png"]
assert result.count("sources/images/doc/logo.png") == 2
Loading
, '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('^' + ".*" + ' fix(images): disambiguate relative images that share a basename by KylinMountain · Pull Request #160 · VectifyAI/OpenKB · 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
22 changes: 18 additions & 4 deletions openkb/images.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -224,6 +224,13 @@ def copy_relative_images(markdown: str, source_dir: Path, doc_name: str, images_
- Missing source file: log a warning and leave the original text unchanged.
"""
result = markdown
# Track the destination chosen for each already-copied source so the same
# image referenced twice isn't duplicated, plus the set of taken names so
# two *different* sources that share a basename (e.g. ``a/logo.png`` and
# ``b/logo.png``) don't overwrite each other and collapse both links onto a
# single image.
assigned: dict[Path, str] = {}
taken: set[str] = set()

for match in _RELATIVE_RE.finditer(markdown):
alt, rel_path = match.group(1), match.group(2)
Expand All@@ -235,10 +242,17 @@ def copy_relative_images(markdown: str, source_dir: Path, doc_name: str, images_
logger.warning("Relative image not found: %s; leaving original link.", src)
continue

filename = src.name
dest = images_dir / filename
images_dir.mkdir(parents=True, exist_ok=True)
shutil.copy2(src, dest)
filename = assigned.get(src)
if filename is None:
filename = src.name
n = 1
while filename in taken:
filename = f"{src.stem}_{n}{src.suffix}"
n += 1
assigned[src] = filename
taken.add(filename)
images_dir.mkdir(parents=True, exist_ok=True)
shutil.copy2(src, images_dir / filename)

new_ref = f"![{alt}](sources/images/{doc_name}/{filename})"
result = result.replace(match.group(0), new_ref, 1)
Expand Down
35 changes: 35 additions & 0 deletions tests/test_images.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -161,3 +161,38 @@ def test_multiple_relative_images_all_copied(self, tmp_path):
assert "![b](sources/images/doc/b.jpg)" in result
assert (images_dir / "a.png").exists()
assert (images_dir / "b.jpg").exists()

def test_same_basename_different_dirs_no_overwrite(self, tmp_path):
# Two distinct images sharing a basename must not overwrite each other
# (which would lose one image and point both links at the survivor).
source_dir = tmp_path / "source"
(source_dir / "a").mkdir(parents=True)
(source_dir / "b").mkdir(parents=True)
(source_dir / "a" / "logo.png").write_bytes(FAKE_PNG)
(source_dir / "b" / "logo.png").write_bytes(FAKE_JPG)

images_dir = tmp_path / "images" / "doc"
images_dir.mkdir(parents=True)

md = "![a](a/logo.png)\n![b](b/logo.png)"
result = copy_relative_images(md, source_dir, "doc", images_dir)

saved = sorted(p.name for p in images_dir.iterdir())
assert len(saved) == 2 # both copied, neither overwritten
assert {(images_dir / n).read_bytes() for n in saved} == {FAKE_PNG, FAKE_JPG}
links = sorted(line.split("](")[1].rstrip(")") for line in result.strip().splitlines())
assert links[0] != links[1] # links point at different files

def test_same_image_referenced_twice_is_copied_once(self, tmp_path):
# Identical source referenced twice: copy once, both links agree.
source_dir = tmp_path / "source"
source_dir.mkdir()
(source_dir / "logo.png").write_bytes(FAKE_PNG)
images_dir = tmp_path / "images" / "doc"
images_dir.mkdir(parents=True)

md = "![x](logo.png)\n![y](logo.png)"
result = copy_relative_images(md, source_dir, "doc", images_dir)

assert [p.name for p in images_dir.iterdir()] == ["logo.png"]
assert result.count("sources/images/doc/logo.png") == 2
Loading
, '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('^' + ".*" + ' fix(images): disambiguate relative images that share a basename by KylinMountain · Pull Request #160 · VectifyAI/OpenKB · 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
22 changes: 18 additions & 4 deletions openkb/images.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -224,6 +224,13 @@ def copy_relative_images(markdown: str, source_dir: Path, doc_name: str, images_
- Missing source file: log a warning and leave the original text unchanged.
"""
result = markdown
# Track the destination chosen for each already-copied source so the same
# image referenced twice isn't duplicated, plus the set of taken names so
# two *different* sources that share a basename (e.g. ``a/logo.png`` and
# ``b/logo.png``) don't overwrite each other and collapse both links onto a
# single image.
assigned: dict[Path, str] = {}
taken: set[str] = set()

for match in _RELATIVE_RE.finditer(markdown):
alt, rel_path = match.group(1), match.group(2)
Expand All@@ -235,10 +242,17 @@ def copy_relative_images(markdown: str, source_dir: Path, doc_name: str, images_
logger.warning("Relative image not found: %s; leaving original link.", src)
continue

filename = src.name
dest = images_dir / filename
images_dir.mkdir(parents=True, exist_ok=True)
shutil.copy2(src, dest)
filename = assigned.get(src)
if filename is None:
filename = src.name
n = 1
while filename in taken:
filename = f"{src.stem}_{n}{src.suffix}"
n += 1
assigned[src] = filename
taken.add(filename)
images_dir.mkdir(parents=True, exist_ok=True)
shutil.copy2(src, images_dir / filename)

new_ref = f"![{alt}](sources/images/{doc_name}/{filename})"
result = result.replace(match.group(0), new_ref, 1)
Expand Down
35 changes: 35 additions & 0 deletions tests/test_images.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -161,3 +161,38 @@ def test_multiple_relative_images_all_copied(self, tmp_path):
assert "![b](sources/images/doc/b.jpg)" in result
assert (images_dir / "a.png").exists()
assert (images_dir / "b.jpg").exists()

def test_same_basename_different_dirs_no_overwrite(self, tmp_path):
# Two distinct images sharing a basename must not overwrite each other
# (which would lose one image and point both links at the survivor).
source_dir = tmp_path / "source"
(source_dir / "a").mkdir(parents=True)
(source_dir / "b").mkdir(parents=True)
(source_dir / "a" / "logo.png").write_bytes(FAKE_PNG)
(source_dir / "b" / "logo.png").write_bytes(FAKE_JPG)

images_dir = tmp_path / "images" / "doc"
images_dir.mkdir(parents=True)

md = "![a](a/logo.png)\n![b](b/logo.png)"
result = copy_relative_images(md, source_dir, "doc", images_dir)

saved = sorted(p.name for p in images_dir.iterdir())
assert len(saved) == 2 # both copied, neither overwritten
assert {(images_dir / n).read_bytes() for n in saved} == {FAKE_PNG, FAKE_JPG}
links = sorted(line.split("](")[1].rstrip(")") for line in result.strip().splitlines())
assert links[0] != links[1] # links point at different files

def test_same_image_referenced_twice_is_copied_once(self, tmp_path):
# Identical source referenced twice: copy once, both links agree.
source_dir = tmp_path / "source"
source_dir.mkdir()
(source_dir / "logo.png").write_bytes(FAKE_PNG)
images_dir = tmp_path / "images" / "doc"
images_dir.mkdir(parents=True)

md = "![x](logo.png)\n![y](logo.png)"
result = copy_relative_images(md, source_dir, "doc", images_dir)

assert [p.name for p in images_dir.iterdir()] == ["logo.png"]
assert result.count("sources/images/doc/logo.png") == 2
Loading
, '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); } })(); })(); fix(images): disambiguate relative images that share a basename by KylinMountain · Pull Request #160 · VectifyAI/OpenKB · 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
22 changes: 18 additions & 4 deletions openkb/images.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -224,6 +224,13 @@ def copy_relative_images(markdown: str, source_dir: Path, doc_name: str, images_
- Missing source file: log a warning and leave the original text unchanged.
"""
result = markdown
# Track the destination chosen for each already-copied source so the same
# image referenced twice isn't duplicated, plus the set of taken names so
# two *different* sources that share a basename (e.g. ``a/logo.png`` and
# ``b/logo.png``) don't overwrite each other and collapse both links onto a
# single image.
assigned: dict[Path, str] = {}
taken: set[str] = set()

for match in _RELATIVE_RE.finditer(markdown):
alt, rel_path = match.group(1), match.group(2)
Expand All@@ -235,10 +242,17 @@ def copy_relative_images(markdown: str, source_dir: Path, doc_name: str, images_
logger.warning("Relative image not found: %s; leaving original link.", src)
continue

filename = src.name
dest = images_dir / filename
images_dir.mkdir(parents=True, exist_ok=True)
shutil.copy2(src, dest)
filename = assigned.get(src)
if filename is None:
filename = src.name
n = 1
while filename in taken:
filename = f"{src.stem}_{n}{src.suffix}"
n += 1
assigned[src] = filename
taken.add(filename)
images_dir.mkdir(parents=True, exist_ok=True)
shutil.copy2(src, images_dir / filename)

new_ref = f"![{alt}](sources/images/{doc_name}/{filename})"
result = result.replace(match.group(0), new_ref, 1)
Expand Down
35 changes: 35 additions & 0 deletions tests/test_images.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -161,3 +161,38 @@ def test_multiple_relative_images_all_copied(self, tmp_path):
assert "![b](sources/images/doc/b.jpg)" in result
assert (images_dir / "a.png").exists()
assert (images_dir / "b.jpg").exists()

def test_same_basename_different_dirs_no_overwrite(self, tmp_path):
# Two distinct images sharing a basename must not overwrite each other
# (which would lose one image and point both links at the survivor).
source_dir = tmp_path / "source"
(source_dir / "a").mkdir(parents=True)
(source_dir / "b").mkdir(parents=True)
(source_dir / "a" / "logo.png").write_bytes(FAKE_PNG)
(source_dir / "b" / "logo.png").write_bytes(FAKE_JPG)

images_dir = tmp_path / "images" / "doc"
images_dir.mkdir(parents=True)

md = "![a](a/logo.png)\n![b](b/logo.png)"
result = copy_relative_images(md, source_dir, "doc", images_dir)

saved = sorted(p.name for p in images_dir.iterdir())
assert len(saved) == 2 # both copied, neither overwritten
assert {(images_dir / n).read_bytes() for n in saved} == {FAKE_PNG, FAKE_JPG}
links = sorted(line.split("](")[1].rstrip(")") for line in result.strip().splitlines())
assert links[0] != links[1] # links point at different files

def test_same_image_referenced_twice_is_copied_once(self, tmp_path):
# Identical source referenced twice: copy once, both links agree.
source_dir = tmp_path / "source"
source_dir.mkdir()
(source_dir / "logo.png").write_bytes(FAKE_PNG)
images_dir = tmp_path / "images" / "doc"
images_dir.mkdir(parents=True)

md = "![x](logo.png)\n![y](logo.png)"
result = copy_relative_images(md, source_dir, "doc", images_dir)

assert [p.name for p in images_dir.iterdir()] == ["logo.png"]
assert result.count("sources/images/doc/logo.png") == 2
Loading