_stream: use full element name in artifact log/list-contents#2174

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
c1assik wants to merge 1 commit into
base:master
Choose a base branch
from
+82 −5
Open

_stream: use full element name in artifact log/list-contents#2174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 10 additions & 0 deletions src/buildstream/_artifactelement.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -120,6 +120,16 @@ def _load_artifact(self, *, pull, strict=None): # pylint: disable=useless-super
# Always operate in strict mode as artifact key has been specified explicitly.
return super()._load_artifact(pull=pull, strict=True)

# An ArtifactElement is identified by its artifact name (which includes
# its cache key) rather than by its element name, since it may not even
# belong to a loaded project. Cache key is not yet known
# when this is first called from Plugin.__init__(), before our own
# __init__() has had a chance to set it via artifact_key.
def _get_full_name(self):
if self._get_cache_key() is None:
return super()._get_full_name()
return self.get_artifact_name()

# Once we've finished loading an artifact, we assume the
# state of the loaded artifact. This is also used if the
# artifact is loaded after pulling.
Expand Down
7 changes: 2 additions & 5 deletions src/buildstream/_stream.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -844,7 +844,7 @@ def artifact_log(self, targets):
self._context.messenger.warn("{} is cached without log files".format(ref))
continue

artifact_logs[obj.name] = obj._get_logs()
artifact_logs[obj._get_full_name()] = obj._get_logs()

return artifact_logs

Expand All@@ -869,15 +869,12 @@ def artifact_list_contents(self, targets):
ref = obj.get_artifact_name()
if not obj._cached():
self._context.messenger.warn("{} is not cached".format(ref))
obj.name = {ref: "No artifact cached"}
continue
if isinstance(obj, ArtifactElement):
obj.name = ref

# Just hand over a Directory here
artifact = obj._get_artifact()
files = artifact.get_files()
elements_to_files[obj.name] = files
elements_to_files[obj._get_full_name()] = files

return elements_to_files

Expand Down
38 changes: 38 additions & 0 deletions tests/frontend/artifact_list_contents.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,12 +21,21 @@
from buildstream._testing import cli # pylint: disable=unused-import
from buildstream.exceptions import ErrorDomain

from tests.testutils import generate_junction

# Project directory
DATA_DIR = os.path.join(
os.path.dirname(os.path.realpath(__file__)),
"artifact_list_contents",
)

# Shared project directory, used for cross junction tests since it already
# has a subproject set up
CROSS_JUNCTION_DATA_DIR = os.path.join(
os.path.dirname(os.path.realpath(__file__)),
"project",
)


def prepare_symlink(project):
# Create the link before running the tests.
Expand DownExpand Up@@ -158,3 +167,32 @@ def test_artifact_list_exact_contents_glob(cli, datafiles):

for artifact in expected_artifacts:
assert artifact in result.output


@pytest.mark.datafiles(CROSS_JUNCTION_DATA_DIR)
def test_artifact_list_contents_cross_junction(cli, tmpdir, datafiles):
project = str(datafiles)
subproject_path = os.path.join(project, "files", "sub-project")
junction_path = os.path.join(project, "elements", "junction.bst")

# Create a repo to hold the subproject and generate a junction element for it
generate_junction(tmpdir, subproject_path, junction_path)

# Ensure we have artifacts to read
result = cli.run(project=project, args=["build", "import-bin.bst", "junction.bst:import-etc.bst"])
result.assert_success()

# List the contents of the cross junction element, alongside a regular
# top-level element which happens to share a basename with it.
result = cli.run(
project=project, args=["artifact", "list-contents", "import-bin.bst", "junction.bst:import-etc.bst"]
)
result.assert_success()

# The full element name, including the owning junction prefix, must be
# used as the header for the cross junction element's contents -- using
# only the bare element name would make it indistinguishable from an
# element of the same name in the top level project or another junction.
assert "import-bin.bst:\n" in result.output
assert "junction.bst:import-etc.bst:\n" in result.output
assert "etc/animal.conf" in result.output
32 changes: 32 additions & 0 deletions tests/frontend/artifact_log.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,8 @@

from buildstream._testing import cli # pylint: disable=unused-import

from tests.testutils import generate_junction

# Project directory
DATA_DIR = os.path.join(
os.path.dirname(os.path.realpath(__file__)),
Expand DownExpand Up@@ -101,3 +103,33 @@ def test_artifact_log_files(cli, datafiles):
with open(import_bin, "r", encoding="utf-8") as f:
data = f.read()
assert len(re.findall(pattern, data, re.MULTILINE)) > 0


@pytest.mark.datafiles(DATA_DIR)
def test_artifact_log_cross_junction(cli, tmpdir, datafiles):
project = str(datafiles)
subproject_path = os.path.join(project, "files", "sub-project")
junction_path = os.path.join(project, "elements", "junction.bst")

# Create a repo to hold the subproject and generate a junction element for it
generate_junction(tmpdir, subproject_path, junction_path)

# Ensure we have an artifact to read, alongside a regular top-level
# element which happens to share a basename with it.
result = cli.run(project=project, args=["build", "import-bin.bst", "junction.bst:import-etc.bst"])
result.assert_success()

logfiles = os.path.join(project, "logfiles")

result = cli.run(
project=project,
args=["artifact", "log", "--out", logfiles, "import-bin.bst", "junction.bst:import-etc.bst"],
)
result.assert_success()

# The log file for the cross junction element must be named using the
# full element name, including the owning junction prefix, and not just
# the bare element name -- otherwise it would collide with the log file
# of a same-named element in the top level project or another junction.
assert os.path.exists(os.path.join(logfiles, "import-bin.log"))
assert os.path.exists(os.path.join(logfiles, "junction.bst:import-etc.log"))
, '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
_stream: use full element name in artifact log/list-contents#2174

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

c1assik
wants to merge
1
commit into

base:master
Choose a base branch

from


+82

−5

 Open


_stream: use full element name in artifact log/list-contents#2174
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


10 changes: 10 additions & 0 deletions
src/buildstream/_artifactelement.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -120,6 +120,16 @@ def _load_artifact(self, *, pull, strict=None): # pylint: disable=useless-super
 # Always operate in strict mode as artifact key has been specified explicitly.
 return super()._load_artifact(pull=pull, strict=True)

 # An ArtifactElement is identified by its artifact name (which includes
 # its cache key) rather than by its element name, since it may not even
 # belong to a loaded project. Cache key is not yet known
 # when this is first called from Plugin.__init__(), before our own
 # __init__() has had a chance to set it via artifact_key.
 def _get_full_name(self):
 if self._get_cache_key() is None:
 return super()._get_full_name()
 return self.get_artifact_name()

 # Once we've finished loading an artifact, we assume the
 # state of the loaded artifact. This is also used if the
 # artifact is loaded after pulling.
Expand Down

7 changes: 2 additions & 5 deletions
src/buildstream/_stream.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -844,7 +844,7 @@ def artifact_log(self, targets):
 self._context.messenger.warn("{} is cached without log files".format(ref))
 continue

 artifact_logs[obj.name] = obj._get_logs()
 artifact_logs[obj._get_full_name()] = obj._get_logs()

 return artifact_logs

Expand All@@ -869,15 +869,12 @@ def artifact_list_contents(self, targets):
 ref = obj.get_artifact_name()
 if not obj._cached():
 self._context.messenger.warn("{} is not cached".format(ref))
 obj.name = {ref: "No artifact cached"}
 continue
 if isinstance(obj, ArtifactElement):
 obj.name = ref

 # Just hand over a Directory here
 artifact = obj._get_artifact()
 files = artifact.get_files()
 elements_to_files[obj.name] = files
 elements_to_files[obj._get_full_name()] = files

 return elements_to_files

Expand Down

38 changes: 38 additions & 0 deletions
tests/frontend/artifact_list_contents.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,12 +21,21 @@
from buildstream._testing import cli # pylint: disable=unused-import
from buildstream.exceptions import ErrorDomain

from tests.testutils import generate_junction

# Project directory
DATA_DIR = os.path.join(
 os.path.dirname(os.path.realpath(__file__)),
 "artifact_list_contents",
)

# Shared project directory, used for cross junction tests since it already
# has a subproject set up
CROSS_JUNCTION_DATA_DIR = os.path.join(
 os.path.dirname(os.path.realpath(__file__)),
 "project",
)


def prepare_symlink(project):
 # Create the link before running the tests.
Expand DownExpand Up@@ -158,3 +167,32 @@ def test_artifact_list_exact_contents_glob(cli, datafiles):

 for artifact in expected_artifacts:
 assert artifact in result.output


@pytest.mark.datafiles(CROSS_JUNCTION_DATA_DIR)
def test_artifact_list_contents_cross_junction(cli, tmpdir, datafiles):
 project = str(datafiles)
 subproject_path = os.path.join(project, "files", "sub-project")
 junction_path = os.path.join(project, "elements", "junction.bst")

 # Create a repo to hold the subproject and generate a junction element for it
 generate_junction(tmpdir, subproject_path, junction_path)

 # Ensure we have artifacts to read
 result = cli.run(project=project, args=["build", "import-bin.bst", "junction.bst:import-etc.bst"])
 result.assert_success()

 # List the contents of the cross junction element, alongside a regular
 # top-level element which happens to share a basename with it.
 result = cli.run(
 project=project, args=["artifact", "list-contents", "import-bin.bst", "junction.bst:import-etc.bst"]
 )
 result.assert_success()

 # The full element name, including the owning junction prefix, must be
 # used as the header for the cross junction element's contents -- using
 # only the bare element name would make it indistinguishable from an
 # element of the same name in the top level project or another junction.
 assert "import-bin.bst:\n" in result.output
 assert "junction.bst:import-etc.bst:\n" in result.output
 assert "etc/animal.conf" in result.output

32 changes: 32 additions & 0 deletions
tests/frontend/artifact_log.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,8 @@

from buildstream._testing import cli # pylint: disable=unused-import

from tests.testutils import generate_junction

# Project directory
DATA_DIR = os.path.join(
 os.path.dirname(os.path.realpath(__file__)),
Expand DownExpand Up@@ -101,3 +103,33 @@ def test_artifact_log_files(cli, datafiles):
 with open(import_bin, "r", encoding="utf-8") as f:
 data = f.read()
 assert len(re.findall(pattern, data, re.MULTILINE)) > 0


@pytest.mark.datafiles(DATA_DIR)
def test_artifact_log_cross_junction(cli, tmpdir, datafiles):
 project = str(datafiles)
 subproject_path = os.path.join(project, "files", "sub-project")
 junction_path = os.path.join(project, "elements", "junction.bst")

 # Create a repo to hold the subproject and generate a junction element for it
 generate_junction(tmpdir, subproject_path, junction_path)

 # Ensure we have an artifact to read, alongside a regular top-level
 # element which happens to share a basename with it.
 result = cli.run(project=project, args=["build", "import-bin.bst", "junction.bst:import-etc.bst"])
 result.assert_success()

 logfiles = os.path.join(project, "logfiles")

 result = cli.run(
 project=project,
 args=["artifact", "log", "--out", logfiles, "import-bin.bst", "junction.bst:import-etc.bst"],
 )
 result.assert_success()

 # The log file for the cross junction element must be named using the
 # full element name, including the owning junction prefix, and not just
 # the bare element name -- otherwise it would collide with the log file
 # of a same-named element in the top level project or another junction.
 assert os.path.exists(os.path.join(logfiles, "import-bin.log"))
 assert os.path.exists(os.path.join(logfiles, "junction.bst:import-etc.log"))

, '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
_stream: use full element name in artifact log/list-contents#2174

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

c1assik
wants to merge
1
commit into

base:master
Choose a base branch

from


+82

−5

 Open


_stream: use full element name in artifact log/list-contents#2174
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


10 changes: 10 additions & 0 deletions
src/buildstream/_artifactelement.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -120,6 +120,16 @@ def _load_artifact(self, *, pull, strict=None): # pylint: disable=useless-super
 # Always operate in strict mode as artifact key has been specified explicitly.
 return super()._load_artifact(pull=pull, strict=True)

 # An ArtifactElement is identified by its artifact name (which includes
 # its cache key) rather than by its element name, since it may not even
 # belong to a loaded project. Cache key is not yet known
 # when this is first called from Plugin.__init__(), before our own
 # __init__() has had a chance to set it via artifact_key.
 def _get_full_name(self):
 if self._get_cache_key() is None:
 return super()._get_full_name()
 return self.get_artifact_name()

 # Once we've finished loading an artifact, we assume the
 # state of the loaded artifact. This is also used if the
 # artifact is loaded after pulling.
Expand Down

7 changes: 2 additions & 5 deletions
src/buildstream/_stream.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -844,7 +844,7 @@ def artifact_log(self, targets):
 self._context.messenger.warn("{} is cached without log files".format(ref))
 continue

 artifact_logs[obj.name] = obj._get_logs()
 artifact_logs[obj._get_full_name()] = obj._get_logs()

 return artifact_logs

Expand All@@ -869,15 +869,12 @@ def artifact_list_contents(self, targets):
 ref = obj.get_artifact_name()
 if not obj._cached():
 self._context.messenger.warn("{} is not cached".format(ref))
 obj.name = {ref: "No artifact cached"}
 continue
 if isinstance(obj, ArtifactElement):
 obj.name = ref

 # Just hand over a Directory here
 artifact = obj._get_artifact()
 files = artifact.get_files()
 elements_to_files[obj.name] = files
 elements_to_files[obj._get_full_name()] = files

 return elements_to_files

Expand Down

38 changes: 38 additions & 0 deletions
tests/frontend/artifact_list_contents.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,12 +21,21 @@
from buildstream._testing import cli # pylint: disable=unused-import
from buildstream.exceptions import ErrorDomain

from tests.testutils import generate_junction

# Project directory
DATA_DIR = os.path.join(
 os.path.dirname(os.path.realpath(__file__)),
 "artifact_list_contents",
)

# Shared project directory, used for cross junction tests since it already
# has a subproject set up
CROSS_JUNCTION_DATA_DIR = os.path.join(
 os.path.dirname(os.path.realpath(__file__)),
 "project",
)


def prepare_symlink(project):
 # Create the link before running the tests.
Expand DownExpand Up@@ -158,3 +167,32 @@ def test_artifact_list_exact_contents_glob(cli, datafiles):

 for artifact in expected_artifacts:
 assert artifact in result.output


@pytest.mark.datafiles(CROSS_JUNCTION_DATA_DIR)
def test_artifact_list_contents_cross_junction(cli, tmpdir, datafiles):
 project = str(datafiles)
 subproject_path = os.path.join(project, "files", "sub-project")
 junction_path = os.path.join(project, "elements", "junction.bst")

 # Create a repo to hold the subproject and generate a junction element for it
 generate_junction(tmpdir, subproject_path, junction_path)

 # Ensure we have artifacts to read
 result = cli.run(project=project, args=["build", "import-bin.bst", "junction.bst:import-etc.bst"])
 result.assert_success()

 # List the contents of the cross junction element, alongside a regular
 # top-level element which happens to share a basename with it.
 result = cli.run(
 project=project, args=["artifact", "list-contents", "import-bin.bst", "junction.bst:import-etc.bst"]
 )
 result.assert_success()

 # The full element name, including the owning junction prefix, must be
 # used as the header for the cross junction element's contents -- using
 # only the bare element name would make it indistinguishable from an
 # element of the same name in the top level project or another junction.
 assert "import-bin.bst:\n" in result.output
 assert "junction.bst:import-etc.bst:\n" in result.output
 assert "etc/animal.conf" in result.output

32 changes: 32 additions & 0 deletions
tests/frontend/artifact_log.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,8 @@

from buildstream._testing import cli # pylint: disable=unused-import

from tests.testutils import generate_junction

# Project directory
DATA_DIR = os.path.join(
 os.path.dirname(os.path.realpath(__file__)),
Expand DownExpand Up@@ -101,3 +103,33 @@ def test_artifact_log_files(cli, datafiles):
 with open(import_bin, "r", encoding="utf-8") as f:
 data = f.read()
 assert len(re.findall(pattern, data, re.MULTILINE)) > 0


@pytest.mark.datafiles(DATA_DIR)
def test_artifact_log_cross_junction(cli, tmpdir, datafiles):
 project = str(datafiles)
 subproject_path = os.path.join(project, "files", "sub-project")
 junction_path = os.path.join(project, "elements", "junction.bst")

 # Create a repo to hold the subproject and generate a junction element for it
 generate_junction(tmpdir, subproject_path, junction_path)

 # Ensure we have an artifact to read, alongside a regular top-level
 # element which happens to share a basename with it.
 result = cli.run(project=project, args=["build", "import-bin.bst", "junction.bst:import-etc.bst"])
 result.assert_success()

 logfiles = os.path.join(project, "logfiles")

 result = cli.run(
 project=project,
 args=["artifact", "log", "--out", logfiles, "import-bin.bst", "junction.bst:import-etc.bst"],
 )
 result.assert_success()

 # The log file for the cross junction element must be named using the
 # full element name, including the owning junction prefix, and not just
 # the bare element name -- otherwise it would collide with the log file
 # of a same-named element in the top level project or another junction.
 assert os.path.exists(os.path.join(logfiles, "import-bin.log"))
 assert os.path.exists(os.path.join(logfiles, "junction.bst:import-etc.log"))

, '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
_stream: use full element name in artifact log/list-contents#2174

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

c1assik
wants to merge
1
commit into

base:master
Choose a base branch

from


+82

−5

 Open


_stream: use full element name in artifact log/list-contents#2174
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


10 changes: 10 additions & 0 deletions
src/buildstream/_artifactelement.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -120,6 +120,16 @@ def _load_artifact(self, *, pull, strict=None): # pylint: disable=useless-super
 # Always operate in strict mode as artifact key has been specified explicitly.
 return super()._load_artifact(pull=pull, strict=True)

 # An ArtifactElement is identified by its artifact name (which includes
 # its cache key) rather than by its element name, since it may not even
 # belong to a loaded project. Cache key is not yet known
 # when this is first called from Plugin.__init__(), before our own
 # __init__() has had a chance to set it via artifact_key.
 def _get_full_name(self):
 if self._get_cache_key() is None:
 return super()._get_full_name()
 return self.get_artifact_name()

 # Once we've finished loading an artifact, we assume the
 # state of the loaded artifact. This is also used if the
 # artifact is loaded after pulling.
Expand Down

7 changes: 2 additions & 5 deletions
src/buildstream/_stream.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -844,7 +844,7 @@ def artifact_log(self, targets):
 self._context.messenger.warn("{} is cached without log files".format(ref))
 continue

 artifact_logs[obj.name] = obj._get_logs()
 artifact_logs[obj._get_full_name()] = obj._get_logs()

 return artifact_logs

Expand All@@ -869,15 +869,12 @@ def artifact_list_contents(self, targets):
 ref = obj.get_artifact_name()
 if not obj._cached():
 self._context.messenger.warn("{} is not cached".format(ref))
 obj.name = {ref: "No artifact cached"}
 continue
 if isinstance(obj, ArtifactElement):
 obj.name = ref

 # Just hand over a Directory here
 artifact = obj._get_artifact()
 files = artifact.get_files()
 elements_to_files[obj.name] = files
 elements_to_files[obj._get_full_name()] = files

 return elements_to_files

Expand Down

38 changes: 38 additions & 0 deletions
tests/frontend/artifact_list_contents.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,12 +21,21 @@
from buildstream._testing import cli # pylint: disable=unused-import
from buildstream.exceptions import ErrorDomain

from tests.testutils import generate_junction

# Project directory
DATA_DIR = os.path.join(
 os.path.dirname(os.path.realpath(__file__)),
 "artifact_list_contents",
)

# Shared project directory, used for cross junction tests since it already
# has a subproject set up
CROSS_JUNCTION_DATA_DIR = os.path.join(
 os.path.dirname(os.path.realpath(__file__)),
 "project",
)


def prepare_symlink(project):
 # Create the link before running the tests.
Expand DownExpand Up@@ -158,3 +167,32 @@ def test_artifact_list_exact_contents_glob(cli, datafiles):

 for artifact in expected_artifacts:
 assert artifact in result.output


@pytest.mark.datafiles(CROSS_JUNCTION_DATA_DIR)
def test_artifact_list_contents_cross_junction(cli, tmpdir, datafiles):
 project = str(datafiles)
 subproject_path = os.path.join(project, "files", "sub-project")
 junction_path = os.path.join(project, "elements", "junction.bst")

 # Create a repo to hold the subproject and generate a junction element for it
 generate_junction(tmpdir, subproject_path, junction_path)

 # Ensure we have artifacts to read
 result = cli.run(project=project, args=["build", "import-bin.bst", "junction.bst:import-etc.bst"])
 result.assert_success()

 # List the contents of the cross junction element, alongside a regular
 # top-level element which happens to share a basename with it.
 result = cli.run(
 project=project, args=["artifact", "list-contents", "import-bin.bst", "junction.bst:import-etc.bst"]
 )
 result.assert_success()

 # The full element name, including the owning junction prefix, must be
 # used as the header for the cross junction element's contents -- using
 # only the bare element name would make it indistinguishable from an
 # element of the same name in the top level project or another junction.
 assert "import-bin.bst:\n" in result.output
 assert "junction.bst:import-etc.bst:\n" in result.output
 assert "etc/animal.conf" in result.output

32 changes: 32 additions & 0 deletions
tests/frontend/artifact_log.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,8 @@

from buildstream._testing import cli # pylint: disable=unused-import

from tests.testutils import generate_junction

# Project directory
DATA_DIR = os.path.join(
 os.path.dirname(os.path.realpath(__file__)),
Expand DownExpand Up@@ -101,3 +103,33 @@ def test_artifact_log_files(cli, datafiles):
 with open(import_bin, "r", encoding="utf-8") as f:
 data = f.read()
 assert len(re.findall(pattern, data, re.MULTILINE)) > 0


@pytest.mark.datafiles(DATA_DIR)
def test_artifact_log_cross_junction(cli, tmpdir, datafiles):
 project = str(datafiles)
 subproject_path = os.path.join(project, "files", "sub-project")
 junction_path = os.path.join(project, "elements", "junction.bst")

 # Create a repo to hold the subproject and generate a junction element for it
 generate_junction(tmpdir, subproject_path, junction_path)

 # Ensure we have an artifact to read, alongside a regular top-level
 # element which happens to share a basename with it.
 result = cli.run(project=project, args=["build", "import-bin.bst", "junction.bst:import-etc.bst"])
 result.assert_success()

 logfiles = os.path.join(project, "logfiles")

 result = cli.run(
 project=project,
 args=["artifact", "log", "--out", logfiles, "import-bin.bst", "junction.bst:import-etc.bst"],
 )
 result.assert_success()

 # The log file for the cross junction element must be named using the
 # full element name, including the owning junction prefix, and not just
 # the bare element name -- otherwise it would collide with the log file
 # of a same-named element in the top level project or another junction.
 assert os.path.exists(os.path.join(logfiles, "import-bin.log"))
 assert os.path.exists(os.path.join(logfiles, "junction.bst:import-etc.log"))

, '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
_stream: use full element name in artifact log/list-contents#2174

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

c1assik
wants to merge
1
commit into

base:master
Choose a base branch

from


+82

−5

 Open


_stream: use full element name in artifact log/list-contents#2174
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


10 changes: 10 additions & 0 deletions
src/buildstream/_artifactelement.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -120,6 +120,16 @@ def _load_artifact(self, *, pull, strict=None): # pylint: disable=useless-super
 # Always operate in strict mode as artifact key has been specified explicitly.
 return super()._load_artifact(pull=pull, strict=True)

 # An ArtifactElement is identified by its artifact name (which includes
 # its cache key) rather than by its element name, since it may not even
 # belong to a loaded project. Cache key is not yet known
 # when this is first called from Plugin.__init__(), before our own
 # __init__() has had a chance to set it via artifact_key.
 def _get_full_name(self):
 if self._get_cache_key() is None:
 return super()._get_full_name()
 return self.get_artifact_name()

 # Once we've finished loading an artifact, we assume the
 # state of the loaded artifact. This is also used if the
 # artifact is loaded after pulling.
Expand Down

7 changes: 2 additions & 5 deletions
src/buildstream/_stream.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -844,7 +844,7 @@ def artifact_log(self, targets):
 self._context.messenger.warn("{} is cached without log files".format(ref))
 continue

 artifact_logs[obj.name] = obj._get_logs()
 artifact_logs[obj._get_full_name()] = obj._get_logs()

 return artifact_logs

Expand All@@ -869,15 +869,12 @@ def artifact_list_contents(self, targets):
 ref = obj.get_artifact_name()
 if not obj._cached():
 self._context.messenger.warn("{} is not cached".format(ref))
 obj.name = {ref: "No artifact cached"}
 continue
 if isinstance(obj, ArtifactElement):
 obj.name = ref

 # Just hand over a Directory here
 artifact = obj._get_artifact()
 files = artifact.get_files()
 elements_to_files[obj.name] = files
 elements_to_files[obj._get_full_name()] = files

 return elements_to_files

Expand Down

38 changes: 38 additions & 0 deletions
tests/frontend/artifact_list_contents.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,12 +21,21 @@
from buildstream._testing import cli # pylint: disable=unused-import
from buildstream.exceptions import ErrorDomain

from tests.testutils import generate_junction

# Project directory
DATA_DIR = os.path.join(
 os.path.dirname(os.path.realpath(__file__)),
 "artifact_list_contents",
)

# Shared project directory, used for cross junction tests since it already
# has a subproject set up
CROSS_JUNCTION_DATA_DIR = os.path.join(
 os.path.dirname(os.path.realpath(__file__)),
 "project",
)


def prepare_symlink(project):
 # Create the link before running the tests.
Expand DownExpand Up@@ -158,3 +167,32 @@ def test_artifact_list_exact_contents_glob(cli, datafiles):

 for artifact in expected_artifacts:
 assert artifact in result.output


@pytest.mark.datafiles(CROSS_JUNCTION_DATA_DIR)
def test_artifact_list_contents_cross_junction(cli, tmpdir, datafiles):
 project = str(datafiles)
 subproject_path = os.path.join(project, "files", "sub-project")
 junction_path = os.path.join(project, "elements", "junction.bst")

 # Create a repo to hold the subproject and generate a junction element for it
 generate_junction(tmpdir, subproject_path, junction_path)

 # Ensure we have artifacts to read
 result = cli.run(project=project, args=["build", "import-bin.bst", "junction.bst:import-etc.bst"])
 result.assert_success()

 # List the contents of the cross junction element, alongside a regular
 # top-level element which happens to share a basename with it.
 result = cli.run(
 project=project, args=["artifact", "list-contents", "import-bin.bst", "junction.bst:import-etc.bst"]
 )
 result.assert_success()

 # The full element name, including the owning junction prefix, must be
 # used as the header for the cross junction element's contents -- using
 # only the bare element name would make it indistinguishable from an
 # element of the same name in the top level project or another junction.
 assert "import-bin.bst:\n" in result.output
 assert "junction.bst:import-etc.bst:\n" in result.output
 assert "etc/animal.conf" in result.output

32 changes: 32 additions & 0 deletions
tests/frontend/artifact_log.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,8 @@

from buildstream._testing import cli # pylint: disable=unused-import

from tests.testutils import generate_junction

# Project directory
DATA_DIR = os.path.join(
 os.path.dirname(os.path.realpath(__file__)),
Expand DownExpand Up@@ -101,3 +103,33 @@ def test_artifact_log_files(cli, datafiles):
 with open(import_bin, "r", encoding="utf-8") as f:
 data = f.read()
 assert len(re.findall(pattern, data, re.MULTILINE)) > 0


@pytest.mark.datafiles(DATA_DIR)
def test_artifact_log_cross_junction(cli, tmpdir, datafiles):
 project = str(datafiles)
 subproject_path = os.path.join(project, "files", "sub-project")
 junction_path = os.path.join(project, "elements", "junction.bst")

 # Create a repo to hold the subproject and generate a junction element for it
 generate_junction(tmpdir, subproject_path, junction_path)

 # Ensure we have an artifact to read, alongside a regular top-level
 # element which happens to share a basename with it.
 result = cli.run(project=project, args=["build", "import-bin.bst", "junction.bst:import-etc.bst"])
 result.assert_success()

 logfiles = os.path.join(project, "logfiles")

 result = cli.run(
 project=project,
 args=["artifact", "log", "--out", logfiles, "import-bin.bst", "junction.bst:import-etc.bst"],
 )
 result.assert_success()

 # The log file for the cross junction element must be named using the
 # full element name, including the owning junction prefix, and not just
 # the bare element name -- otherwise it would collide with the log file
 # of a same-named element in the top level project or another junction.
 assert os.path.exists(os.path.join(logfiles, "import-bin.log"))
 assert os.path.exists(os.path.join(logfiles, "junction.bst:import-etc.log"))

, '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
_stream: use full element name in artifact log/list-contents#2174

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

c1assik
wants to merge
1
commit into

base:master
Choose a base branch

from


+82

−5

 Open


_stream: use full element name in artifact log/list-contents#2174
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


10 changes: 10 additions & 0 deletions
src/buildstream/_artifactelement.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -120,6 +120,16 @@ def _load_artifact(self, *, pull, strict=None): # pylint: disable=useless-super
 # Always operate in strict mode as artifact key has been specified explicitly.
 return super()._load_artifact(pull=pull, strict=True)

 # An ArtifactElement is identified by its artifact name (which includes
 # its cache key) rather than by its element name, since it may not even
 # belong to a loaded project. Cache key is not yet known
 # when this is first called from Plugin.__init__(), before our own
 # __init__() has had a chance to set it via artifact_key.
 def _get_full_name(self):
 if self._get_cache_key() is None:
 return super()._get_full_name()
 return self.get_artifact_name()

 # Once we've finished loading an artifact, we assume the
 # state of the loaded artifact. This is also used if the
 # artifact is loaded after pulling.
Expand Down

7 changes: 2 additions & 5 deletions
src/buildstream/_stream.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -844,7 +844,7 @@ def artifact_log(self, targets):
 self._context.messenger.warn("{} is cached without log files".format(ref))
 continue

 artifact_logs[obj.name] = obj._get_logs()
 artifact_logs[obj._get_full_name()] = obj._get_logs()

 return artifact_logs

Expand All@@ -869,15 +869,12 @@ def artifact_list_contents(self, targets):
 ref = obj.get_artifact_name()
 if not obj._cached():
 self._context.messenger.warn("{} is not cached".format(ref))
 obj.name = {ref: "No artifact cached"}
 continue
 if isinstance(obj, ArtifactElement):
 obj.name = ref

 # Just hand over a Directory here
 artifact = obj._get_artifact()
 files = artifact.get_files()
 elements_to_files[obj.name] = files
 elements_to_files[obj._get_full_name()] = files

 return elements_to_files

Expand Down

38 changes: 38 additions & 0 deletions
tests/frontend/artifact_list_contents.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,12 +21,21 @@
from buildstream._testing import cli # pylint: disable=unused-import
from buildstream.exceptions import ErrorDomain

from tests.testutils import generate_junction

# Project directory
DATA_DIR = os.path.join(
 os.path.dirname(os.path.realpath(__file__)),
 "artifact_list_contents",
)

# Shared project directory, used for cross junction tests since it already
# has a subproject set up
CROSS_JUNCTION_DATA_DIR = os.path.join(
 os.path.dirname(os.path.realpath(__file__)),
 "project",
)


def prepare_symlink(project):
 # Create the link before running the tests.
Expand DownExpand Up@@ -158,3 +167,32 @@ def test_artifact_list_exact_contents_glob(cli, datafiles):

 for artifact in expected_artifacts:
 assert artifact in result.output


@pytest.mark.datafiles(CROSS_JUNCTION_DATA_DIR)
def test_artifact_list_contents_cross_junction(cli, tmpdir, datafiles):
 project = str(datafiles)
 subproject_path = os.path.join(project, "files", "sub-project")
 junction_path = os.path.join(project, "elements", "junction.bst")

 # Create a repo to hold the subproject and generate a junction element for it
 generate_junction(tmpdir, subproject_path, junction_path)

 # Ensure we have artifacts to read
 result = cli.run(project=project, args=["build", "import-bin.bst", "junction.bst:import-etc.bst"])
 result.assert_success()

 # List the contents of the cross junction element, alongside a regular
 # top-level element which happens to share a basename with it.
 result = cli.run(
 project=project, args=["artifact", "list-contents", "import-bin.bst", "junction.bst:import-etc.bst"]
 )
 result.assert_success()

 # The full element name, including the owning junction prefix, must be
 # used as the header for the cross junction element's contents -- using
 # only the bare element name would make it indistinguishable from an
 # element of the same name in the top level project or another junction.
 assert "import-bin.bst:\n" in result.output
 assert "junction.bst:import-etc.bst:\n" in result.output
 assert "etc/animal.conf" in result.output

32 changes: 32 additions & 0 deletions
tests/frontend/artifact_log.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,8 @@

from buildstream._testing import cli # pylint: disable=unused-import

from tests.testutils import generate_junction

# Project directory
DATA_DIR = os.path.join(
 os.path.dirname(os.path.realpath(__file__)),
Expand DownExpand Up@@ -101,3 +103,33 @@ def test_artifact_log_files(cli, datafiles):
 with open(import_bin, "r", encoding="utf-8") as f:
 data = f.read()
 assert len(re.findall(pattern, data, re.MULTILINE)) > 0


@pytest.mark.datafiles(DATA_DIR)
def test_artifact_log_cross_junction(cli, tmpdir, datafiles):
 project = str(datafiles)
 subproject_path = os.path.join(project, "files", "sub-project")
 junction_path = os.path.join(project, "elements", "junction.bst")

 # Create a repo to hold the subproject and generate a junction element for it
 generate_junction(tmpdir, subproject_path, junction_path)

 # Ensure we have an artifact to read, alongside a regular top-level
 # element which happens to share a basename with it.
 result = cli.run(project=project, args=["build", "import-bin.bst", "junction.bst:import-etc.bst"])
 result.assert_success()

 logfiles = os.path.join(project, "logfiles")

 result = cli.run(
 project=project,
 args=["artifact", "log", "--out", logfiles, "import-bin.bst", "junction.bst:import-etc.bst"],
 )
 result.assert_success()

 # The log file for the cross junction element must be named using the
 # full element name, including the owning junction prefix, and not just
 # the bare element name -- otherwise it would collide with the log file
 # of a same-named element in the top level project or another junction.
 assert os.path.exists(os.path.join(logfiles, "import-bin.log"))
 assert os.path.exists(os.path.join(logfiles, "junction.bst:import-etc.log"))

, '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
_stream: use full element name in artifact log/list-contents#2174

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

c1assik
wants to merge
1
commit into

base:master
Choose a base branch

from


+82

−5

 Open


_stream: use full element name in artifact log/list-contents#2174
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


10 changes: 10 additions & 0 deletions
src/buildstream/_artifactelement.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -120,6 +120,16 @@ def _load_artifact(self, *, pull, strict=None): # pylint: disable=useless-super
 # Always operate in strict mode as artifact key has been specified explicitly.
 return super()._load_artifact(pull=pull, strict=True)

 # An ArtifactElement is identified by its artifact name (which includes
 # its cache key) rather than by its element name, since it may not even
 # belong to a loaded project. Cache key is not yet known
 # when this is first called from Plugin.__init__(), before our own
 # __init__() has had a chance to set it via artifact_key.
 def _get_full_name(self):
 if self._get_cache_key() is None:
 return super()._get_full_name()
 return self.get_artifact_name()

 # Once we've finished loading an artifact, we assume the
 # state of the loaded artifact. This is also used if the
 # artifact is loaded after pulling.
Expand Down

7 changes: 2 additions & 5 deletions
src/buildstream/_stream.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -844,7 +844,7 @@ def artifact_log(self, targets):
 self._context.messenger.warn("{} is cached without log files".format(ref))
 continue

 artifact_logs[obj.name] = obj._get_logs()
 artifact_logs[obj._get_full_name()] = obj._get_logs()

 return artifact_logs

Expand All@@ -869,15 +869,12 @@ def artifact_list_contents(self, targets):
 ref = obj.get_artifact_name()
 if not obj._cached():
 self._context.messenger.warn("{} is not cached".format(ref))
 obj.name = {ref: "No artifact cached"}
 continue
 if isinstance(obj, ArtifactElement):
 obj.name = ref

 # Just hand over a Directory here
 artifact = obj._get_artifact()
 files = artifact.get_files()
 elements_to_files[obj.name] = files
 elements_to_files[obj._get_full_name()] = files

 return elements_to_files

Expand Down

38 changes: 38 additions & 0 deletions
tests/frontend/artifact_list_contents.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,12 +21,21 @@
from buildstream._testing import cli # pylint: disable=unused-import
from buildstream.exceptions import ErrorDomain

from tests.testutils import generate_junction

# Project directory
DATA_DIR = os.path.join(
 os.path.dirname(os.path.realpath(__file__)),
 "artifact_list_contents",
)

# Shared project directory, used for cross junction tests since it already
# has a subproject set up
CROSS_JUNCTION_DATA_DIR = os.path.join(
 os.path.dirname(os.path.realpath(__file__)),
 "project",
)


def prepare_symlink(project):
 # Create the link before running the tests.
Expand DownExpand Up@@ -158,3 +167,32 @@ def test_artifact_list_exact_contents_glob(cli, datafiles):

 for artifact in expected_artifacts:
 assert artifact in result.output


@pytest.mark.datafiles(CROSS_JUNCTION_DATA_DIR)
def test_artifact_list_contents_cross_junction(cli, tmpdir, datafiles):
 project = str(datafiles)
 subproject_path = os.path.join(project, "files", "sub-project")
 junction_path = os.path.join(project, "elements", "junction.bst")

 # Create a repo to hold the subproject and generate a junction element for it
 generate_junction(tmpdir, subproject_path, junction_path)

 # Ensure we have artifacts to read
 result = cli.run(project=project, args=["build", "import-bin.bst", "junction.bst:import-etc.bst"])
 result.assert_success()

 # List the contents of the cross junction element, alongside a regular
 # top-level element which happens to share a basename with it.
 result = cli.run(
 project=project, args=["artifact", "list-contents", "import-bin.bst", "junction.bst:import-etc.bst"]
 )
 result.assert_success()

 # The full element name, including the owning junction prefix, must be
 # used as the header for the cross junction element's contents -- using
 # only the bare element name would make it indistinguishable from an
 # element of the same name in the top level project or another junction.
 assert "import-bin.bst:\n" in result.output
 assert "junction.bst:import-etc.bst:\n" in result.output
 assert "etc/animal.conf" in result.output

32 changes: 32 additions & 0 deletions
tests/frontend/artifact_log.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,8 @@

from buildstream._testing import cli # pylint: disable=unused-import

from tests.testutils import generate_junction

# Project directory
DATA_DIR = os.path.join(
 os.path.dirname(os.path.realpath(__file__)),
Expand DownExpand Up@@ -101,3 +103,33 @@ def test_artifact_log_files(cli, datafiles):
 with open(import_bin, "r", encoding="utf-8") as f:
 data = f.read()
 assert len(re.findall(pattern, data, re.MULTILINE)) > 0


@pytest.mark.datafiles(DATA_DIR)
def test_artifact_log_cross_junction(cli, tmpdir, datafiles):
 project = str(datafiles)
 subproject_path = os.path.join(project, "files", "sub-project")
 junction_path = os.path.join(project, "elements", "junction.bst")

 # Create a repo to hold the subproject and generate a junction element for it
 generate_junction(tmpdir, subproject_path, junction_path)

 # Ensure we have an artifact to read, alongside a regular top-level
 # element which happens to share a basename with it.
 result = cli.run(project=project, args=["build", "import-bin.bst", "junction.bst:import-etc.bst"])
 result.assert_success()

 logfiles = os.path.join(project, "logfiles")

 result = cli.run(
 project=project,
 args=["artifact", "log", "--out", logfiles, "import-bin.bst", "junction.bst:import-etc.bst"],
 )
 result.assert_success()

 # The log file for the cross junction element must be named using the
 # full element name, including the owning junction prefix, and not just
 # the bare element name -- otherwise it would collide with the log file
 # of a same-named element in the top level project or another junction.
 assert os.path.exists(os.path.join(logfiles, "import-bin.log"))
 assert os.path.exists(os.path.join(logfiles, "junction.bst:import-etc.log"))

, '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
_stream: use full element name in artifact log/list-contents#2174

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

c1assik
wants to merge
1
commit into

base:master
Choose a base branch

from


+82

−5

 Open


_stream: use full element name in artifact log/list-contents#2174
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


10 changes: 10 additions & 0 deletions
src/buildstream/_artifactelement.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -120,6 +120,16 @@ def _load_artifact(self, *, pull, strict=None): # pylint: disable=useless-super
 # Always operate in strict mode as artifact key has been specified explicitly.
 return super()._load_artifact(pull=pull, strict=True)

 # An ArtifactElement is identified by its artifact name (which includes
 # its cache key) rather than by its element name, since it may not even
 # belong to a loaded project. Cache key is not yet known
 # when this is first called from Plugin.__init__(), before our own
 # __init__() has had a chance to set it via artifact_key.
 def _get_full_name(self):
 if self._get_cache_key() is None:
 return super()._get_full_name()
 return self.get_artifact_name()

 # Once we've finished loading an artifact, we assume the
 # state of the loaded artifact. This is also used if the
 # artifact is loaded after pulling.
Expand Down

7 changes: 2 additions & 5 deletions
src/buildstream/_stream.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -844,7 +844,7 @@ def artifact_log(self, targets):
 self._context.messenger.warn("{} is cached without log files".format(ref))
 continue

 artifact_logs[obj.name] = obj._get_logs()
 artifact_logs[obj._get_full_name()] = obj._get_logs()

 return artifact_logs

Expand All@@ -869,15 +869,12 @@ def artifact_list_contents(self, targets):
 ref = obj.get_artifact_name()
 if not obj._cached():
 self._context.messenger.warn("{} is not cached".format(ref))
 obj.name = {ref: "No artifact cached"}
 continue
 if isinstance(obj, ArtifactElement):
 obj.name = ref

 # Just hand over a Directory here
 artifact = obj._get_artifact()
 files = artifact.get_files()
 elements_to_files[obj.name] = files
 elements_to_files[obj._get_full_name()] = files

 return elements_to_files

Expand Down

38 changes: 38 additions & 0 deletions
tests/frontend/artifact_list_contents.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,12 +21,21 @@
from buildstream._testing import cli # pylint: disable=unused-import
from buildstream.exceptions import ErrorDomain

from tests.testutils import generate_junction

# Project directory
DATA_DIR = os.path.join(
 os.path.dirname(os.path.realpath(__file__)),
 "artifact_list_contents",
)

# Shared project directory, used for cross junction tests since it already
# has a subproject set up
CROSS_JUNCTION_DATA_DIR = os.path.join(
 os.path.dirname(os.path.realpath(__file__)),
 "project",
)


def prepare_symlink(project):
 # Create the link before running the tests.
Expand DownExpand Up@@ -158,3 +167,32 @@ def test_artifact_list_exact_contents_glob(cli, datafiles):

 for artifact in expected_artifacts:
 assert artifact in result.output


@pytest.mark.datafiles(CROSS_JUNCTION_DATA_DIR)
def test_artifact_list_contents_cross_junction(cli, tmpdir, datafiles):
 project = str(datafiles)
 subproject_path = os.path.join(project, "files", "sub-project")
 junction_path = os.path.join(project, "elements", "junction.bst")

 # Create a repo to hold the subproject and generate a junction element for it
 generate_junction(tmpdir, subproject_path, junction_path)

 # Ensure we have artifacts to read
 result = cli.run(project=project, args=["build", "import-bin.bst", "junction.bst:import-etc.bst"])
 result.assert_success()

 # List the contents of the cross junction element, alongside a regular
 # top-level element which happens to share a basename with it.
 result = cli.run(
 project=project, args=["artifact", "list-contents", "import-bin.bst", "junction.bst:import-etc.bst"]
 )
 result.assert_success()

 # The full element name, including the owning junction prefix, must be
 # used as the header for the cross junction element's contents -- using
 # only the bare element name would make it indistinguishable from an
 # element of the same name in the top level project or another junction.
 assert "import-bin.bst:\n" in result.output
 assert "junction.bst:import-etc.bst:\n" in result.output
 assert "etc/animal.conf" in result.output

32 changes: 32 additions & 0 deletions
tests/frontend/artifact_log.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,8 @@

from buildstream._testing import cli # pylint: disable=unused-import

from tests.testutils import generate_junction

# Project directory
DATA_DIR = os.path.join(
 os.path.dirname(os.path.realpath(__file__)),
Expand DownExpand Up@@ -101,3 +103,33 @@ def test_artifact_log_files(cli, datafiles):
 with open(import_bin, "r", encoding="utf-8") as f:
 data = f.read()
 assert len(re.findall(pattern, data, re.MULTILINE)) > 0


@pytest.mark.datafiles(DATA_DIR)
def test_artifact_log_cross_junction(cli, tmpdir, datafiles):
 project = str(datafiles)
 subproject_path = os.path.join(project, "files", "sub-project")
 junction_path = os.path.join(project, "elements", "junction.bst")

 # Create a repo to hold the subproject and generate a junction element for it
 generate_junction(tmpdir, subproject_path, junction_path)

 # Ensure we have an artifact to read, alongside a regular top-level
 # element which happens to share a basename with it.
 result = cli.run(project=project, args=["build", "import-bin.bst", "junction.bst:import-etc.bst"])
 result.assert_success()

 logfiles = os.path.join(project, "logfiles")

 result = cli.run(
 project=project,
 args=["artifact", "log", "--out", logfiles, "import-bin.bst", "junction.bst:import-etc.bst"],
 )
 result.assert_success()

 # The log file for the cross junction element must be named using the
 # full element name, including the owning junction prefix, and not just
 # the bare element name -- otherwise it would collide with the log file
 # of a same-named element in the top level project or another junction.
 assert os.path.exists(os.path.join(logfiles, "import-bin.log"))
 assert os.path.exists(os.path.join(logfiles, "junction.bst:import-etc.log"))