Commit Graph

48627 Commits

Author SHA1 Message Date
psp
7c676c6e3b *Plugins: Fixes/Changes/Maintenance*
- MergeSameNamedPackagesAction: some more work on this so in the end hopefully that thing can be used for linkgrabber- and downloadlist items refs #68814

git-svn-id: svn://svn.jdownloader.org/jdownloader/trunk@49476 ebf7c1c2-ba36-0410-9fe8-c592906822b4

Former-commit-id: fec6a346baa8f23aa3da44b0b2f45b06d6e1f89e
2024-07-31 13:43:43 +00:00
psp
68b960c3ad *Plugins: Fixes/Changes/Maintenance*
- PornhatCom: fixed bad file titles RE forum 93318
- KernelVideoSharingComV2: fixed failure in "surprise HLS" handling (bad errorhandling)

git-svn-id: svn://svn.jdownloader.org/jdownloader/trunk@49475 ebf7c1c2-ba36-0410-9fe8-c592906822b4

Former-commit-id: 403ec7339217f9c3d8886c3e00f122419148f4af
2024-07-31 12:43:18 +00:00
psp
8d8e6fb5e5 *Plugins: Fixes/Changes/Maintenance*
- HLSDownloader: minor changes

git-svn-id: svn://svn.jdownloader.org/jdownloader/trunk@49474 ebf7c1c2-ba36-0410-9fe8-c592906822b4

Former-commit-id: b0663f8cf3c86cc9f064f19c9b3776a0ae42872b
2024-07-31 12:08:57 +00:00
psp
23c1f71fdf *Plugins: New plugins*
- Swiftloadio

git-svn-id: svn://svn.jdownloader.org/jdownloader/trunk@49473 ebf7c1c2-ba36-0410-9fe8-c592906822b4

Former-commit-id: 0487cd32071ac448726a7f95503f433fd1798b9c
2024-07-31 09:07:12 +00:00
psp
f00afb7460 *General*
- FilePathChecker: added ability to detect 'too long path' much easier and earlier refs #54757
- SingleDownloadController: added precise error message for case "download path too long"

git-svn-id: svn://svn.jdownloader.org/jdownloader/trunk@49472 ebf7c1c2-ba36-0410-9fe8-c592906822b4

Former-commit-id: d5fa3a675376718d664c7a45e41c2bcb560ca21d
2024-07-31 08:56:09 +00:00
psp
777bad7937 *General*
- MergeSameNamedPackagesAction: added translation, merge comments of merged packages refs #68814
- MergeToPackageAction: moved code which merges multiple package comments into one into separate function to avoid duplicated code

git-svn-id: svn://svn.jdownloader.org/jdownloader/trunk@49471 ebf7c1c2-ba36-0410-9fe8-c592906822b4

Former-commit-id: b9c20e60ee3f69d48b9a28d1ea4cd1bc5da910dd
2024-07-31 08:34:01 +00:00
psp
02c8a95552 *Plugins: Fixes/Changes/Maintenance*
- xart: fixed login and download RE ticket #HSMV6517-NOOV-5775XHWX

git-svn-id: svn://svn.jdownloader.org/jdownloader/trunk@49470 ebf7c1c2-ba36-0410-9fe8-c592906822b4

Former-commit-id: 65e98132a449d0130674e230d221aa4926a86efb
2024-07-31 07:59:16 +00:00
psp
b9e5b11893 *General*
- MergeToPackageAction: minor changes
- MergeSameNamedPackagesAction: minor changes refs #68814

git-svn-id: svn://svn.jdownloader.org/jdownloader/trunk@49469 ebf7c1c2-ba36-0410-9fe8-c592906822b4

Former-commit-id: 8d702a3170bb3ad6a26857ca8f924355f46998ec
2024-07-31 07:29:53 +00:00
psp
aaf87817cd *General*
- MergeSameNamedPackagesAction: small changes refs #68814

git-svn-id: svn://svn.jdownloader.org/jdownloader/trunk@49468 ebf7c1c2-ba36-0410-9fe8-c592906822b4

Former-commit-id: 1664914de5991bf5093623e856dceaaa3ba4db5d
2024-07-30 15:41:09 +00:00
jiaz
d56659a2ac git-svn-id: svn://svn.jdownloader.org/jdownloader/trunk@49467 ebf7c1c2-ba36-0410-9fe8-c592906822b4
Former-commit-id: 464b365fc21d2524e52f66b0b2f424c201ad2e12
2024-07-30 15:10:46 +00:00
jiaz
6412242e8c git-svn-id: svn://svn.jdownloader.org/jdownloader/trunk@49466 ebf7c1c2-ba36-0410-9fe8-c592906822b4
Former-commit-id: a6c58d53e8b40c8695fbfd0e3b652b5715743333
2024-07-30 15:10:02 +00:00
psp
4e62943000 *Plugins: Fixes/Changes/Maintenance*
- [KVS] love4porncom: moved into separate class and added special offline detection RE forum 91729

git-svn-id: svn://svn.jdownloader.org/jdownloader/trunk@49465 ebf7c1c2-ba36-0410-9fe8-c592906822b4

Former-commit-id: d31bdfed9183c5ef99708573cc67667057ffce2f
2024-07-30 13:22:45 +00:00
psp
c06ca4133a *Plugins: Fixes/Changes/Maintenance*
- KernelVideoSharingComV2: minor changes

git-svn-id: svn://svn.jdownloader.org/jdownloader/trunk@49464 ebf7c1c2-ba36-0410-9fe8-c592906822b4

Former-commit-id: ebbfadcdd442af6089b99abd342833ac15bcf038
2024-07-30 12:58:04 +00:00
psp
58455a83f6 *Plugins: Fixes/Changes/Maintenance*
- KernelVideoSharingComV2: removed duplicated code, do not check if a quality is downloadable if only one exists/is left

git-svn-id: svn://svn.jdownloader.org/jdownloader/trunk@49463 ebf7c1c2-ba36-0410-9fe8-c592906822b4

Former-commit-id: 13ec73275b056642ac296f95f53a00202ab885d2
2024-07-30 12:52:33 +00:00
jiaz
e820a00aca KernelVideoSharingComV2:
-updated handleQualitySelection to verify chosen quality indeed working
-updated getPreferredStreamQuality to remember chosen quality
-refs thread 91729

git-svn-id: svn://svn.jdownloader.org/jdownloader/trunk@49462 ebf7c1c2-ba36-0410-9fe8-c592906822b4

Former-commit-id: bb8e59fde2b604086e989d4c8e71d05eadec5c5d
2024-07-30 12:05:02 +00:00
psp
ce70c9c56b *General*
- PackageController: merge: added version with new method signature refs #68814

git-svn-id: svn://svn.jdownloader.org/jdownloader/trunk@49461 ebf7c1c2-ba36-0410-9fe8-c592906822b4

Former-commit-id: c0b82d7e31d23422e57f32924b63d5e71f87f264
2024-07-30 11:56:22 +00:00
psp
3996e1fc15 *Plugins: Fixes/Changes/Maintenance*
- ArchiveOrgCrawler: minor changes
- KernelVideoSharingComV2: updated logic which finds final downloadlinks
- MOCH premium.to: added new (additional) 'API' auth header RE admin

*Plugins: New plugins*
- [KVS] thepornbangcom RE forum 96207

git-svn-id: svn://svn.jdownloader.org/jdownloader/trunk@49460 ebf7c1c2-ba36-0410-9fe8-c592906822b4

Former-commit-id: b8d08c695822ccffa6c75d7c2c00c7b258879f50
2024-07-30 11:39:48 +00:00
psp
e63cc1fd6e *General*
- PackageController: refactored to early return principle
- MergeSameNamedPackagesAction: updated to be able to handle multiple selected packages refs #90420

git-svn-id: svn://svn.jdownloader.org/jdownloader/trunk@49459 ebf7c1c2-ba36-0410-9fe8-c592906822b4

Former-commit-id: ed288e6dbf23cfd55a250956fd752545689a94e2
2024-07-30 11:00:48 +00:00
psp
fcd01d082e *Plugins: Fixes/Changes/Maintenance*
- ArchiveOrgCrawler: fixed bug in "crawl only original files" handling RE forum 92666
- CyberdropMeAlbum: fixed bad/incomplete plugin pattern, fixed download RE forum 92182
- KernelVideoSharingComV2: updated default offline detection RE forum 95233

git-svn-id: svn://svn.jdownloader.org/jdownloader/trunk@49458 ebf7c1c2-ba36-0410-9fe8-c592906822b4

Former-commit-id: 52b73366c34015437c1a04090eb3ee9ca89cfc01
2024-07-30 10:27:08 +00:00
jiaz
0a533b8cc4 PackageInfo:
-static helper setName method
LinkCrawlerDeepHelper:
-updated to new cookie handling
DirectHTTP:
-updated to changes for LinkCrawlerRule and cookie handling
LinkCrawlerRule:
-moved cookie handling into updateCookies and applyCookies method
LinkCrawler:
-removed old crawlDeeperOrMatchingRule, new handling is now in use
-updated openCrawlDeeperConnectionV2 to make use of new cookie handling


git-svn-id: svn://svn.jdownloader.org/jdownloader/trunk@49457 ebf7c1c2-ba36-0410-9fe8-c592906822b4

Former-commit-id: f3b3caae09cc9de2ce50b0a2f8dd239e78f37d0a
2024-07-30 09:59:09 +00:00
psp
611ccaf353 *General*
- MergeSameNamedPackagesAction: if a package is selected: only merge dupes of selected package into it refs #90420

git-svn-id: svn://svn.jdownloader.org/jdownloader/trunk@49456 ebf7c1c2-ba36-0410-9fe8-c592906822b4

Former-commit-id: 7e5dfc9c4974fdc7b2c321ae470e23f0bf51d44f
2024-07-30 09:20:56 +00:00
psp
887869b442 *General*
- added simple action to merge all packages with the same name in linkgrabber refs #90420

git-svn-id: svn://svn.jdownloader.org/jdownloader/trunk@49455 ebf7c1c2-ba36-0410-9fe8-c592906822b4

Former-commit-id: a3cedcbf75858d2c924219aa8ea28c91dd52b0b9
2024-07-29 15:51:03 +00:00
jiaz
71007aa75e Plugin:
-renamed countReplacementCharacter method to getWrongEncodingLevel to better explain what this method does
-updated correctOrApplyFileNameExtension and allowFileNameExtension, allow unknown extensions(with existing dot) to have Audio/Video/Image extension
-fixes thread 96203

git-svn-id: svn://svn.jdownloader.org/jdownloader/trunk@49454 ebf7c1c2-ba36-0410-9fe8-c592906822b4

Former-commit-id: e1b3068ef778092af1307706a7a9421639df4e36
2024-07-29 15:46:23 +00:00
psp
1d78cefa26 *Plugins: Fixes/Changes/Maintenance*
- ardmediathek: added setting for preferred audio quality RE forum 96026

git-svn-id: svn://svn.jdownloader.org/jdownloader/trunk@49453 ebf7c1c2-ba36-0410-9fe8-c592906822b4

Former-commit-id: 0761a6da375365e66ba2c3a2b46af0e6dd0909d3
2024-07-29 13:33:27 +00:00
jiaz
dd70f01270 KemonoPartyCrawler:
-updated to use Linkcrawler.find
LinkCrawlerDeepHelper:
-updated openCrawlDeeperConnection to use new AuthenticationController.buildAuthenticationFactories
JdLog:
-updated to use new AuthenticationController.buildAuthenticationFactories
MegaNzFolder:
-also cache meta information for folder
-removed early check for password, so we can add link without password and will work fine if the folder has been processed already
-fixes post 537516
VoeSxCrawler:
-added new domain
TokyomotionNet:
-updated private handling
LinkCrawler:
-updated openCrawlDeeperConnectionV2 to use new AuthenticationController.buildAuthenticationFactories, also set CrawledLink.setMatchingRule for special handling in other methods
-updated getFirstMatchingRule for special support for BrowserCrawledLink
-updated preprocessFind, refs post 537516
-updated BrowserCrawledLink.getURL to use Request.getURL() URL to also return userInfo

git-svn-id: svn://svn.jdownloader.org/jdownloader/trunk@49452 ebf7c1c2-ba36-0410-9fe8-c592906822b4

Former-commit-id: db342e00546284e81ecda8f22480f2c1d7cd3853
2024-07-29 12:30:33 +00:00
jiaz
0e358fafca AdvancedConfigManager:
-added support for read only config entries, no setter method with StorableValidatorIgnoresMissingSetter
-updated constructor to call HosterRuleController to ensure that HosterRules are available via Advanced Settings before any downloads were started

git-svn-id: svn://svn.jdownloader.org/jdownloader/trunk@49451 ebf7c1c2-ba36-0410-9fe8-c592906822b4

Former-commit-id: 5fffd76b8768365076884664bd5ab9abd8df98ae
2024-07-29 12:17:26 +00:00
jiaz
1442753722 SpeedlimitEditor:
-fixes #XHCK5160-OFLZ-4483SCAB
-updated to use longToText from super to make sure same/correct NumberFormat instance is getting used
PluginForDecrypt:
-added protected getLinkCrawlerGeneration method
DownloadInterface:
-updated getHashResult to support multiple concurrent hash checks
-fixes #66807
GeneralSettings:
-CleanUpPackagenames is default false now
-added MaxConcurrentHashChecks
-refs #66807
AdvancedConfigEntry/BasicAdvancedConfigPluginPanel/ExtensionConfigPanel:
-added support for AdvancedConfigEntry without setter/StorableValidatorIgnoresMissingSetter
AdvancedConfigManager:
UpdateSettings:
-added read only Build setting to read build details
-fixes #AFXV4748-AABA-3607SAVH
AuthenticationController:
-updated buildAuthenticationFactories method
OldRAFDownload:
-updated to use DownloadInterface.getHashResult
ClipboardMonitoring:
-split getHTMLFragment into getMimeTypeFragment and getHTMLFragment

git-svn-id: svn://svn.jdownloader.org/jdownloader/trunk@49450 ebf7c1c2-ba36-0410-9fe8-c592906822b4

Former-commit-id: d1452a52deb3e61311e4ce59a71ff84d0f0d11d7
2024-07-29 12:09:57 +00:00
psp
fbec901279 *General*
- GeneralSettings: added more detailed description for setting 'cleanuppackagenames' RE forum 95955

git-svn-id: svn://svn.jdownloader.org/jdownloader/trunk@49448 ebf7c1c2-ba36-0410-9fe8-c592906822b4

Former-commit-id: 4341d07f83626aa879ca7c2963e449614ce77798
2024-07-29 10:28:20 +00:00
psp
c3aa2c605b *Plugins: Fixes/Changes/Maintenance*
- Rule34Xxx: minor changes
- Ardmediathek: hardcoded preferred language german, will add plugin setting later RE forum 96026

git-svn-id: svn://svn.jdownloader.org/jdownloader/trunk@49447 ebf7c1c2-ba36-0410-9fe8-c592906822b4

Former-commit-id: fedc8e2ee371b1a1bd20f35097da5bd54e07b8c6
2024-07-29 10:27:15 +00:00
psp
552995ca35 *Plugins: Fixes/Changes/Maintenance*
- Rule34Xxx: htmlDecode package name and added missing pagination abort conditions RE ticket #SYGT4639-RAYA-2399SXYA

git-svn-id: svn://svn.jdownloader.org/jdownloader/trunk@49446 ebf7c1c2-ba36-0410-9fe8-c592906822b4

Former-commit-id: abc4abb4b15f6d0c53bd8e9cd0b3da2d06aa9289
2024-07-26 15:55:02 +00:00
jiaz
514da70e99 fixes thread 96189
git-svn-id: svn://svn.jdownloader.org/jdownloader/trunk@49445 ebf7c1c2-ba36-0410-9fe8-c592906822b4

Former-commit-id: 544da5162598d51a9617596df76c8d7eef9ec516
2024-07-26 15:16:21 +00:00
psp
0aba4fc0e8 *Plugins: Fixes/Changes/Maintenance*
- archiveorg: small code cleanup

git-svn-id: svn://svn.jdownloader.org/jdownloader/trunk@49444 ebf7c1c2-ba36-0410-9fe8-c592906822b4

Former-commit-id: 0d7777ab5204d9a14bbacb31800c3f9d0d872910
2024-07-26 15:12:35 +00:00
jiaz
d849083ec9 ArchiveOrgCrawler:
-rewrote audio playlist handling
-added support for ArchiveOrgConfig.isFileCrawlerCrawlOnlyOriginalVersions

git-svn-id: svn://svn.jdownloader.org/jdownloader/trunk@49443 ebf7c1c2-ba36-0410-9fe8-c592906822b4

Former-commit-id: 69d864e6e9a2cb43031bbade7e8876d45d67a3aa
2024-07-26 14:41:01 +00:00
jiaz
ba523bc519 must call LinknameCleaner.cleanPackagename with true, else optional cleanup no longer works
-fixes #SLBS1222-KSMT-2956AJAI

git-svn-id: svn://svn.jdownloader.org/jdownloader/trunk@49442 ebf7c1c2-ba36-0410-9fe8-c592906822b4

Former-commit-id: 532c49b7c12d6cc50dda0b7fb50245e2aef5fbbb
2024-07-26 14:39:06 +00:00
psp
aca33d895c *Plugins: Fixes/Changes/Maintenance*
- [XFS] FastreamTo: added default XFS video plugin settings RE ticket #CDAO0811-EGGV-4914TCZP

git-svn-id: svn://svn.jdownloader.org/jdownloader/trunk@49441 ebf7c1c2-ba36-0410-9fe8-c592906822b4

Former-commit-id: 6ff2393e993200354b632800235145f49003ec5e
2024-07-26 13:35:39 +00:00
psp
ad0f599f32 *Plugins: Fixes/Changes/Maintenance*
- RosefileNet: fixed premium download fixes #90488

git-svn-id: svn://svn.jdownloader.org/jdownloader/trunk@49440 ebf7c1c2-ba36-0410-9fe8-c592906822b4

Former-commit-id: 7efea4fb9b49b3ab23c4b219fa1bb3a513b6de81
2024-07-26 13:19:42 +00:00
psp
c5a0cf2686 *General*
- LinkCrawler: added TODO statement

*Plugins: Fixes/Changes/Maintenance*
- ArchiveOrgCrawler: updated detection of playlist items

git-svn-id: svn://svn.jdownloader.org/jdownloader/trunk@49439 ebf7c1c2-ba36-0410-9fe8-c592906822b4

Former-commit-id: 63138a01db159d1633672d96eaabda77af93c6d0
2024-07-26 13:10:35 +00:00
jiaz
008f2630b3 git-svn-id: svn://svn.jdownloader.org/jdownloader/trunk@49438 ebf7c1c2-ba36-0410-9fe8-c592906822b4
Former-commit-id: 870497b158b2ab2be76e5b9235cd45dd80a200e6
2024-07-26 12:08:17 +00:00
jiaz
456af90511 MegaNz:
-fixed regression in getLinkID
-fixes post 537337
Plugin:
-updated decodeURIComponentFindBestEncoding, do not count Character.UPPERCASE_LETTER/Character.LOWERCASE_LETTER as bad
-fixes #ABMH4207-SBSQ-2251FISU

git-svn-id: svn://svn.jdownloader.org/jdownloader/trunk@49437 ebf7c1c2-ba36-0410-9fe8-c592906822b4

Former-commit-id: 3634907e09756815a24f71ed63d356d04b48d5c0
2024-07-26 11:58:06 +00:00
psp
3730546063 *Plugins: Fixes/Changes/Maintenance*
- TiktokComCrawler: fixed regression in playlist handling

git-svn-id: svn://svn.jdownloader.org/jdownloader/trunk@49436 ebf7c1c2-ba36-0410-9fe8-c592906822b4

Former-commit-id: 5e9f2665d44f7ec0d530881471f61e7644f0f44c
2024-07-26 11:27:10 +00:00
psp
0c9d8b5c2c *Plugins: Fixes/Changes/Maintenance*
- TiktokComCrawler: updated errorhandling, detect when tiktok enforces login to view videos RE ticket #HCYJ6348-PNFJ-2050SEHP
- ArchiveOrgCrawler: fixed "original" download items temporarily getting filenames which only playlist items should get, IDE-only: fixed wrong padding for playlist items due to wrong PROPERTY_PLAYLIST_SIZE

git-svn-id: svn://svn.jdownloader.org/jdownloader/trunk@49435 ebf7c1c2-ba36-0410-9fe8-c592906822b4

Former-commit-id: 1578621925c9427e63e37179e12cf174a833f5d1
2024-07-26 11:26:17 +00:00
psp
cee885d90e *Plugins: Fixes/Changes/Maintenance*
- PornportalComCrawler: adopted crawled for minor WebAPI changes, added loggers and documentation added RE various tickets (u guys are really into porn lol)

git-svn-id: svn://svn.jdownloader.org/jdownloader/trunk@49434 ebf7c1c2-ba36-0410-9fe8-c592906822b4

Former-commit-id: cf49d9d152ef51e2907a1d0729aaf5b1bc409c0d
2024-07-26 10:57:37 +00:00
psp
36ec015715 *Plugins: Fixes/Changes/Maintenance*
- XunniupanCom: updated main domain to xunniuyuncom RE forum 85004
- Rule34Xxx: fixed encoding problem, added detection of strange API behavior when last page is reached RE ticket #SYGT4639-RAYA-2399SXYA

git-svn-id: svn://svn.jdownloader.org/jdownloader/trunk@49433 ebf7c1c2-ba36-0410-9fe8-c592906822b4

Former-commit-id: 5ef4fc441c747db83f5d722b4d0553a01892ebf9
2024-07-26 08:33:42 +00:00
psp
c11cd8c040 *Plugins: Fixes/Changes/Maintenance*
ArchiveOrg:
- fixed playlist handling not being used due to bug in "desired subpath" handling
- fixed regression where non audio items could get (wrong) playlist titles

git-svn-id: svn://svn.jdownloader.org/jdownloader/trunk@49432 ebf7c1c2-ba36-0410-9fe8-c592906822b4

Former-commit-id: 0078972f25e920a5d500930a8c98e66723ac7066
2024-07-25 16:40:39 +00:00
psp
8fce68ea0a *Plugins: Fixes/Changes/Maintenance*
- SankakucomplexCom: updated comment

git-svn-id: svn://svn.jdownloader.org/jdownloader/trunk@49431 ebf7c1c2-ba36-0410-9fe8-c592906822b4

Former-commit-id: 5661ad35603e2039cf54f2fc7d9120327200bd1b
2024-07-25 15:55:55 +00:00
jiaz
47a767f220 DownloadsAPIV2Impl/LinkCollectorAPIImplV2:
-fixed typo in setStatus
-fixes post 537417
CrawledLink:
-changes for LinkCrawler.BrowserCrawledLink extension
LinkCrawler:
-work on crawlDeeperOrMatchingRuleV2 and openCrawlDeeperConnectionV2
-updated openCrawlDeeperConnectionV2 to return BrowserCrawledLink instances


git-svn-id: svn://svn.jdownloader.org/jdownloader/trunk@49430 ebf7c1c2-ba36-0410-9fe8-c592906822b4

Former-commit-id: 1aece82d522efd3a49bdfe582b6194b737cb3144
2024-07-25 15:15:41 +00:00
psp
a8ceffa574 *Plugins: Fixes/Changes/Maintenance*
SankakucomplexCom: RE forum 92365
- added proper detection of invalid direct URLs (sometimes dummy image is shown with content "link expired")
- use website handling for fileIDs which are md5 hash strings

git-svn-id: svn://svn.jdownloader.org/jdownloader/trunk@49429 ebf7c1c2-ba36-0410-9fe8-c592906822b4

Former-commit-id: bb2cf90e6faf7f853491421c15fcc099a4eb4ec0
2024-07-25 14:51:02 +00:00
jiaz
118ca80bff ArchiveOrg:
-refactored playlist/position to support number, number x/y and media-track
-fixes #JZGW4194-CZYW-2148XPVJ

git-svn-id: svn://svn.jdownloader.org/jdownloader/trunk@49428 ebf7c1c2-ba36-0410-9fe8-c592906822b4

Former-commit-id: d863306d47e3519175c8f8e6ae5363df02eb5a0d
2024-07-25 10:12:56 +00:00
psp
f194d348a9 *Plugins: Fixes/Changes/Maintenance*
- cocoleech.com: added workaround for API returning wrong account type information RE forum 96183
- booruorg: updated main domain to tbiborg RE forum 90201

git-svn-id: svn://svn.jdownloader.org/jdownloader/trunk@49427 ebf7c1c2-ba36-0410-9fe8-c592906822b4

Former-commit-id: 08d00ca21b9e36a2b7aba434c604691cd3bb2104
2024-07-25 07:31:14 +00:00
jiaz
096f2c8865 git-svn-id: svn://svn.jdownloader.org/jdownloader/trunk@49426 ebf7c1c2-ba36-0410-9fe8-c592906822b4
Former-commit-id: a7209830aae200b951717f607edb56e2f617b52e
2024-07-24 14:24:20 +00:00