Skip to content
Snippets Groups Projects

nixguix: Use content-disposition from http head request if provided

1 unresolved thread

As a last fallback after the content-type check, instead of raising immediately.

Related to T3781 Depends on !441 (closed)


Migrated from D8774 (view on Phabricator)

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Build is green

    Patch application report for D8774 (id=31632)

    Could not rebase; Attempt merge onto 8355fee2...

    Merge made by the 'recursive' strategy.
     swh/lister/nixguix/lister.py                       | 47 +++++++++++++++++++---
     swh/lister/nixguix/tests/data/sources-success.json | 14 +++++++
     swh/lister/nixguix/tests/test_lister.py            | 27 +++++++++++--
     3 files changed, 78 insertions(+), 10 deletions(-)
    Changes applied before test
    commit 68e73bab04e71a57f64311f33c286377b27d34ff
    Merge: 8355fee 3670b51
    Author: Jenkins user <jenkins@localhost>
    Date:   Tue Oct 25 15:50:39 2022 +0000
    
        Merge branch 'diff-target' into HEAD
    
    commit 3670b519275047331cbc833f54f698ca534c0180
    Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
    Date:   Tue Oct 25 17:46:30 2022 +0200
    
        nixguix: Use content-disposition from http head request if provided
        
        As a last fallback after the content-type check, instead of raising immediately.
        
        Related to [T3781](https://forge.softwareheritage.org/T3781 'view original for T3781 on Phabricator')
    
    commit e1733421cdba831ba1619c05c89189d795fc8f49
    Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
    Date:   Tue Oct 25 17:04:29 2022 +0200
    
        nixguix: Deal with edge case url with version instead of extension
        
        Prior to this, some urls were detected as file because their version name were wrongly
        detected as extension, hence not matching tarball extensions.
        
        Related to [T3781](https://forge.softwareheritage.org/T3781 'view original for T3781 on Phabricator')

    See https://jenkins.softwareheritage.org/job/DLS/job/tests-on-diff/831/ for more details.

  • Rebase

  • Build is green

    Patch application report for D8774 (id=31636)

    Could not rebase; Attempt merge onto 8355fee2...

    Merge made by the 'recursive' strategy.
     swh/lister/nixguix/lister.py                       | 47 +++++++++++++++++++---
     swh/lister/nixguix/tests/data/sources-success.json | 14 +++++++
     swh/lister/nixguix/tests/test_lister.py            | 29 +++++++++++--
     3 files changed, 80 insertions(+), 10 deletions(-)
    Changes applied before test
    commit fdb4b698a10b16b191fb1a0db1a218518e32c574
    Merge: 8355fee a479820
    Author: Jenkins user <jenkins@localhost>
    Date:   Tue Oct 25 16:17:07 2022 +0000
    
        Merge branch 'diff-target' into HEAD
    
    commit a47982036af0b328f521ae3eeb12207fdc892fb0
    Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
    Date:   Tue Oct 25 17:46:30 2022 +0200
    
        nixguix: Use content-disposition from http head request if provided
        
        As a last fallback after the content-type check, instead of raising immediately.
        
        Related to [T3781](https://forge.softwareheritage.org/T3781 'view original for T3781 on Phabricator')
    
    commit 78c67d67e1bc9e767811d99729a11536991a3764
    Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
    Date:   Tue Oct 25 17:04:29 2022 +0200
    
        nixguix: Deal with edge case url with version instead of extension
        
        Prior to this, some urls were detected as file because their version name were wrongly
        detected as extension, hence not matching tarball extensions.
        
        Related to [T3781](https://forge.softwareheritage.org/T3781 'view original for T3781 on Phabricator')

    See https://jenkins.softwareheritage.org/job/DLS/job/tests-on-diff/833/ for more details.

  • Adapt according to last review

240 240 "Content-Type": "application/x-gzip",
241 241 },
242 242 )
243 requests_mock.head(
244 "https://codeload.github.com/unknown-horizons/unknown-horizons/tar.gz/2019.1",
245 headers={
246 "Content-Disposition": "attachment; filename=unknown-horizons-2019.1.tar.gz",
247 },
248 )
249 requests_mock.head(
250 "https://codeload.github.com/fifengine/fifengine/tar.gz/0.4.2",
251 headers={
252 "Content-Disposition": "attachment; name=fieldName; "
253 "filename=fifengine-0.4.2.tar.gz; other=stuff",
  • Merge request was accepted

  • Antoine Lambert approved this merge request

    approved this merge request

  • Build is green

    Patch application report for D8774 (id=31639)

    Could not rebase; Attempt merge onto 8355fee2...

    Updating 8355fee..81688ca
    Fast-forward
     swh/lister/nixguix/lister.py                       | 50 +++++++++++++++++++---
     swh/lister/nixguix/tests/data/sources-success.json | 21 +++++++++
     swh/lister/nixguix/tests/test_lister.py            | 36 ++++++++++++++--
     3 files changed, 97 insertions(+), 10 deletions(-)
    Changes applied before test
    commit 81688ca17e667c693fbc46abadf9275bb99a54f1
    Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
    Date:   Tue Oct 25 17:46:30 2022 +0200
    
        nixguix: Use content-disposition from http head request if provided
        
        As a last fallback after the content-type check, instead of raising immediately.
        
        Related to [T3781](https://forge.softwareheritage.org/T3781 'view original for T3781 on Phabricator')
    
    commit 026fea21da49b30fda9c5adbb24c6d7a8c24c8df
    Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
    Date:   Tue Oct 25 17:04:29 2022 +0200
    
        nixguix: Deal with edge case url with version instead of extension
        
        Prior to this, some urls were detected as file because their version name were wrongly
        detected as extension, hence not matching tarball extensions.
        
        Related to [T3781](https://forge.softwareheritage.org/T3781 'view original for T3781 on Phabricator')

    See https://jenkins.softwareheritage.org/job/DLS/job/tests-on-diff/836/ for more details.

  • Merge request was merged

  • Please register or sign in to reply
    Loading