392137 2018-03-21 14:03:35 +0000 Make entry type (and more fields) available in entry id suggestion setup 2018-04-23 19:46:03 +0000 1 1 2 Applications KBibTeX General git (master) Gentoo Packages Linux RESOLVED FIXED NOR wishlist --- 1 bugs.kde.org fischer https://commits.kde.org/kbibtex/3b0c2d42645a0647c6f9370a099964aa64621cc2 0.9 0 oldest_to_newest 1739523 0 bugs.kde.org 2018-03-21 14:03:35 +0000 I am using current git master and I like the shape KBibTeX for Qt5 is in. With the move to Qt5 I had to move to Jabref and now want to move back. There is one thing I miss from Jabref: per-entry type definition of entry id suggestion. For my current purposes, having a block that can insert (the first letter of) the entry type would be sufficient. A further improvement would be to have (all the) blocks conditional on entry type (or sets thereof). Another improvement would be to have all fields available through a generic blocks (per field type, perhaps, so lists differently from scalars etc.) within which is a field selection drop-down box. The current blocks for volume/page and title/journal seem like good candidates. This would allow cutting down on the number of block types as well. 1746981 1 112141 bugs.kde.org 2018-04-20 15:05:56 +0000 Created attachment 112141 patch that adds entry type as an option in the id suggestion interface This patch adds some of the functionality requested in this bugreport. However, I found that the other ideas mentioned would be harder to implement and require more extensive redesign. 1747157 2 fischer 2018-04-21 18:57:40 +0000 I have committed your patch with only minimal changes. It is not yet in the main repository, but you can inspect the commit here: https://commits.kde.org/clones/kbibtex/thomasfischer/kbibtex/7bdc05e07ba3e92713ac57a0da54ea8c2a5bf4e1 I had your commit followed up by a change of myself to support CamelCase-formatted entry types: https://commits.kde.org/clones/kbibtex/thomasfischer/kbibtex/3511f0fb0576692596d874c0f58801d932ba19c4 I plan to make one more change before pushing it to the main repository: In IdSuggestionsEditWidget::IdSuggestionsEditWidgetPrivate::add(TokenType tokenType, bool atTop) you most likely copy'n'pasted from "case ttJournal", where len=1 is set. This means only the first letter of the journal or entry type is used, respectively. This may make sense for journals, where "JAAM" is a good abbreviation for a journal. For entry types which are without spaces, both "inbook" and "inproceedings" become just "i" and both "misc" and "mastersthesis" becomes "m". So, len should be -1. Do you agree? 1747330 3 bugs.kde.org 2018-04-22 21:37:29 +0000 (In reply to Thomas Fischer from comment #2) > I plan to make one more change before pushing it to the main repository: > In IdSuggestionsEditWidget::IdSuggestionsEditWidgetPrivate::add(TokenType > tokenType, bool atTop) you most likely copy'n'pasted from "case ttJournal", > where len=1 is set. This means only the first letter of the journal or entry > type is used, respectively. This may make sense for journals, where "JAAM" > is a good abbreviation for a journal. For entry types which are without > spaces, both "inbook" and "inproceedings" become just "i" and both "misc" > and "mastersthesis" becomes "m". So, len should be -1. Do you agree? I indeed ‘coded’ by copy-paste from the Journal Title ‘example’. However, I intentionally kept "info.len = 1" because that is how I personally use it. I don't mind inbook and inproceedings entries to both get an id with ‘i’ in the same location. The ‘i’ of ‘in’ provides sufficient extra info. But I don't mind at all if the default is changed to -1, as long as I can still manually set 1. 1747564 4 fischer 2018-04-23 19:46:03 +0000 Git commit 5356c3a2b35429de96d1d78c9d19d70fd60a2d1e by Thomas Fischer, on behalf of Erik Quaeghebeur. Committed on 23/04/2018 at 05:53. Pushed by thomasfischer into branch 'master'. Adding 'Type' as a new component in Id Suggestions Adding 'Type' (article, journal, ...) as a component of a suggested entry id just like being able to have authors or title as a component. M +77 -1 src/gui/preferences/settingsidsuggestionseditor.cpp M +34 -1 src/processing/idsuggestions.cpp https://commits.kde.org/kbibtex/5356c3a2b35429de96d1d78c9d19d70fd60a2d1e 1747565 5 fischer 2018-04-23 19:46:03 +0000 Git commit 3b0c2d42645a0647c6f9370a099964aa64621cc2 by Thomas Fischer. Committed on 23/04/2018 at 05:53. Pushed by thomasfischer into branch 'master'. Id suggestion's 'type' supports CamelCase The 'type' component introduced in a recent commit (5356c3a2b35) now supports CamelCase formatting. FIXED-IN: 0.9 M +3 -0 src/gui/preferences/settingsidsuggestionseditor.cpp M +18 -4 src/processing/idsuggestions.cpp https://commits.kde.org/kbibtex/3b0c2d42645a0647c6f9370a099964aa64621cc2 112141 2018-04-20 15:05:56 +0000 2018-04-20 15:05:56 +0000 patch that adds entry type as an option in the id suggestion interface 0001-add-entry-type-as-option-in-id-suggestion-interface.patch text/plain 8807 bugs.kde.org RnJvbSA1YmZjNjM3NTU4ZjQ5ZmQxNDEyNzJkYzE2MTY4ZTA3MThlM2Q2YjcyIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBFcmlrIFF1YWVnaGViZXVyIDxrZGVAZXF1YWVnaGUubm9zcGFt bWFpbC5uZXQ+CkRhdGU6IEZyaSwgMjAgQXByIDIwMTggMTY6NTk6NTIgKzAyMDAKU3ViamVjdDog W1BBVENIXSBhZGQgZW50cnkgdHlwZSBhcyBvcHRpb24gaW4gaWQgc3VnZ2VzdGlvbiBpbnRlcmZh Y2UKCi0tLQogLi4uL3ByZWZlcmVuY2VzL3NldHRpbmdzaWRzdWdnZXN0aW9uc2VkaXRvci5jcHAg ICAgfCA3NCArKysrKysrKysrKysrKysrKysrKystCiBzcmMvcHJvY2Vzc2luZy9pZHN1Z2dlc3Rp b25zLmNwcCAgICAgICAgICAgICAgICAgICB8IDMzICsrKysrKysrKysKIDIgZmlsZXMgY2hhbmdl ZCwgMTA2IGluc2VydGlvbnMoKyksIDEgZGVsZXRpb24oLSkKCmRpZmYgLS1naXQgYS9zcmMvZ3Vp L3ByZWZlcmVuY2VzL3NldHRpbmdzaWRzdWdnZXN0aW9uc2VkaXRvci5jcHAgYi9zcmMvZ3VpL3By ZWZlcmVuY2VzL3NldHRpbmdzaWRzdWdnZXN0aW9uc2VkaXRvci5jcHAKaW5kZXggMzRiYzUwMmEu LjA5NWQyMDZhIDEwMDY0NAotLS0gYS9zcmMvZ3VpL3ByZWZlcmVuY2VzL3NldHRpbmdzaWRzdWdn ZXN0aW9uc2VkaXRvci5jcHAKKysrIGIvc3JjL2d1aS9wcmVmZXJlbmNlcy9zZXR0aW5nc2lkc3Vn Z2VzdGlvbnNlZGl0b3IuY3BwCkBAIC0zODcsNiArMzg3LDU4IEBAIHB1YmxpYzoKICAgICB9CiB9 OwogCitjbGFzcyBUeXBlV2lkZ2V0IDogcHVibGljIFRva2VuV2lkZ2V0Cit7CisgICAgUV9PQkpF Q1QKKworcHJpdmF0ZToKKyAgICBLQ29tYm9Cb3ggKmNvbWJvQm94Q2hhbmdlQ2FzZTsKKyAgICBR U3BpbkJveCAqc3BpbkJveExlbmd0aDsKKworcHVibGljOgorICAgIFR5cGVXaWRnZXQoY29uc3Qg c3RydWN0IElkU3VnZ2VzdGlvbnM6OklkU3VnZ2VzdGlvblRva2VuSW5mbyAmaW5mbywgSWRTdWdn ZXN0aW9uc0VkaXRXaWRnZXQgKmlzZXcsIFFXaWRnZXQgKnBhcmVudCkKKyAgICAgICAgICAgIDog VG9rZW5XaWRnZXQocGFyZW50KQorICAgIHsKKyAgICAgICAgc2V0VGl0bGUoaTE4bigiVHlwZSIp KTsKKworICAgICAgICBRQm94TGF5b3V0ICpib3hMYXlvdXQgPSBuZXcgUVZCb3hMYXlvdXQoKTsK KyAgICAgICAgYm94TGF5b3V0LT5zZXRNYXJnaW4oMCk7CisKKyAgICAgICAgY29tYm9Cb3hDaGFu Z2VDYXNlID0gbmV3IEtDb21ib0JveChmYWxzZSwgdGhpcyk7CisgICAgICAgIGNvbWJvQm94Q2hh bmdlQ2FzZS0+YWRkSXRlbShpMThuKCJObyBjaGFuZ2UiKSwgSWRTdWdnZXN0aW9uczo6Y2NOb0No YW5nZSk7CisgICAgICAgIGNvbWJvQm94Q2hhbmdlQ2FzZS0+YWRkSXRlbShpMThuKCJUbyB1cHBl ciBjYXNlIiksIElkU3VnZ2VzdGlvbnM6OmNjVG9VcHBlcik7CisgICAgICAgIGNvbWJvQm94Q2hh bmdlQ2FzZS0+YWRkSXRlbShpMThuKCJUbyBsb3dlciBjYXNlIiksIElkU3VnZ2VzdGlvbnM6OmNj VG9Mb3dlcik7CisgICAgICAgIGZvcm1MYXlvdXQtPmFkZFJvdyhpMThuKCJDaGFuZ2UgY2FzaW5n OiIpLCBjb21ib0JveENoYW5nZUNhc2UpOworICAgICAgICBjb21ib0JveENoYW5nZUNhc2UtPnNl dEN1cnJlbnRJbmRleCgoaW50KWluZm8uY2FzZUNoYW5nZSk7IC8vLyBlbnVtIGhhcyBudW1iZXJz IGFzc2lnbmVkIHRvIGNhc2VzIGFuZCBjb21ibyBib3ggaGFzIHNhbWUgaW5kaWNlcworCisgICAg ICAgIHNwaW5Cb3hMZW5ndGggPSBuZXcgUVNwaW5Cb3godGhpcyk7CisgICAgICAgIGZvcm1MYXlv dXQtPmFkZFJvdyhpMThuKCJPbmx5IGZpcnN0IGNoYXJhY3RlcnM6IiksIHNwaW5Cb3hMZW5ndGgp OworICAgICAgICBzcGluQm94TGVuZ3RoLT5zZXRTcGVjaWFsVmFsdWVUZXh0KGkxOG4oIk5vIGxp bWl0YXRpb24iKSk7CisgICAgICAgIHNwaW5Cb3hMZW5ndGgtPnNldE1pbmltdW0oMCk7CisgICAg ICAgIHNwaW5Cb3hMZW5ndGgtPnNldE1heGltdW0oOSk7CisgICAgICAgIHNwaW5Cb3hMZW5ndGgt PnNldFZhbHVlKGluZm8ubGVuID09IDAgfHwgaW5mby5sZW4gPiA5ID8gMCA6IGluZm8ubGVuKTsK KworICAgICAgICBjb25uZWN0KGNvbWJvQm94Q2hhbmdlQ2FzZSwgc3RhdGljX2Nhc3Q8dm9pZChR Q29tYm9Cb3g6OiopKGludCk+KCZRQ29tYm9Cb3g6OmN1cnJlbnRJbmRleENoYW5nZWQpLCBpc2V3 LCAmSWRTdWdnZXN0aW9uc0VkaXRXaWRnZXQ6OnVwZGF0ZVByZXZpZXcpOworICAgICAgICBjb25u ZWN0KHNwaW5Cb3hMZW5ndGgsIHN0YXRpY19jYXN0PHZvaWQoUVNwaW5Cb3g6OiopKGludCk+KCZR U3BpbkJveDo6dmFsdWVDaGFuZ2VkKSwgaXNldywgJklkU3VnZ2VzdGlvbnNFZGl0V2lkZ2V0Ojp1 cGRhdGVQcmV2aWV3KTsKKyAgICB9CisKKyAgICBRU3RyaW5nIHRvU3RyaW5nKCkgY29uc3Qgb3Zl cnJpZGUKKyAgICB7CisgICAgICAgIFFTdHJpbmcgcmVzdWx0ID0gUVN0cmluZ0xpdGVyYWwoImUi KTsKKworICAgICAgICBpZiAoc3BpbkJveExlbmd0aC0+dmFsdWUoKSA+IDApCisgICAgICAgICAg ICByZXN1bHQuYXBwZW5kKFFTdHJpbmc6Om51bWJlcihzcGluQm94TGVuZ3RoLT52YWx1ZSgpKSk7 CisKKyAgICAgICAgSWRTdWdnZXN0aW9uczo6Q2FzZUNoYW5nZSBjYXNlQ2hhbmdlID0gKElkU3Vn Z2VzdGlvbnM6OkNhc2VDaGFuZ2UpY29tYm9Cb3hDaGFuZ2VDYXNlLT5jdXJyZW50SW5kZXgoKTsK KyAgICAgICAgaWYgKGNhc2VDaGFuZ2UgPT0gSWRTdWdnZXN0aW9uczo6Y2NUb0xvd2VyKQorICAg ICAgICAgICAgcmVzdWx0LmFwcGVuZChRU3RyaW5nTGl0ZXJhbCgibCIpKTsKKyAgICAgICAgZWxz ZSBpZiAoY2FzZUNoYW5nZSA9PSBJZFN1Z2dlc3Rpb25zOjpjY1RvVXBwZXIpCisgICAgICAgICAg ICByZXN1bHQuYXBwZW5kKFFTdHJpbmdMaXRlcmFsKCJ1IikpOworCisgICAgICAgIHJldHVybiBy ZXN1bHQ7CisgICAgfQorfTsKKwogY2xhc3MgVGV4dFdpZGdldCA6IHB1YmxpYyBUb2tlbldpZGdl dAogewogICAgIFFfT0JKRUNUCkBAIC00MTcsNyArNDY5LDcgQEAgY2xhc3MgSWRTdWdnZXN0aW9u c0VkaXRXaWRnZXQ6OklkU3VnZ2VzdGlvbnNFZGl0V2lkZ2V0UHJpdmF0ZQogcHJpdmF0ZToKICAg ICBJZFN1Z2dlc3Rpb25zRWRpdFdpZGdldCAqcDsKIHB1YmxpYzoKLSAgICBlbnVtIFRva2VuVHlw ZSB7dHRUaXRsZSwgdHRBdXRob3IsIHR0WWVhciwgdHRKb3VybmFsLCB0dFRleHQsIHR0Vm9sdW1l LCB0dFBhZ2VOdW1iZXJ9OworICAgIGVudW0gVG9rZW5UeXBlIHt0dFRpdGxlLCB0dEF1dGhvciwg dHRZZWFyLCB0dEpvdXJuYWwsIHR0VHlwZSwgdHRUZXh0LCB0dFZvbHVtZSwgdHRQYWdlTnVtYmVy fTsKIAogICAgIFFXaWRnZXQgKmNvbnRhaW5lcjsKICAgICBRQm94TGF5b3V0ICpjb250YWluZXJM YXlvdXQ7CkBAIC00NzAsNiArNTIyLDggQEAgcHVibGljOgogICAgICAgICBzaWduYWxNYXBwZXJB ZGRNZW51LT5zZXRNYXBwaW5nKGFjdGlvbiwgLXR0WWVhcik7CiAgICAgICAgIGFjdGlvbiA9IG1l bnVBZGRUb2tlbi0+YWRkQWN0aW9uKGkxOG4oIkpvdXJuYWwiKSwgc2lnbmFsTWFwcGVyQWRkTWVu dSwgc3RhdGljX2Nhc3Q8dm9pZChRU2lnbmFsTWFwcGVyOjoqKSgpPigmUVNpZ25hbE1hcHBlcjo6 bWFwKSk7CiAgICAgICAgIHNpZ25hbE1hcHBlckFkZE1lbnUtPnNldE1hcHBpbmcoYWN0aW9uLCAt dHRKb3VybmFsKTsKKyAgICAgICAgYWN0aW9uID0gbWVudUFkZFRva2VuLT5hZGRBY3Rpb24oaTE4 bigiVHlwZSIpLCBzaWduYWxNYXBwZXJBZGRNZW51LCBzdGF0aWNfY2FzdDx2b2lkKFFTaWduYWxN YXBwZXI6OiopKCk+KCZRU2lnbmFsTWFwcGVyOjptYXApKTsKKyAgICAgICAgc2lnbmFsTWFwcGVy QWRkTWVudS0+c2V0TWFwcGluZyhhY3Rpb24sIC10dFR5cGUpOwogICAgICAgICBhY3Rpb24gPSBt ZW51QWRkVG9rZW4tPmFkZEFjdGlvbihpMThuKCJWb2x1bWUiKSwgc2lnbmFsTWFwcGVyQWRkTWVu dSwgc3RhdGljX2Nhc3Q8dm9pZChRU2lnbmFsTWFwcGVyOjoqKSgpPigmUVNpZ25hbE1hcHBlcjo6 bWFwKSk7CiAgICAgICAgIHNpZ25hbE1hcHBlckFkZE1lbnUtPnNldE1hcHBpbmcoYWN0aW9uLCAt dHRWb2x1bWUpOwogICAgICAgICBhY3Rpb24gPSBtZW51QWRkVG9rZW4tPmFkZEFjdGlvbihpMThu KCJQYWdlIE51bWJlciIpLCBzaWduYWxNYXBwZXJBZGRNZW51LCBzdGF0aWNfY2FzdDx2b2lkKFFT aWduYWxNYXBwZXI6OiopKCk+KCZRU2lnbmFsTWFwcGVyOjptYXApKTsKQEAgLTQ4OSw2ICs1NDMs OCBAQCBwdWJsaWM6CiAgICAgICAgIHNpZ25hbE1hcHBlckFkZE1lbnUtPnNldE1hcHBpbmcoYWN0 aW9uLCB0dFllYXIpOwogICAgICAgICBhY3Rpb24gPSBtZW51QWRkVG9rZW4tPmFkZEFjdGlvbihp MThuKCJKb3VybmFsIiksIHNpZ25hbE1hcHBlckFkZE1lbnUsIHN0YXRpY19jYXN0PHZvaWQoUVNp Z25hbE1hcHBlcjo6KikoKT4oJlFTaWduYWxNYXBwZXI6Om1hcCkpOwogICAgICAgICBzaWduYWxN YXBwZXJBZGRNZW51LT5zZXRNYXBwaW5nKGFjdGlvbiwgdHRKb3VybmFsKTsKKyAgICAgICAgYWN0 aW9uID0gbWVudUFkZFRva2VuLT5hZGRBY3Rpb24oaTE4bigiVHlwZSIpLCBzaWduYWxNYXBwZXJB ZGRNZW51LCBzdGF0aWNfY2FzdDx2b2lkKFFTaWduYWxNYXBwZXI6OiopKCk+KCZRU2lnbmFsTWFw cGVyOjptYXApKTsKKyAgICAgICAgc2lnbmFsTWFwcGVyQWRkTWVudS0+c2V0TWFwcGluZyhhY3Rp b24sIHR0VHlwZSk7CiAgICAgICAgIGFjdGlvbiA9IG1lbnVBZGRUb2tlbi0+YWRkQWN0aW9uKGkx OG4oIlZvbHVtZSIpLCBzaWduYWxNYXBwZXJBZGRNZW51LCBzdGF0aWNfY2FzdDx2b2lkKFFTaWdu YWxNYXBwZXI6OiopKCk+KCZRU2lnbmFsTWFwcGVyOjptYXApKTsKICAgICAgICAgc2lnbmFsTWFw cGVyQWRkTWVudS0+c2V0TWFwcGluZyhhY3Rpb24sIHR0Vm9sdW1lKTsKICAgICAgICAgYWN0aW9u ID0gbWVudUFkZFRva2VuLT5hZGRBY3Rpb24oaTE4bigiUGFnZSBOdW1iZXIiKSwgc2lnbmFsTWFw cGVyQWRkTWVudSwgc3RhdGljX2Nhc3Q8dm9pZChRU2lnbmFsTWFwcGVyOjoqKSgpPigmUVNpZ25h bE1hcHBlcjo6bWFwKSk7CkBAIC01NjAsNiArNjE2LDE3IEBAIHB1YmxpYzoKICAgICAgICAgICAg IHRva2VuV2lkZ2V0ID0gbmV3IEpvdXJuYWxXaWRnZXQoaW5mbywgcCwgY29udGFpbmVyKTsKICAg ICAgICAgfQogICAgICAgICBicmVhazsKKyAgICAgICAgY2FzZSB0dFR5cGU6IHsKKyAgICAgICAg ICAgIHN0cnVjdCBJZFN1Z2dlc3Rpb25zOjpJZFN1Z2dlc3Rpb25Ub2tlbkluZm8gaW5mbzsKKyAg ICAgICAgICAgIGluZm8uaW5CZXR3ZWVuID0gUVN0cmluZygpOworICAgICAgICAgICAgaW5mby5s ZW4gPSAxOworICAgICAgICAgICAgaW5mby5zdGFydFdvcmQgPSAwOworICAgICAgICAgICAgaW5m by5lbmRXb3JkID0gMHgwMGZmZmZmZjsKKyAgICAgICAgICAgIGluZm8ubGFzdFdvcmQgPSBmYWxz ZTsKKyAgICAgICAgICAgIGluZm8uY2FzZUNoYW5nZSA9IElkU3VnZ2VzdGlvbnM6OmNjTm9DaGFu Z2U7CisgICAgICAgICAgICB0b2tlbldpZGdldCA9IG5ldyBUeXBlV2lkZ2V0KGluZm8sIHAsIGNv bnRhaW5lcik7CisgICAgICAgIH0KKyAgICAgICAgYnJlYWs7CiAgICAgICAgIGNhc2UgdHRUZXh0 OgogICAgICAgICAgICAgdG9rZW5XaWRnZXQgPSBuZXcgVGV4dFdpZGdldChRU3RyaW5nKCksIHAs IGNvbnRhaW5lcik7CiAgICAgICAgICAgICBicmVhazsKQEAgLTYxNyw2ICs2ODQsMTEgQEAgcHVi bGljOgogICAgICAgICAgICAgICAgIHRva2VuV2lkZ2V0ID0gbmV3IEpvdXJuYWxXaWRnZXQoaW5m bywgcCwgY29udGFpbmVyKTsKICAgICAgICAgICAgICAgICB3aWRnZXRMaXN0IDw8IHRva2VuV2lk Z2V0OwogICAgICAgICAgICAgICAgIGNvbnRhaW5lckxheW91dC0+aW5zZXJ0V2lkZ2V0KGNvbnRh aW5lckxheW91dC0+Y291bnQoKSAtIDIsIHRva2VuV2lkZ2V0LCAxKTsKKyAgICAgICAgICAgIH0g ZWxzZSBpZiAodG9rZW5bMF0gPT0gJ2UnKSB7CisgICAgICAgICAgICAgICAgc3RydWN0IElkU3Vn Z2VzdGlvbnM6OklkU3VnZ2VzdGlvblRva2VuSW5mbyBpbmZvID0gcC0+ZXZhbFRva2VuKHRva2Vu Lm1pZCgxKSk7CisgICAgICAgICAgICAgICAgdG9rZW5XaWRnZXQgPSBuZXcgVHlwZVdpZGdldChp bmZvLCBwLCBjb250YWluZXIpOworICAgICAgICAgICAgICAgIHdpZGdldExpc3QgPDwgdG9rZW5X aWRnZXQ7CisgICAgICAgICAgICAgICAgY29udGFpbmVyTGF5b3V0LT5pbnNlcnRXaWRnZXQoY29u dGFpbmVyTGF5b3V0LT5jb3VudCgpIC0gMiwgdG9rZW5XaWRnZXQsIDEpOwogICAgICAgICAgICAg fSBlbHNlIGlmICh0b2tlblswXSA9PSAndicpIHsKICAgICAgICAgICAgICAgICB0b2tlbldpZGdl dCA9IG5ldyBWb2x1bWVXaWRnZXQocCwgY29udGFpbmVyKTsKICAgICAgICAgICAgICAgICB3aWRn ZXRMaXN0IDw8IHRva2VuV2lkZ2V0OwpkaWZmIC0tZ2l0IGEvc3JjL3Byb2Nlc3NpbmcvaWRzdWdn ZXN0aW9ucy5jcHAgYi9zcmMvcHJvY2Vzc2luZy9pZHN1Z2dlc3Rpb25zLmNwcAppbmRleCBhMDA5 Njk5Zi4uNTQ3NGYyMDAgMTAwNjQ0Ci0tLSBhL3NyYy9wcm9jZXNzaW5nL2lkc3VnZ2VzdGlvbnMu Y3BwCisrKyBiL3NyYy9wcm9jZXNzaW5nL2lkc3VnZ2VzdGlvbnMuY3BwCkBAIC0yMDAsNiArMjAw LDE5IEBAIHB1YmxpYzoKICAgICAgICAgcmV0dXJuIHJlc3VsdDsKICAgICB9CiAKKyAgICBRU3Ry aW5nIHRyYW5zbGF0ZVR5cGVUb2tlbihjb25zdCBFbnRyeSAmZW50cnksIGNvbnN0IHN0cnVjdCBJ ZFN1Z2dlc3Rpb25Ub2tlbkluZm8gJmV0aSkgY29uc3QgeworICAgICAgICBRU3RyaW5nIGVudHJ5 VHlwZShlbnRyeS50eXBlKCkubGVmdChldGkubGVuKSk7CisKKyAgICAgICAgc3dpdGNoIChldGku Y2FzZUNoYW5nZSkgeworICAgICAgICBjYXNlIElkU3VnZ2VzdGlvbnM6OmNjVG9VcHBlcjoKKyAg ICAgICAgICAgIHJldHVybiBlbnRyeVR5cGUudG9VcHBlcigpOworICAgICAgICBjYXNlIElkU3Vn Z2VzdGlvbnM6OmNjVG9Mb3dlcjoKKyAgICAgICAgICAgIHJldHVybiBlbnRyeVR5cGUudG9Mb3dl cigpOworICAgICAgICBkZWZhdWx0OgorICAgICAgICAgICAgcmV0dXJuIGVudHJ5VHlwZTsKKyAg ICAgICAgfQorICAgIH0KKwogICAgIFFTdHJpbmcgdHJhbnNsYXRlVG9rZW4oY29uc3QgRW50cnkg JmVudHJ5LCBjb25zdCBRU3RyaW5nICZ0b2tlbikgY29uc3QgewogICAgICAgICBzd2l0Y2ggKHRv a2VuWzBdLnRvTGF0aW4xKCkpIHsKICAgICAgICAgY2FzZSAnYSc6IC8vLzwgZGVwcmVjYXRlZCBi dXQgc3RpbGwgc3VwcG9ydGVkIGNhc2UKQEAgLTI0Niw2ICsyNTksMTEgQEAgcHVibGljOgogICAg ICAgICAgICAgY29uc3Qgc3RydWN0IElkU3VnZ2VzdGlvblRva2VuSW5mbyBqdGkgPSBwLT5ldmFs VG9rZW4odG9rZW4ubWlkKDEpKTsKICAgICAgICAgICAgIHJldHVybiB0cmFuc2xhdGVKb3VybmFs VG9rZW4oZW50cnksIGp0aSk7CiAgICAgICAgIH0KKyAgICAgICAgY2FzZSAnZSc6IHsKKyAgICAg ICAgICAgIC8vLyBFdmFsdWF0ZSB0aGUgdG9rZW4gc3RyaW5nLCBzdG9yZSBpbmZvcm1hdGlvbiBp biBzdHJ1Y3QgSWRTdWdnZXN0aW9uVG9rZW5JbmZvIGp0aQorICAgICAgICAgICAgY29uc3Qgc3Ry dWN0IElkU3VnZ2VzdGlvblRva2VuSW5mbyBldGkgPSBwLT5ldmFsVG9rZW4odG9rZW4ubWlkKDEp KTsKKyAgICAgICAgICAgIHJldHVybiB0cmFuc2xhdGVUeXBlVG9rZW4oZW50cnksIGV0aSk7Cisg ICAgICAgIH0KICAgICAgICAgY2FzZSAndic6IHsKICAgICAgICAgICAgIHJldHVybiBub3JtYWxp emVUZXh0KFBsYWluVGV4dFZhbHVlOjp0ZXh0KGVudHJ5LnZhbHVlKEVudHJ5OjpmdFZvbHVtZSkp KTsKICAgICAgICAgfQpAQCAtNDEyLDYgKzQzMCwyMSBAQCBRU3RyaW5nTGlzdCBJZFN1Z2dlc3Rp b25zOjpmb3JtYXRTdHJUb0h1bWFuKGNvbnN0IFFTdHJpbmcgJmZvcm1hdFN0cikgY29uc3QKICAg ICAgICAgICAgIGNhc2UgSWRTdWdnZXN0aW9uczo6Y2NOb0NoYW5nZToKICAgICAgICAgICAgICAg ICBicmVhazsKICAgICAgICAgICAgIH0KKyAgICAgICAgfSBlbHNlIGlmICh0b2tlblswXSA9PSAn ZScpIHsKKyAgICAgICAgICAgIHN0cnVjdCBJZFN1Z2dlc3Rpb25Ub2tlbkluZm8gaW5mbyA9IGV2 YWxUb2tlbih0b2tlbi5taWQoMSkpOworICAgICAgICAgICAgdGV4dC5hcHBlbmQoaTE4bigiVHlw ZSIpKTsKKyAgICAgICAgICAgIGlmIChpbmZvLmxlbiA8IDB4MDBmZmZmZmYpCisgICAgICAgICAg ICAgICAgdGV4dC5hcHBlbmQoaTE4bnAoIiwgYnV0IG9ubHkgZmlyc3QgbGV0dGVyIG9mIGVhY2gg d29yZCIsICIsIGJ1dCBvbmx5IGZpcnN0ICUxIGxldHRlcnMgb2YgZWFjaCB3b3JkIiwgaW5mby5s ZW4pKTsKKyAgICAgICAgICAgIHN3aXRjaCAoaW5mby5jYXNlQ2hhbmdlKSB7CisgICAgICAgICAg ICBjYXNlIElkU3VnZ2VzdGlvbnM6OmNjVG9VcHBlcjoKKyAgICAgICAgICAgICAgICB0ZXh0LmFw cGVuZChpMThuKCIsIGluIHVwcGVyIGNhc2UiKSk7CisgICAgICAgICAgICAgICAgYnJlYWs7Cisg ICAgICAgICAgICBjYXNlIElkU3VnZ2VzdGlvbnM6OmNjVG9Mb3dlcjoKKyAgICAgICAgICAgICAg ICB0ZXh0LmFwcGVuZChpMThuKCIsIGluIGxvd2VyIGNhc2UiKSk7CisgICAgICAgICAgICAgICAg YnJlYWs7CisgICAgICAgICAgICBkZWZhdWx0OgorICAgICAgICAgICAgICAgIGJyZWFrOworICAg ICAgICAgICAgfQogICAgICAgICB9IGVsc2UgaWYgKHRva2VuWzBdID09ICd2JykgewogICAgICAg ICAgICAgdGV4dC5hcHBlbmQoaTE4bigiVm9sdW1lIikpOwogICAgICAgICB9IGVsc2UgaWYgKHRv a2VuWzBdID09ICdwJykgewotLSAKMi4xNi4xCgo=