Merge branch 'master' into pull/7

# Conflicts:
#	README.md
#	phpmyadmin_sql_backup.py

Author: qubitstream

.gitignore

@@ -61,5 +61,7 @@ docs/_build/
 target/
 
 .idea
+.vscode
+*.iml
 
 # Created by .ignore support plugin (hsz.mobi)

phpmyadmin_sql_backup.py

@@ -21,23 +21,32 @@
 # tested on Python 3.4+
 # requires: grab (http://grablib.org/)
 #
-# Christoph Haunschmidt 2016-03
+# Christoph Haunschmidt, started 2016-03
 
 import argparse
+import datetime
 import os
 import re
 import sys
-import datetime
 
 import grab
 
-
-__version__ = '2016-03-12.3'
+__version__ = '2019-05-07.1'
 
 CONTENT_DISPOSITION_FILENAME_RE = re.compile(r'^.*filename="(?P<filename>[^"]+)".*$')
 DEFAULT_PREFIX_FORMAT = r'%Y-%m-%d--%H-%M-%S-UTC_'
 
 
+def is_login_successful(g):
+    return g.doc.text_search("frame_content") or g.doc.text_search("server_export.php")
+
+
+def open_frame_if_phpmyadmin_3(g):
+    frame_url_selector = g.doc.select("id('frame_content')/@src")
+    if frame_url_selector.exists():
+        g.go(frame_url_selector.text())
+
+
 def download_sql_backup(url, user, password, dry_run=False, overwrite_existing=False, prepend_date=True, basename=None,
                         output_directory=os.getcwd(), exclude_dbs=None, compression='none', prefix_format=None,
                         timeout=60, http_auth=None, server_name=None, **kwargs):
@@ -56,10 +65,11 @@ def download_sql_backup(url, user, password, dry_run=False, overwrite_existing=F
         g.doc.set_input_by_id('input_servername', server_name)
     g.submit()
 
-    try:
-        g.doc.text_assert('server_export.php')
-    except Exception as e:
-        raise ValueError('Could not login - did you provide the correct username / password? ({})'.format(e))
+    if not is_login_successful(g):
+        raise ValueError('Could not login - did you provide the correct username / password?')
+
+    open_frame_if_phpmyadmin_3(g)
+
     export_url = g.doc.select("id('topmenu')//a[contains(@href,'server_export.php')]/@href").text()
     g.go(export_url)
 
@@ -104,34 +114,38 @@ def download_sql_backup(url, user, password, dry_run=False, overwrite_existing=F
 if __name__ == '__main__':
     parser = argparse.ArgumentParser(
         description='Automates the download of SQL dump backups via a phpMyAdmin web interface.',
-        epilog='Written by Christoph Haunschmidt, version: {}'.format(__version__))
+        epilog='Written by Christoph Haunschmidt et al., version: {}'.format(__version__))
 
     parser.add_argument('url', metavar='URL', help='phpMyAdmin login page url')
     parser.add_argument('user', metavar='USERNAME', help='phpMyAdmin login username')
     parser.add_argument('password', metavar='PASSWORD', help='phpMyAdmin login password')
     parser.add_argument('-o', '--output-directory', default=os.getcwd(),
-        help='output directory for the SQL dump file (default: the current working directory)')
+                        help='output directory for the SQL dump file (default: the current working directory)')
     parser.add_argument('-p', '--prepend-date', action='store_true', default=False,
-        help='prepend current UTC date & time to the filename; see the --prefix-format option for custom formatting')
+                        help='prepend current UTC date & time to the filename; '
+                             'see the --prefix-format option for custom formatting')
     parser.add_argument('-e', '--exclude-dbs', default='',
-        help='comma-separated list of database names to exclude from the dump')
-    parser.add_argument('-s', '--server-name', default=None, help='mysql server hostname to supply if enabled as field on login page')
+                        help='comma-separated list of database names to exclude from the dump')
+    parser.add_argument('-s', '--server-name', default=None,
+                        help='mysql server hostname to supply if enabled as field on login page')
     parser.add_argument('--compression', default='none', choices=['none', 'zip', 'gzip'],
-        help='compression method for the output file - must be supported by the server (default: %(default)s)')
+                        help='compression method for the output file - must be supported by the server (default: %(default)s)')
     parser.add_argument('--basename', default=None,
-        help='the desired basename (without extension) of the SQL dump file (default: the name given by phpMyAdmin); '
-        'you can also set an empty basename "" in combination with --prepend-date and --prefix-format')
+                        help='the desired basename (without extension) of the SQL dump file (default: the name given '
+                             'by phpMyAdmin); you can also set an empty basename "" in combination with '
+                             '--prepend-date and --prefix-format')
     parser.add_argument('--timeout', type=int, default=60,
-        help='timeout in seconds for the requests (default: %(default)s)')
+                        help='timeout in seconds for the requests (default: %(default)s)')
     parser.add_argument('--overwrite-existing', action='store_true', default=False,
-        help='overwrite existing SQL dump files (instead of appending a number to the name)')
+                        help='overwrite existing SQL dump files (instead of appending a number to the name)')
     parser.add_argument('--prefix-format', default='',
-        help=str('the prefix format for --prepend-date (default: "{}"); in Python\'s strftime format. '
-                 'Must be used with --prepend-date to be in effect'.format(DEFAULT_PREFIX_FORMAT.replace('%', '%%'))))
+                        help=str('the prefix format for --prepend-date (default: "{}"); in Python\'s strftime format. '
+                                 'Must be used with --prepend-date to be in effect'.format(
+                            DEFAULT_PREFIX_FORMAT.replace('%', '%%'))))
     parser.add_argument('--dry-run', action='store_true', default=False,
-        help='dry run, do not actually download any file')
+                        help='dry run, do not actually download any file')
     parser.add_argument('--http-auth', default=None,
-        help='Basic http authentication, using format "username:password"')
+                        help='Basic HTTP authentication, using format "username:password"')
 
     args = parser.parse_args()
 
@@ -146,4 +160,4 @@ def download_sql_backup(url, user, password, dry_run=False, overwrite_existing=F
         sys.exit(1)
 
     print('{} saved SQL dump to: {}'.format(('Would have' if args.dry_run else 'Successfully'), dump_fn),
-        file=sys.stdout)
+          file=sys.stdout)