import: get build dir from settings.gradle

[fdroidserver.git] / fdroidserver / import.py

diff --git a/fdroidserver/import.py b/fdroidserver/import.py
index 43e395b74557da927c53168ec70c04f9d3d1af65..550e7469398d166bcfc0db35b5fec2bf244bb4f3 100644 (file)
--- a/fdroidserver/import.py
+++ b/fdroidserver/import.py
@@ -26,11 +26,15 @@ from argparse import ArgumentParser
 from configparser import ConfigParser
 import logging
 
+from . import _
 from . import common
 from . import metadata
 from .exception import FDroidException
 
 
+SETTINGS_GRADLE = re.compile('''include\s+['"]:([^'"]*)['"]''')
+
+
 # Get the repo type and address from the given web page. The page is scanned
 # in a rather naive manner for 'git clone xxxx', 'hg clone xxxx', etc, and
 # when one of these is found it's assumed that's the information we want.
@@ -59,7 +63,7 @@ def getrepofrompage(url):
         repo = page[index + 9:]
         index = repo.find('<')
         if index == -1:
-            return (None, "Error while getting repo address")
+            return (None, _("Error while getting repo address"))
         repo = repo[:index]
         repo = repo.split('"')[0]
         return (repotype, repo)
@@ -71,12 +75,12 @@ def getrepofrompage(url):
         repo = page[index + 10:]
         index = repo.find('<')
         if index == -1:
-            return (None, "Error while getting repo address")
+            return (None, _("Error while getting repo address"))
         repo = repo[:index]
         repo = repo.split('"')[0]
         return (repotype, repo)
 
-    return (None, "No information found." + page)
+    return (None, _("No information found.") + page)
 
 
 config = None
@@ -87,7 +91,7 @@ def get_metadata_from_url(app, url):
 
     tmp_dir = 'tmp'
     if not os.path.isdir(tmp_dir):
-        logging.info("Creating temporary directory")
+        logging.info(_("Creating temporary directory"))
         os.makedirs(tmp_dir)
 
     # Figure out what kind of project it is...
@@ -132,7 +136,7 @@ def get_metadata_from_url(app, url):
         app.SourceCode = url + '/src'
         app.IssueTracker = url + '/issues'
         # Figure out the repo type and adddress...
-        repotype, repo = getrepofrompage(app.SourceCode)
+        repotype, repo = getrepofrompage(url)
         if not repotype:
             raise FDroidException("Unable to determine vcs type. " + repo)
     elif url.startswith('https://') and url.endswith('.git'):
@@ -179,6 +183,13 @@ def get_subdir(build_dir):
     if options.subdir:
         return os.path.join(build_dir, options.subdir)
 
+    settings_gradle = os.path.join(build_dir, 'settings.gradle')
+    if os.path.exists(settings_gradle):
+        with open(settings_gradle) as fp:
+            m = SETTINGS_GRADLE.search(fp.read())
+            if m:
+                return os.path.join(build_dir, m.group(1))
+
     return build_dir
 
 
@@ -190,15 +201,15 @@ def main():
     parser = ArgumentParser()
     common.setup_global_opts(parser)
     parser.add_argument("-u", "--url", default=None,
-                        help="Project URL to import from.")
+                        help=_("Project URL to import from."))
     parser.add_argument("-s", "--subdir", default=None,
-                        help="Path to main android project subdirectory, if not in root.")
+                        help=_("Path to main Android project subdirectory, if not in root."))
     parser.add_argument("-c", "--categories", default=None,
-                        help="Comma separated list of categories.")
+                        help=_("Comma separated list of categories."))
     parser.add_argument("-l", "--license", default=None,
-                        help="Overall license of the project.")
+                        help=_("Overall license of the project."))
     parser.add_argument("--rev", default=None,
-                        help="Allows a different revision (or git branch) to be specified for the initial import")
+                        help=_("Allows a different revision (or git branch) to be specified for the initial import"))
     metadata.add_metadata_arguments(parser)
     options = parser.parse_args()
     metadata.warnings_action = options.W
@@ -214,7 +225,7 @@ def main():
 
     local_metadata_files = common.get_local_metadata_files()
     if local_metadata_files != []:
-        raise FDroidException("This repo already has local metadata: %s" % local_metadata_files[0])
+        raise FDroidException(_("This repo already has local metadata: %s") % local_metadata_files[0])
 
     if options.url is None and os.path.isdir('.git'):
         app.AutoName = os.path.basename(os.getcwd())
@@ -252,11 +263,11 @@ def main():
 
         versionName, versionCode, package = common.parse_androidmanifests(paths, app)
         if not package:
-            raise FDroidException("Couldn't find package ID")
+            raise FDroidException(_("Couldn't find package ID"))
         if not versionName:
-            logging.warn("Couldn't find latest version name")
+            logging.warn(_("Couldn't find latest version name"))
         if not versionCode:
-            logging.warn("Couldn't find latest version code")
+            logging.warn(_("Couldn't find latest version code"))
     else:
         spec = os.path.join(root_dir, 'buildozer.spec')
         if os.path.exists(spec):
@@ -268,7 +279,7 @@ def main():
             versionName = bconfig.get('app', 'version')
             versionCode = None
         else:
-            raise FDroidException("No android or kivy project could be found. Specify --subdir?")
+            raise FDroidException(_("No android or kivy project could be found. Specify --subdir?"))
 
     # Make sure it's actually new...
     if package in apps:
@@ -303,7 +314,7 @@ def main():
         with open('build/.fdroidvcs-' + package, 'w') as f:
             f.write(app.RepoType + ' ' + app.Repo)
 
-        metadatapath = os.path.join('metadata', package + '.txt')
+        metadatapath = os.path.join('metadata', package + '.yml')
         metadata.write_metadata(metadatapath, app)
         logging.info("Wrote " + metadatapath)