Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bNKgh-0006Wz-Fh for pgadmin-hackers@arkaria.postgresql.org; Wed, 13 Jul 2016 13:58:55 +0000 Received: from localhost ([127.0.0.1] helo=postgresql.org) by malur.postgresql.org with smtp (Exim 4.84_2) (envelope-from ) id 1bNKgh-0003D6-2c for pgadmin-hackers@arkaria.postgresql.org; Wed, 13 Jul 2016 13:58:55 +0000 Received: from makus.postgresql.org ([2001:4800:1501:1::229]) by malur.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1bNKgT-0002zF-Dt for pgadmin-hackers@postgresql.org; Wed, 13 Jul 2016 13:58:41 +0000 Received: from mail-wm0-x231.google.com ([2a00:1450:400c:c09::231]) by makus.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.84_2) (envelope-from ) id 1bNKgP-0006YG-R2 for pgadmin-hackers@postgresql.org; Wed, 13 Jul 2016 13:58:40 +0000 Received: by mail-wm0-x231.google.com with SMTP id o80so70690723wme.1 for ; Wed, 13 Jul 2016 06:58:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=enterprisedb-com.20150623.gappssmtp.com; s=20150623; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=Pty2DDIgpkq6CXuzFvpwD/Esii7L+daFzCBPbHGxWb8=; b=oH7pfAxB7gkgSMZynrB7fqK/tKeMRftR7cIFgJNqSJZEoSBmesMb+Ww51Dcejoycrw ha7uyz0EKx9/39S/sCZZZKHmPXoAU+LqSpPo8CzYOcrDDv6Sim67HMcT1NKPeLYr1E0N 35iWJXDnGEZyv9HMqZXAC8QbpmwMwK3yBK/tmAmbjmZjG+YlSBRIsGqlPtNHCeXexDkR G6IcL79F7/HU4q+HPQF7vsuq8kcrdD9Tns88wvk9f21xB38q5CcE0jcETJHU0jA1iyAg cpWOrhh/l1ntnj0NwQO1C79QEActp3uaymIcwjlAVCY2ooJknNWB14dkASyoFDl4t6Gt DTMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=Pty2DDIgpkq6CXuzFvpwD/Esii7L+daFzCBPbHGxWb8=; b=c7j9v3+rwK+tWGtiOoKDsv3lGHnfgg49Jhf4qS8hpayClQdX8Po9zDkE8agbS02wGp Zs51ghk2F0/PlmQ1Qk86eNbMKjxI55LJwPP/c+gNrUoPj7t1cFaa3d23WEObwzLACuFv iQsluH259LqQN7gTt24P42oaSSBvCU2BDHWHue2KU8DWi0IjCu9gjny1dOtL5WY2YRBH hW2xFinJmAtGhCrHgOt7jiJqOrvYDTssp+sNWhwFrYCwhBpqTkVPqPSrPMjq7/7N6Huo OLT1n5QxoZQ3vQDXopmESZQlD/ihJPVYuKdxNhPGphKqtyGVP1oSDlHnqZIczFBdZt7Y 9wEw== X-Gm-Message-State: ALyK8tJtP8pI+45yOLhE258HMldDsKtZPP6ZgPxtVwXq0EfwDg6oog0dLH/I33arHkhY8Q3XKciJeP1tXBkDCmlA X-Received: by 10.194.169.199 with SMTP id ag7mr1098543wjc.144.1468418315530; Wed, 13 Jul 2016 06:58:35 -0700 (PDT) MIME-Version: 1.0 Received: by 10.28.54.164 with HTTP; Wed, 13 Jul 2016 06:58:05 -0700 (PDT) In-Reply-To: References: From: Surinder Kumar Date: Wed, 13 Jul 2016 19:28:05 +0530 Message-ID: Subject: Re: [pgAdmin4][Patch]: RM#1432 - File Browser - File does not exist error To: Dave Page Cc: Marc Linster , pgadmin-hackers Content-Type: multipart/mixed; boundary=089e0122799e15708d053784c885 X-Pg-Spam-Score: -2.6 (--) List-Archive: List-Help: List-ID: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: X-Mailing-List: pgadmin-hackers Precedence: bulk Sender: pgadmin-hackers-owner@postgresql.org --089e0122799e15708d053784c885 Content-Type: multipart/alternative; boundary=089e0122799e157087053784c883 --089e0122799e157087053784c883 Content-Type: text/plain; charset=UTF-8 Please find updated patch. This patch also includes the fix for issue "File Browser - File does not exist error". On Wed, Jul 13, 2016 at 7:23 PM, Surinder Kumar < surinder.kumar@enterprisedb.com> wrote: > I forgot to merge the fix for issue "File Browser - File does not exist > error" in the patch. > Please ignore this patch. > > On Wed, Jul 13, 2016 at 7:20 PM, Surinder Kumar < > surinder.kumar@enterprisedb.com> wrote: > >> Please find updated patch with following changes/enhancements: >> >> 1. Double click on file/folder icon or name will navigate to the >> folder/file. >> 2. Selected file/folder can be renamed by Rename button only. Double >> click rename is removed. >> 3. Filename text box will not hide on smaller screen. Setting minimum >> width of File Browser fixed it. >> 4. Path at top will only show directory name, not the file name and >> it is greyed out. >> >> *Issue not fixed:* >> Icons and fonts of Query tool and File Browser looks blurred in Runtime >> environment. >> I tried debugging it. while debugging, It gets fixed on my ubuntu >> runtime. but I don't know how it gets fixed without changing css styles. It >> needs more time to debug. >> >> Please review. >> >> On Wed, Jul 13, 2016 at 5:15 PM, Dave Page wrote: >> >>> On Tue, Jul 12, 2016 at 7:10 AM, Surinder Kumar >>> wrote: >>> > On Mon, Jul 11, 2016 at 6:41 PM, Dave Page wrote: >>> >> >>> >> On Thu, Jul 7, 2016 at 1:50 PM, Surinder Kumar >>> >> wrote: >>> >> > On Wed, Jul 6, 2016 at 7:02 PM, Surinder Kumar >>> >> > wrote: >>> >> >> >>> >> >> On Wed, Jul 6, 2016 at 5:40 PM, Dave Page >>> wrote: >>> >> >>> >>> >> >>> Hi, >>> >> >>> >>> >> >>> I think we need more changes than just that; >>> >> >>> >>> >> >>> - The path at the top should not be editable (it should be greyed >>> in >>> >> >>> fact) >>> >> >> >>> >> >> Ok >>> >> >>> >>> >> >>> >>> >> >>> - The path at the top should only show the directory path. The >>> >> >>> filename should never be appended. >>> >> >> >>> >> >> Ok >>> >> >>> >>> >> >>> >>> >> >>> - The CSS needs to be fixed so the filename textbox at the bottom >>> is >>> >> >>> never hidden (as it is now if the dialogue opens at a small size). >>> >> >> >>> >> >> Ok >>> >> >>> >>> >> >>> >>> >> >>> - Double-click to navigate vs. rename should be modified to work >>> in >>> >> >>> part like it does on Mac - Double-click on either the icon or the >>> name >>> >> >>> should open the item (browser into a folder, or select and "OK" >>> on a >>> >> >>> file), and Click then Enter should rename. I'm hesitant to try to >>> >> >>> implement "slow double click to rename" as that would likely need >>> to >>> >> >>> be tunable for accessibility reasons. >>> >> >> >>> >> >> Ok, I will fix it. >>> >> > >>> >> > In the current scenario, the Enter Key is bound to the OK button by >>> >> > default >>> >> > in Alertify dialog which servers the purpose of closing the dialog. >>> >> > Should we de-attach Enter Key event bound to OK button and use it >>> for >>> >> > rename >>> >> > file? >>> >> > please suggest what should I do? >>> >> >>> >> Hmm, good point. >>> >> >>> >> How hard would it be to look for 2 consecutive single-clicks (but not >>> >> a double-click) for rename? If we can do that, it avoids timing >>> >> considerations for double-clicks (which would be defined by the OS). >>> > >>> > >>> > I tried to implement slow double click, here is Fiddle >>> > There are two events 1) double click (it will be used for folder >>> navigation) >>> > 2) Slow double click(For rename), It is a simple click event, when >>> clicked >>> > twice after delay we consider it a slow double click. >>> > >>> > But it is not working smoothly, double click and single click events >>> are >>> > conflicting. >>> >>> Yeah, so I see. >>> >>> > Also, we have rename button in navigation for rename operation, >>> > Can we skip slow double click because it is very confusing? >>> >>> OK, I must have been having a brain failure moment or something. Yes, >>> skip it - we obviously don't need it with the rename button. >>> >>> So we have: >>> >>> - Click to select >>> - Double click to open a folder >>> - Button to rename the select file/folder >>> >>> Sorry! >>> >>> -- >>> Dave Page >>> Blog: http://pgsnake.blogspot.com >>> Twitter: @pgsnake >>> >>> EnterpriseDB UK: http://www.enterprisedb.com >>> The Enterprise PostgreSQL Company >>> >> >> > --089e0122799e157087053784c883 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable
Please find updated patch.
This patch also includes th= e fix for issue=C2=A0=C2=A0"File Browser - File does not exist error<= span style=3D"font-size:13px">".

On Wed, Jul 13, 2016 at 7:23 PM, Sur= inder Kumar <surinder.kumar@enterprisedb.com> = wrote:
I forgot to merge= the fix for issue "File Browser - File= does not exist error" in the patch.
Please ignore this pat= ch.

On Wed, Jul 13, 2016 at 7:20 PM, Suri= nder Kumar <surinder.kumar@enterprisedb.com> w= rote:
Please find update= d patch with following changes/enhancements:
  1. Double click on fi= le/folder icon or name will navigate to the folder/file.
  2. Select= ed file/folder can be renamed by Rename button only. Double click rename is= removed.
  3. Filename text box will not hide on smaller screen. Se= tting minimum width of File Browser fixed it.
  4. Path at top will = only show directory name, not the file name and it is greyed out.
=
Issue not fixed:
Icons and fonts of Query tool and Fi= le Browser looks blurred in Runtime environment.
I tried debuggin= g it. while debugging, It gets fixed on my ubuntu runtime. but I don't = know how it gets fixed without changing css styles. It needs more time to d= ebug.

Please review.

On Wed, Jul 13, 201= 6 at 5:15 PM, Dave Page <dpage@pgadmin.org> wrote:
On Tue, Jul 12, 2016 at 7:10 AM, Surinder Kumar
<surinder.kumar@enterprisedb.com> wrote:
> On Mon, Jul 11, 2016 at 6:41 PM, Dave Page <dpage@pgadmin.org> wrote:
>>
>> On Thu, Jul 7, 2016 at 1:50 PM, Surinder Kumar
>> <surinder.kumar@enterprisedb.com> wrote:
>> > On Wed, Jul 6, 2016 at 7:02 PM, Surinder Kumar
>> > <surinder.kumar@enterprisedb.com> wrote:
>> >>
>> >> On Wed, Jul 6, 2016 at 5:40 PM, Dave Page <dpage@pgadmin.org> wrote= :
>> >>>
>> >>> Hi,
>> >>>
>> >>> I think we need more changes than just that;
>> >>>
>> >>> - The path at the top should not be editable (it shou= ld be greyed in
>> >>> fact)
>> >>
>> >> Ok
>> >>>
>> >>>
>> >>> - The path at the top should only show the directory = path. The
>> >>> filename should never be appended.
>> >>
>> >> Ok
>> >>>
>> >>>
>> >>> - The CSS needs to be fixed so the filename textbox a= t the bottom is
>> >>> never hidden (as it is now if the dialogue opens at a= small size).
>> >>
>> >> Ok
>> >>>
>> >>>
>> >>> - Double-click to navigate vs. rename should be modif= ied to work in
>> >>> part like it does on Mac - Double-click on either the= icon or the name
>> >>> should open the item (browser into a folder, or selec= t and "OK" on a
>> >>> file), and Click then Enter should rename. I'm he= sitant to try to
>> >>> implement "slow double click to rename" as = that would likely need to
>> >>> be tunable for accessibility reasons.
>> >>
>> >> Ok, I will fix it.
>> >
>> > In the current scenario, the Enter Key is bound to the OK but= ton by
>> > default
>> > in Alertify dialog which servers the purpose of closing the d= ialog.
>> > Should we de-attach Enter Key event bound to OK button and us= e it for
>> > rename
>> > file?
>> > please suggest what should I do?
>>
>> Hmm, good point.
>>
>> How hard would it be to look for 2 consecutive single-clicks (but = not
>> a double-click) for rename? If we can do that, it avoids timing
>> considerations for double-clicks (which would be defined by the OS= ).
>
>
> I tried to implement slow double click, here is Fiddle
> There are two events 1) double click (it will be used for folder navig= ation)
> 2) Slow double click(For rename), It is a simple click event, when cli= cked
> twice after delay we consider it a slow double click.
>
> But it is not working smoothly, double click and single click events a= re
> conflicting.

Yeah, so I see.

> Also, we have rename button in navigation for rename operation,
> Can we skip slow double click because it is very confusing?

OK, I must have been having a brain failure moment or something. Yes= ,
skip it - we obviously don't need it with the rename button.

So we have:

- Click to select
- Double click to open a folder
- Button to rename the select file/folder

Sorry!

--
Dave Page
Blog: http://pgsnake.blogspot.com
Twitter: @pgsnake

EnterpriseDB UK: http://www.enterprisedb.com
The Enterprise PostgreSQL Company



--089e0122799e157087053784c883-- --089e0122799e15708d053784c885 Content-Type: application/octet-stream; name="RM#1432_v3.patch" Content-Disposition: attachment; filename="RM#1432_v3.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_iqkyenss0 ZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL21pc2MvZmlsZV9tYW5hZ2VyL3N0 YXRpYy9jc3MvZmlsZV9tYW5hZ2VyLmNzcyBiL3dlYi9wZ2FkbWluL21pc2Mv ZmlsZV9tYW5hZ2VyL3N0YXRpYy9jc3MvZmlsZV9tYW5hZ2VyLmNzcwppbmRl eCAwZjE4OGQ4Li5lYTUwMmFjIDEwMDc1NQotLS0gYS93ZWIvcGdhZG1pbi9t aXNjL2ZpbGVfbWFuYWdlci9zdGF0aWMvY3NzL2ZpbGVfbWFuYWdlci5jc3MK KysrIGIvd2ViL3BnYWRtaW4vbWlzYy9maWxlX21hbmFnZXIvc3RhdGljL2Nz cy9maWxlX21hbmFnZXIuY3NzCkBAIC0yNCwxMSArMjQsMTUgQEAKICAgZmxv YXQ6IGxlZnQ7CiAgIHRleHQtYWxpZ246IGxlZnQ7CiAgIGxpbmUtaGVpZ2h0 OjEuOWVtOwotICB0ZXh0LXNoYWRvdzoxcHggMXB4IDBweCAjZmZmZmZmOwor ICBtYXgtd2lkdGg6IDM2N3B4OworICB0ZXh0LW92ZXJmbG93OiBlbGxpcHNp czsKKyAgb3ZlcmZsb3c6IGhpZGRlbjsKKyAgY29sb3I6ICM5OTk7CiB9Cgog I3VwbG9hZGVyIGgxIGIgewogICBmb250LXdlaWdodDogbm9ybWFsOworICBj b2xvcjogIzk5OTsKIH0KCiAudXBsb2FkcmVzcG9uc2UgewpAQCAtMzQ2LDYg KzM1MCw3IEBAIGJ1dHRvbi5saXN0IHNwYW4gewogICAtbW96LWJvcmRlci1y YWRpdXM6IDVweDsKICAgZmxvYXQ6IGxlZnQ7CiAgIG1hcmdpbi1yaWdodDog MTBweDsKKyAgYmFja2dyb3VuZDogI0VFRTsKIH0KCiAuZmlsZV9tYW5hZ2Vy ICN1cGxvYWRlciAuYnRuLWdyb3VwIC5idG5bZGlzYWJsZWRdIHsKQEAgLTUy OCw3ICs1MzMsOSBAQCBidXR0b24ubGlzdCBzcGFuIHsKICAgLW1vei1ib3Jk ZXItcmFkaXVzOiAzcHg7CiAgIGhlaWdodDogMjJweDsKICAgZm9udC1zaXpl OiAxM3B4OworICBmb250LXdlaWdodDogbm9ybWFsOwogICBkaXNwbGF5OiBp bmxpbmU7CisgIHdpZHRoOiAxNTBweDsKIH0KCiAuYWxsb3dlZF9maWxlX3R5 cGVzIC5jaGFuZ2VfZmlsZV90eXBlcyB7CmRpZmYgLS1naXQgYS93ZWIvcGdh ZG1pbi9taXNjL2ZpbGVfbWFuYWdlci90ZW1wbGF0ZXMvZmlsZV9tYW5hZ2Vy L2pzL2ZpbGVfbWFuYWdlci5qcyBiL3dlYi9wZ2FkbWluL21pc2MvZmlsZV9t YW5hZ2VyL3RlbXBsYXRlcy9maWxlX21hbmFnZXIvanMvZmlsZV9tYW5hZ2Vy LmpzCmluZGV4IDdkNmViM2IuLjllOGEwODAgMTAwNjQ0Ci0tLSBhL3dlYi9w Z2FkbWluL21pc2MvZmlsZV9tYW5hZ2VyL3RlbXBsYXRlcy9maWxlX21hbmFn ZXIvanMvZmlsZV9tYW5hZ2VyLmpzCisrKyBiL3dlYi9wZ2FkbWluL21pc2Mv ZmlsZV9tYW5hZ2VyL3RlbXBsYXRlcy9maWxlX21hbmFnZXIvanMvZmlsZV9t YW5hZ2VyLmpzCkBAIC05NCw2ICs5NCw3IEBAIGRlZmluZShbCiAgICAgICAg ICAgICAgICRjb250YWluZXIuZmluZCgnLnN0b3JhZ2VfY29udGVudCcpLnJl bW92ZSgpOwogICAgICAgICAgICAgICAkY29udGFpbmVyLmFwcGVuZCgiPGRp diBjbGFzcz0nc3RvcmFnZV9jb250ZW50Jz48L2Rpdj4iKTsKICAgICAgICAg ICAgICAgcmVuZGVyU3RvcmFnZVBhbmVsKHBhcmFtcyk7CisgICAgICAgICAg ICAgIHRoaXMuZWxlbWVudHMuZGlhbG9nLnN0eWxlLm1pbldpZHRoID0gJzYz MHB4JzsKICAgICAgICAgICAgICAgdGhpcy5zaG93KCk7CiAgICAgICAgICAg ICB9LAogICAgICAgICAgICAgc2V0dGluZ3M6IHsKQEAgLTIwMyw2ICsyMDQs NyBAQCBkZWZpbmUoWwogICAgICAgICAgICAgICAkY29udGFpbmVyLmZpbmQo Jy5zdG9yYWdlX2NvbnRlbnQnKS5yZW1vdmUoKTsKICAgICAgICAgICAgICAg JGNvbnRhaW5lci5hcHBlbmQoIjxkaXYgY2xhc3M9J3N0b3JhZ2VfY29udGVu dCc+PC9kaXY+Iik7CiAgICAgICAgICAgICAgIHJlbmRlclN0b3JhZ2VQYW5l bChwYXJhbXMpOworICAgICAgICAgICAgICB0aGlzLmVsZW1lbnRzLmRpYWxv Zy5zdHlsZS5taW5XaWR0aCA9ICc2MzBweCc7CiAgICAgICAgICAgICAgIHRo aXMuc2hvdygpOwogICAgICAgICAgICAgfSwKICAgICAgICAgICAgIHNldHRp bmdzOiB7CkBAIC0zMTQsNiArMzE2LDcgQEAgZGVmaW5lKFsKICAgICAgICAg ICAgICAgJGNvbnRhaW5lci5maW5kKCcuc3RvcmFnZV9jb250ZW50JykucmVt b3ZlKCk7CiAgICAgICAgICAgICAgICRjb250YWluZXIuYXBwZW5kKCI8ZGl2 IGNsYXNzPSdzdG9yYWdlX2NvbnRlbnQnPjwvZGl2PiIpOwogICAgICAgICAg ICAgICByZW5kZXJTdG9yYWdlUGFuZWwocGFyYW1zKTsKKyAgICAgICAgICAg ICAgdGhpcy5lbGVtZW50cy5kaWFsb2cuc3R5bGUubWluV2lkdGggPSAnNjMw cHgnOwogICAgICAgICAgICAgICB0aGlzLnNob3coKTsKICAgICAgICAgICAg IH0sCiAgICAgICAgICAgICBzZXR0aW5nczogewpAQCAtNDI1LDYgKzQyOCw3 IEBAIGRlZmluZShbCiAgICAgICAgICAgICAgICRjb250YWluZXIuZmluZCgn LnN0b3JhZ2VfY29udGVudCcpLnJlbW92ZSgpOwogICAgICAgICAgICAgICAk Y29udGFpbmVyLmFwcGVuZCgiPGRpdiBjbGFzcz0nc3RvcmFnZV9jb250ZW50 Jz48L2Rpdj4iKTsKICAgICAgICAgICAgICAgcmVuZGVyU3RvcmFnZVBhbmVs KHBhcmFtcyk7CisgICAgICAgICAgICAgIHRoaXMuZWxlbWVudHMuZGlhbG9n LnN0eWxlLm1pbldpZHRoID0gJzYzMHB4JzsKICAgICAgICAgICAgICAgdGhp cy5zaG93KCk7CiAgICAgICAgICAgICB9LAogICAgICAgICAgICAgc2V0dGlu Z3M6IHsKZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL21pc2MvZmlsZV9tYW5h Z2VyL3RlbXBsYXRlcy9maWxlX21hbmFnZXIvanMvdXRpbGl0eS5qcyBiL3dl Yi9wZ2FkbWluL21pc2MvZmlsZV9tYW5hZ2VyL3RlbXBsYXRlcy9maWxlX21h bmFnZXIvanMvdXRpbGl0eS5qcwppbmRleCA4ZTljNDJlLi5iYWE3MWIxIDEw MDc1NQotLS0gYS93ZWIvcGdhZG1pbi9taXNjL2ZpbGVfbWFuYWdlci90ZW1w bGF0ZXMvZmlsZV9tYW5hZ2VyL2pzL3V0aWxpdHkuanMKKysrIGIvd2ViL3Bn YWRtaW4vbWlzYy9maWxlX21hbmFnZXIvdGVtcGxhdGVzL2ZpbGVfbWFuYWdl ci9qcy91dGlsaXR5LmpzCkBAIC0xOTUsNyArMTk1LDcgQEAgdmFyIHNldFVw bG9hZGVyID0gZnVuY3Rpb24ocGF0aCkgewogICBwYXRoID0gZGVjb2RlVVJJ KHBhdGgpOwoKICAgdmFyIGRpc3BsYXlfc3RyaW5nID0gcGF0aCwKLSAgICAg IG15cGF0aCA9ICcnOworICAgICAgZmlsZV9wYXRoID0gJyc7CgogICAvLyBz cGxpdCBwYXRoCiAgIHZhciBzcGxpdF9wYXRoID0gZGlzcGxheV9zdHJpbmcu c3BsaXQoJy8nKTsKQEAgLTIwMywyOSArMjAzLDE3IEBAIHZhciBzZXRVcGxv YWRlciA9IGZ1bmN0aW9uKHBhdGgpIHsKCiAgIC8vIHNldCBlbXB0eSBwYXRo IGlmIGl0IGlzIHdpbmRvd3MKICAgaWYgKGNvbmZpZy5vcHRpb25zLnBsYXRm b3JtX3R5cGUgPT09ICJ3aW4zMiIgJiYgY29uZmlnLm9wdGlvbnMuc2hvd192 b2x1bWVzKSB7Ci0gICAgICBteXBhdGggPSAiIjsKKyAgICAgIGZpbGVfcGF0 aCA9ICIiOwogICB9IGVsc2UgaWYgKHNwbGl0X3BhdGgubGVuZ3RoID09PSAw KSB7Ci0gICAgbXlwYXRoID0gJCgnPGI+LzwvYj4nKTsKKyAgICBmaWxlX3Bh dGggPSAnLyc7CiAgIH0gZWxzZSB7Ci0gICAgbXlwYXRoID0gJCgnPGEgY2xh c3M9ImJyZWFkY3J1bWJzIiBocmVmPSIjIiBkYXRhLXBhdGg9Ii8iPi88L2E+ Jyk7CisgICAgZmlsZV9wYXRoID0gJy8nOwogICB9Ci0gICQobXlwYXRoKS5h cHBlbmRUbygkKCcuc3RvcmFnZV9kaWFsb2cgI3VwbG9hZGVyIGgxJykpOwoK ICAgT2JqZWN0LmtleXMoc3BsaXRfcGF0aCkuZm9yRWFjaChmdW5jdGlvbiAo aSkgewotICAgIGlmIChpIDwgc3BsaXRfcGF0aC5sZW5ndGggLSAxKSB7Ci0g ICAgICBteXBhdGggPSAkKAotICAgICAgICAnPGEgY2xhc3M9ImJyZWFkY3J1 bWJzIiBocmVmPSIjIiBkYXRhLXBhdGg9IicgKwotICAgICAgICBkaXNwbGF5 X3N0cmluZy5yZXBsYWNlKHNwbGl0X3BhdGhbaSsxXSwgJycpICsKLSAgICAg ICAgJyI+JyArIHNwbGl0X3BhdGhbaV0gKyAnLzwvYT4nCi0gICAgICApOwot ICAgICAgJChteXBhdGgpLmFwcGVuZFRvKCQoJy5zdG9yYWdlX2RpYWxvZyAj dXBsb2FkZXIgaDEnKSk7Ci0gICAgfSBlbHNlIHsKLSAgICAgIG15cGF0aCA9 ICQoJzxiPicgKyBzcGxpdF9wYXRoW2ldICsgJy88L2I+Jyk7Ci0gICAgICAk KG15cGF0aCkuYXBwZW5kVG8oCi0gICAgICAgICQoJy5zdG9yYWdlX2RpYWxv ZyAjdXBsb2FkZXIgaDEnKQotICAgICAgKTsKLSAgICB9CisgICAgZmlsZV9w YXRoICs9IHNwbGl0X3BhdGhbaV0gKyAnLyc7CiAgIH0pOworICAkKCcuc3Rv cmFnZV9kaWFsb2cgI3VwbG9hZGVyIGgxJykuaHRtbChmaWxlX3BhdGgpOwoK ICAgJCgnLmN1cnJlbnRwYXRoJykudmFsKHBhdGgpOwogICBpZiAoJCgnLnN0 b3JhZ2VfZGlhbG9nICN1cGxvYWRlciBoMSBzcGFuJykubGVuZ3RoID09PSAw KSB7CkBAIC05MDgsMjggKzg5Niw2IEBAIHZhciBnZXRGb2xkZXJJbmZvID0g ZnVuY3Rpb24ocGF0aCwgZmlsZV90eXBlKSB7CiAgICAgICAgIH0KICAgICAg IH0pOwoKLSAgICAgICQoJy5maWxlaW5mbyAjY29udGVudHMgbGkgcCcpLm9u KCdkYmxjbGljaycsZnVuY3Rpb24oZSkgewotICAgICAgICBlLnN0b3BQcm9w YWdhdGlvbigpOwotICAgICAgICB2YXIgJHRoaXMgPSAkKHRoaXMpOwotICAg ICAgICB2YXIgb3JpZ192YWx1ZSA9IGRlY29kZVVSSSgkdGhpcy5maW5kKCdz cGFuJykuYXR0cigndGl0bGUnKSksCi0gICAgICAgICAgICBuZXd2YWx1ZSA9 IG9yaWdfdmFsdWUuc3Vic3RyaW5nKDAsIG9yaWdfdmFsdWUuaW5kZXhPZign LicpKTsKLQotICAgICAgICBpZiAobmV3dmFsdWUgPT09ICcnKSB7Ci0gICAg ICAgICAgbmV3dmFsdWUgPSBvcmlnX3ZhbHVlOwotICAgICAgICB9Ci0KLSAg ICAgICAgJHRoaXMuZmluZCgnaW5wdXQnKS50b2dnbGUoKS52YWwobmV3dmFs dWUpLmZvY3VzKCk7Ci0gICAgICAgICR0aGlzLmZpbmQoJ3NwYW4nKS50b2dn bGUoKTsKLQotICAgICAgICAvLyBSZW5hbWUgZm9sZGVyL2ZpbGUgb24gcHJl c3NpbmcgZW50ZXIga2V5Ci0gICAgICAgICQoJy5maWxlX21hbmFnZXInKS51 bmJpbmQoKS5vbigna2V5dXAnLCBmdW5jdGlvbihlKSB7Ci0gICAgICAgICAg aWYgKGUua2V5Q29kZSA9PSAxMykgewotICAgICAgICAgICAgZS5zdG9wUHJv cGFnYXRpb24oKTsKLSAgICAgICAgICAgICR0aGlzLmZpbmQoJ2lucHV0Jyku dHJpZ2dlcignYmx1cicpOwotICAgICAgICAgIH0KLSAgICAgICAgfSk7Ci0g ICAgICB9KTsKLQogICAgICAgLy8gUmVuYW1lIFVJIGhhbmRsaW5nCiAgICAg ICAkKCcuZmlsZWluZm8gI2NvbnRlbnRzIGxpIHAnKS5vbignYmx1ciBkYmxj bGljaycsJ2lucHV0JywgZnVuY3Rpb24oZSkgewogICAgICAgICBlLnN0b3BQ cm9wYWdhdGlvbigpOwpAQCAtMTAwOCwzMCArOTc0LDYgQEAgdmFyIGdldEZv bGRlckluZm8gPSBmdW5jdGlvbihwYXRoLCBmaWxlX3R5cGUpIHsKICAgICAg ICAgfQogICAgICAgfSk7CgotICAgICAgJCgnLmZpbGVpbmZvIHRhYmxlI2Nv bnRlbnRzIHRyIHRkIHAnKS5vbignZGJsY2xpY2snLCBmdW5jdGlvbihlKSB7 Ci0gICAgICAgIGUuc3RvcFByb3BhZ2F0aW9uKCk7Ci0gICAgICAgIHZhciAk dGhpcyA9ICQodGhpcyksCi0gICAgICAgICAgICBvcmlnX3ZhbHVlID0gZGVj b2RlVVJJKAotICAgICAgICAgICAgICAkdGhpcy5maW5kKCdzcGFuJykuYXR0 cigndGl0bGUnKQotICAgICAgICAgICAgKTsKLQotICAgICAgICB2YXIgbmV3 dmFsdWUgPSBvcmlnX3ZhbHVlLnN1YnN0cmluZygwLCBvcmlnX3ZhbHVlLmxh c3RJbmRleE9mKCcuJykpOwotICAgICAgICBpZiAob3JpZ192YWx1ZS5sYXN0 SW5kZXhPZignLycpID09IG9yaWdfdmFsdWUubGVuZ3RoIC0gMSB8fCBuZXd2 YWx1ZSA9PT0gJycpIHsKLSAgICAgICAgICBuZXd2YWx1ZSA9IG9yaWdfdmFs dWU7Ci0gICAgICAgIH0KLQotICAgICAgICAkdGhpcy5maW5kKCdpbnB1dCcp LnRvZ2dsZSgpLnZhbChuZXd2YWx1ZSkuZm9jdXMoKTsKLSAgICAgICAgJHRo aXMuZmluZCgnc3BhbicpLnRvZ2dsZSgpOwotCi0gICAgICAgIC8vIFJlbmFt ZSBmb2xkZXIvZmlsZSBvbiBwcmVzc2luZyBlbnRlciBrZXkKLSAgICAgICAg JCgnLmZpbGVfbWFuYWdlcicpLnVuYmluZCgpLm9uKCdrZXl1cCcsIGZ1bmN0 aW9uKGUpIHsKLSAgICAgICAgICBpZiAoZS5rZXlDb2RlID09IDEzKSB7Ci0g ICAgICAgICAgICBlLnN0b3BQcm9wYWdhdGlvbigpOwotICAgICAgICAgICAg JHRoaXMuZmluZCgnaW5wdXQnKS50cmlnZ2VyKCdibHVyJyk7Ci0gICAgICAg ICAgfQotICAgICAgICB9KTsKLSAgICAgIH0pOwotCiAgICAgICAkKCcuZmls ZWluZm8gdGFibGUjY29udGVudHMgdHIgdGQgcCcpLm9uKAogICAgICAgICAn Ymx1ciBkYmxjbGljaycsICdpbnB1dCcsIGZ1bmN0aW9uKGUpIHsKICAgICAg ICAgdmFyIG9sZF9uYW1lID0gZGVjb2RlVVJJKCQodGhpcykuc2libGluZ3Mo J3NwYW4nKS5hdHRyKCd0aXRsZScpKSwKQEAgLTExNDgsMTEgKzEwOTAsNyBA QCB2YXIgZ2V0Rm9sZGVySW5mbyA9IGZ1bmN0aW9uKHBhdGgsIGZpbGVfdHlw ZSkgewogICAgICAgICAgICAgICAgICdkaXNhYmxlZCcKICAgICAgICAgICAg ICAgKTsKICAgICAgICAgICAgICAgLy8gc2V0IHNlbGVjdGVkIGZvbGRlciBu YW1lIGluIGJyZWFkY3J1bXMKLSAgICAgICAgICAgICAgJCgnLmZpbGVfbWFu YWdlciAjdXBsb2FkZXIgaDEnKS5oaWRlKCk7CiAgICAgICAgICAgICAgICQo Jy5maWxlX21hbmFnZXIgI3VwbG9hZGVyIC5zaG93X3NlbGVjdGVkX2ZpbGUn KS5yZW1vdmUoKTsKLSAgICAgICAgICAgICAgJCgnPHNwYW4gY2xhc3M9InNo b3dfc2VsZWN0ZWRfZmlsZSI+JytwYXRoKyc8L3NwYW4+JykuYXBwZW5kVG8o Ci0gICAgICAgICAgICAgICAgJy5maWxlX21hbmFnZXIgI3VwbG9hZGVyIC5m aWxlbWFuYWdlci1wYXRoLWdyb3VwJwotICAgICAgICAgICAgICApOwogICAg ICAgICAgICAgfQoKICAgICAgICAgICAgIGlmICgKQEAgLTEyMDAsMTEgKzEx MzgsNyBAQCB2YXIgZ2V0Rm9sZGVySW5mbyA9IGZ1bmN0aW9uKHBhdGgsIGZp bGVfdHlwZSkgewogICAgICAgICAgICAgICAgICdkaXNhYmxlZCcKICAgICAg ICAgICAgICAgKTsKICAgICAgICAgICAgICAgLy8gc2V0IHNlbGVjdGVkIGZv bGRlciBuYW1lIGluIGJyZWFkY3J1bXMKLSAgICAgICAgICAgICAgJCgnLmZp bGVfbWFuYWdlciAjdXBsb2FkZXIgaDEnKS5oaWRlKCk7CiAgICAgICAgICAg ICAgICQoJy5maWxlX21hbmFnZXIgI3VwbG9hZGVyIC5zaG93X3NlbGVjdGVk X2ZpbGUnKS5yZW1vdmUoKTsKLSAgICAgICAgICAgICAgJCgnPHNwYW4gY2xh c3M9InNob3dfc2VsZWN0ZWRfZmlsZSI+JyArIHBhdGggKyAnPC9zcGFuPicp LmFwcGVuZFRvKAotICAgICAgICAgICAgICAgICcuZmlsZV9tYW5hZ2VyICN1 cGxvYWRlciAuZmlsZW1hbmFnZXItcGF0aC1ncm91cCcKLSAgICAgICAgICAg ICAgKTsKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIGlmICgKICAgICAg ICAgICAgICAgY29uZmlnLm9wdGlvbnMuZGlhbG9nX3R5cGUgPT0gJ2NyZWF0 ZV9maWxlJyAmJgpkaWZmIC0tZ2l0IGEvd2ViL3BnYWRtaW4vdG9vbHMvc3Fs ZWRpdG9yL19faW5pdF9fLnB5IGIvd2ViL3BnYWRtaW4vdG9vbHMvc3FsZWRp dG9yL19faW5pdF9fLnB5CmluZGV4IGM3MTNmYjUuLjkyZTRiMTcgMTAwNjQ0 Ci0tLSBhL3dlYi9wZ2FkbWluL3Rvb2xzL3NxbGVkaXRvci9fX2luaXRfXy5w eQorKysgYi93ZWIvcGdhZG1pbi90b29scy9zcWxlZGl0b3IvX19pbml0X18u cHkKQEAgLTExMjEsMTYgKzExMjEsMTMgQEAgZGVmIGxvYWRfZmlsZSgpOgog ICAgIGlmIHJlcXVlc3QuZGF0YToKICAgICAgICAgZmlsZV9kYXRhID0ganNv bi5sb2FkcyhyZXF1ZXN0LmRhdGEuZGVjb2RlKCkpCgorICAgIGZpbGVfcGF0 aCA9IHVucXVvdGUoZmlsZV9kYXRhWydmaWxlX25hbWUnXSkKICAgICAjIHJl dHJpZXZlIHN0b3JhZ2UgZGlyZWN0b3J5IHBhdGgKICAgICBzdG9yYWdlX21h bmFnZXJfcGF0aCA9IGdldF9zdG9yYWdlX2RpcmVjdG9yeSgpCi0gICAgaWYg c3RvcmFnZV9tYW5hZ2VyX3BhdGggaXMgTm9uZToKLSAgICAgICAgc3RvcmFn ZV9tYW5hZ2VyX3BhdGggPSAiIgorICAgIGlmIHN0b3JhZ2VfbWFuYWdlcl9w YXRoOgorICAgICAgICAjIGdlbmVyYXRlIGZ1bGwgcGF0aCBvZiBmaWxlCisg ICAgICAgIGZpbGVfcGF0aCA9IG9zLnBhdGguam9pbihzdG9yYWdlX21hbmFn ZXJfcGF0aCwgZmlsZV9wYXRoLmxzdHJpcCgnLycpKQoKLSAgICAjIGdlbmVy YXRlIGZ1bGwgcGF0aCBvZiBmaWxlCi0gICAgZmlsZV9wYXRoID0gb3MucGF0 aC5qb2luKAotICAgICAgICBzdG9yYWdlX21hbmFnZXJfcGF0aCwKLSAgICAg ICAgdW5xdW90ZShmaWxlX2RhdGFbJ2ZpbGVfbmFtZSddLmxzdHJpcCgnLycp KQotICAgICkKICAgICBmaWxlX2RhdGEgPSBOb25lCgogICAgICMgY2hlY2sg aWYgZmlsZSB0eXBlIGlzIHRleHQgb3IgYmluYXJ5Cg== --089e0122799e15708d053784c885 Content-Type: text/plain Content-Disposition: inline Content-Transfer-Encoding: 8bit MIME-Version: 1.0 -- Sent via pgadmin-hackers mailing list (pgadmin-hackers@postgresql.org) To make changes to your subscription: http://www.postgresql.org/mailpref/pgadmin-hackers --089e0122799e15708d053784c885--