Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bgqZU-0006ou-Rc for pgadmin-hackers@arkaria.postgresql.org; Mon, 05 Sep 2016 09:52:08 +0000 Received: from localhost ([127.0.0.1] helo=postgresql.org) by malur.postgresql.org with smtp (Exim 4.84_2) (envelope-from ) id 1bgqZU-0003jf-6I for pgadmin-hackers@arkaria.postgresql.org; Mon, 05 Sep 2016 09:52:08 +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 1bgqZG-0003EN-38 for pgadmin-hackers@postgresql.org; Mon, 05 Sep 2016 09:51:54 +0000 Received: from mail-wm0-x22b.google.com ([2a00:1450:400c:c09::22b]) by makus.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.84_2) (envelope-from ) id 1bgqZD-00011D-TR for pgadmin-hackers@postgresql.org; Mon, 05 Sep 2016 09:51:52 +0000 Received: by mail-wm0-x22b.google.com with SMTP id b187so11439528wme.1 for ; Mon, 05 Sep 2016 02:51:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=enterprisedb-com.20150623.gappssmtp.com; s=20150623; h=mime-version:from:date:message-id:subject:to; bh=XTC813fLM9QDAJIXtXX+JO1rc3Dn5Iu6MEA8Vf4Hi+E=; b=PfeXhu0dqjDZnioAm6EqK6cyz1aaxmfxmsOxjpuewCISuu7XKe03u+T2PlULwAA4ev AbGN2JIT7pviRbUhkVpeXNZA4EtfHcHReXNcG7jdeAUyftQ6trq4/Qmb0L7t5RkUagtq W8DZJVXnLtYNNTR9MzGRLXrYZPMJPb6J8hZVaI8Ju00nX21bu8EB7u8oBasxoRGmw+ht AgRs69JY7s09uWLbVfWs+yrCM5AbVYSndZWzcPoyKva2b1jOhaUQaj1GjJmQg7no6GYj EJ0bIKgBlRPVJq2LXAozxwqGstaOAbwX3oYojY+PBuw7dBu+oHtgIhP4iw/MbNBQdTIb 442g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=XTC813fLM9QDAJIXtXX+JO1rc3Dn5Iu6MEA8Vf4Hi+E=; b=WFmzCi0aFXW5g9bf4BN8p5PI1xm3GC6nQfm26HbV2vrVbNBpdj9/53EyY2XUN/nMvW bwcJDK0PWzQrA8M9n6evQSr7CPPTgT3A9vyM0CnThHzQ6BF22mFQuGoBSRrXjY66Y8Rb YsotcBxO6eWRAWyYT9KbVQbo7X2uhU+z7W5vGcjXmxNK0EUs5SeYcv4SBuTR2zbojbhL v7/A2Sk1b7j4+Oyx8K5ck2+NBIbvlf+DDqsYtExGMN/TOtTpWWwbvLYacRzdE/yVS6eY 3lGX5KJD49wSD4UNgfa7ftCkKheFwRY2+Q6+MxLUrQRmDnQiryUMEJRPW+688P9AMyXM y+Iw== X-Gm-Message-State: AE9vXwOTc6/1jPxAEqzNDDKypow0i/aDc9Qug8kPibfH+ScPmhGusKz99EH8TBcPAf3tH5twfkywYKO7rJko8G2E X-Received: by 10.194.172.229 with SMTP id bf5mr22180229wjc.37.1473069110074; Mon, 05 Sep 2016 02:51:50 -0700 (PDT) MIME-Version: 1.0 Received: by 10.28.172.198 with HTTP; Mon, 5 Sep 2016 02:51:19 -0700 (PDT) From: Surinder Kumar Date: Mon, 5 Sep 2016 15:21:19 +0530 Message-ID: Subject: [pgAdmin4][Patch]: Wrong listing of directories in File Manager in Windows Only. To: pgadmin-hackers Content-Type: multipart/mixed; boundary=089e013c6830097bdd053bbfa1e2 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 --089e013c6830097bdd053bbfa1e2 Content-Type: multipart/alternative; boundary=089e013c6830097bd9053bbfa1e0 --089e013c6830097bd9053bbfa1e0 Content-Type: text/plain; charset=UTF-8 Hi *Issue:* FileManager: when Select File dialog is opened in query tool in Runtime Mode, it was listing wrong directory. instead it should list drives such as C:\, D:\, E:\ etc if no STORAGE_DIR path is set in config_local.py. This is a regression of RM 1937. *Solution:* we do list drives, If platform is Windows and If self.dir is set to None, but self.dir is set to empty string inside __init__ constructor. This is the reason it wasn't listing drives. I have taken care it in this patch and tested it for following platforms: Windows, Ubuntu and Mac. Please find attached patch and review. Thanks, Surinder Kumar --089e013c6830097bd9053bbfa1e0 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable
Hi<= /div>

Issue:
FileManager: when S= elect File dialog is opened in query tool in Runtime Mode, it was listing w= rong directory. instead it should list drives such as C:\, D:\, E:\ etc if = no STORAGE_DIR path is set in config_local.py. This is a regression of RM 1= 937.

=
Solution:<= /b>
we do list = drives, If platform is Windows and If self.dir is set to None, but self.dir= is set to empty string inside __init__ constructor. This is the reason it = wasn't listing drives.
I have taken care it in this patch and tested it for following = platforms:
Wind= ows,
Ubuntu and=
Mac.

Please find attached patch and rev= iew.

=

Thanks,
Surinder Kumar
--089e013c6830097bd9053bbfa1e0-- --089e013c6830097bdd053bbfa1e2 Content-Type: application/octet-stream; name="FileManager_show_drives_windows.patch" Content-Disposition: attachment; filename="FileManager_show_drives_windows.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_ispvahsu0 ZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL21pc2MvZmlsZV9tYW5hZ2VyL19f aW5pdF9fLnB5IGIvd2ViL3BnYWRtaW4vbWlzYy9maWxlX21hbmFnZXIvX19p bml0X18ucHkKaW5kZXggMjRlODFkZC4uZTI2MjIwOCAxMDA2NDQKLS0tIGEv d2ViL3BnYWRtaW4vbWlzYy9maWxlX21hbmFnZXIvX19pbml0X18ucHkKKysr IGIvd2ViL3BnYWRtaW4vbWlzYy9maWxlX21hbmFnZXIvX19pbml0X18ucHkK QEAgLTI0OSw4ICsyNDksNyBAQCBjbGFzcyBGaWxlbWFuYWdlcihvYmplY3Qp OgogICAgICAgICApCiAgICAgICAgIHNlbGYuZGlyID0gZ2V0X3N0b3JhZ2Vf ZGlyZWN0b3J5KCkKIAotICAgICAgICBpZiAoKHNlbGYuZGlyIGlzIG5vdCBO b25lIGFuZCBpc2luc3RhbmNlKHNlbGYuZGlyLCBsaXN0KSkgb3IKLSAgICAg ICAgICAgc2VsZi5kaXIgaXMgTm9uZSk6CisgICAgICAgIGlmIChzZWxmLmRp ciBpcyBub3QgTm9uZSBhbmQgaXNpbnN0YW5jZShzZWxmLmRpciwgbGlzdCkp OgogICAgICAgICAgICAgc2VsZi5kaXIgPSAiIgogCiAgICAgQHN0YXRpY21l dGhvZApAQCAtNTY4LDcgKzU2Nyw3IEBAIGNsYXNzIEZpbGVtYW5hZ2VyKG9i amVjdCk6CiAgICAgICAgICAgICAgICAgJ0NvZGUnOiAxCiAgICAgICAgICAg ICB9CiAKLSAgICAgICAgZGlyID0gc2VsZi5kaXIKKyAgICAgICAgZGlyID0g c2VsZi5kaXIgaWYgc2VsZi5kaXIgaXMgbm90IE5vbmUgZWxzZSAnJwogICAg ICAgICAjIGNoZWNrIGlmIGl0J3MgZGlyCiAgICAgICAgIGlmIG9sZFstMV0g PT0gJy8nOgogICAgICAgICAgICAgb2xkID0gb2xkWzotMV0KQEAgLTYyMCw3 ICs2MTksNyBAQCBjbGFzcyBGaWxlbWFuYWdlcihvYmplY3QpOgogICAgICAg ICAgICAgICAgICdDb2RlJzogMQogICAgICAgICAgICAgfQogCi0gICAgICAg IGRpciA9IHNlbGYuZGlyCisgICAgICAgIGRpciA9IHNlbGYuZGlyIGlmIHNl bGYuZGlyIGlzIG5vdCBOb25lIGVsc2UgJycKICAgICAgICAgb3JpZ19wYXRo ID0gInswfXsxfSIuZm9ybWF0KGRpciwgcGF0aCkKIAogICAgICAgICBlcnJf bXNnID0gJycKQEAgLTY1Myw3ICs2NTIsNyBAQCBjbGFzcyBGaWxlbWFuYWdl cihvYmplY3QpOgogICAgICAgICAgICAgICAgICdDb2RlJzogMQogICAgICAg ICAgICAgfQogCi0gICAgICAgIGRpciA9IHNlbGYuZGlyCisgICAgICAgIGRp ciA9IHNlbGYuZGlyIGlmIHNlbGYuZGlyIGlzIG5vdCBOb25lIGVsc2UgJycK ICAgICAgICAgZXJyX21zZyA9ICcnCiAgICAgICAgIGNvZGUgPSAxCiAgICAg ICAgIHRyeToKQEAgLTY3NCwxNCArNjczLDEzIEBAIGNsYXNzIEZpbGVtYW5h Z2VyKG9iamVjdCk6CiAgICAgICAgICAgICAnRXJyb3InOiBlcnJfbXNnLAog ICAgICAgICAgICAgJ0NvZGUnOiBjb2RlCiAgICAgICAgIH0KLQogICAgICAg ICByZXR1cm4gcmVzdWx0CiAKICAgICBkZWYgaXNfZmlsZV9leGlzdChzZWxm LCBwYXRoLCBuYW1lLCByZXE9Tm9uZSk6CiAgICAgICAgICIiIgogICAgICAg ICBDaGVja3Mgd2hldGhlciBnaXZlbiBmaWxlIGV4aXN0cyBvciBub3QKICAg ICAgICAgIiIiCi0gICAgICAgIGRpciA9IHNlbGYuZGlyCisgICAgICAgIGRp ciA9IHNlbGYuZGlyIGlmIHNlbGYuZGlyIGlzIG5vdCBOb25lIGVsc2UgJycK ICAgICAgICAgZXJyX21zZyA9ICcnCiAgICAgICAgIGNvZGUgPSAxCiAgICAg ICAgIG5hbWUgPSB1bnF1b3RlKG5hbWUpCkBAIC03MzMsNyArNzMxLDcgQEAg Y2xhc3MgRmlsZW1hbmFnZXIob2JqZWN0KToKICAgICAgICAgICAgICAgICAn Q29kZSc6IDEKICAgICAgICAgICAgIH0KIAotICAgICAgICBkaXIgPSBzZWxm LmRpcgorICAgICAgICBkaXIgPSBzZWxmLmRpciBpZiBzZWxmLmRpciBpcyBu b3QgTm9uZSBlbHNlICcnCiAgICAgICAgIG5ld05hbWUgPSBuYW1lCiAgICAg ICAgIGlmIGRpciAhPSAiIjoKICAgICAgICAgICAgIG5ld1BhdGggPSBkaXIg KyAnLycgKyBwYXRoICsgbmV3TmFtZSArICcvJwpAQCAtNzc1LDcgKzc3Myw3 IEBAIGNsYXNzIEZpbGVtYW5hZ2VyKG9iamVjdCk6CiAgICAgICAgICAgICAg ICAgJ0NvZGUnOiAxCiAgICAgICAgICAgICB9CiAKLSAgICAgICAgZGlyID0g c2VsZi5kaXIKKyAgICAgICAgZGlyID0gc2VsZi5kaXIgaWYgc2VsZi5kaXIg aXMgbm90IE5vbmUgZWxzZSAnJwogICAgICAgICBvcmlnX3BhdGggPSAiezB9 ezF9Ii5mb3JtYXQoZGlyLCBwYXRoKQogICAgICAgICBuYW1lID0gcGF0aC5z cGxpdCgnLycpWy0xXQogICAgICAgICBjb250ZW50ID0gb3BlbihvcmlnX3Bh dGgsICdyJykKZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL21pc2MvZmlsZV9t YW5hZ2VyL3RlbXBsYXRlcy9maWxlX21hbmFnZXIvanMvdXRpbGl0eS5qcyBi L3dlYi9wZ2FkbWluL21pc2MvZmlsZV9tYW5hZ2VyL3RlbXBsYXRlcy9maWxl X21hbmFnZXIvanMvdXRpbGl0eS5qcwppbmRleCBiYWE3MWIxLi44ZDg5MWZk IDEwMDc1NQotLS0gYS93ZWIvcGdhZG1pbi9taXNjL2ZpbGVfbWFuYWdlci90 ZW1wbGF0ZXMvZmlsZV9tYW5hZ2VyL2pzL3V0aWxpdHkuanMKKysrIGIvd2Vi L3BnYWRtaW4vbWlzYy9maWxlX21hbmFnZXIvdGVtcGxhdGVzL2ZpbGVfbWFu YWdlci9qcy91dGlsaXR5LmpzCkBAIC0xNDg4LDggKzE0ODgsNyBAQCBpZiAo aGFzX2NhcGFiaWxpdHkoZGF0YSwgJ3VwbG9hZCcpKSB7CiAgICAgICAgIHNl dFRpbWVvdXQoZnVuY3Rpb24oKSB7fSwgMTAwMDApOwogICAgICAgfSwKICAg ICAgIHN1Y2Nlc3M6IGZ1bmN0aW9uKGZpbGUsIHJlc3BvbnNlKSB7Ci0gICAg ICAgIHZhciByZXNwb25zZSA9IGpRdWVyeS5wYXJzZUpTT04ocmVzcG9uc2Up LAotICAgICAgICAgICAgZGF0YSA9IHJlc3BvbnNlLmRhdGEucmVzdWx0LAor ICAgICAgICB2YXIgZGF0YSA9IHJlc3BvbnNlLmRhdGEucmVzdWx0LAogICAg ICAgICAgICAgJHRoaXMgPSAkKGZpbGUucHJldmlld1RlbXBsYXRlKTsKIAog ICAgICAgICBpZiAoZGF0YS5Db2RlID09IDApIHsK --089e013c6830097bdd053bbfa1e2 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 --089e013c6830097bdd053bbfa1e2--