Allow download of json and txt extensions for win builds (mozilla#119)

Nebelhom · Oct 20, 2013 · cc8ec8b · cc8ec8b
1 parent b7530d0
commit cc8ec8b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/mozdownload/scraper.py b/mozdownload/scraper.py
@@ -443,8 +443,8 @@ def binary_regex(self):
                         'linux64': r'\.%(EXT)s$',
                         'mac': r'\.%(EXT)s$',
                         'mac64': r'\.%(EXT)s$',
-                        'win32': r'(\.installer)%(STUB)s\.%(EXT)s$',
-                        'win64': r'(\.installer)%(STUB)s\.%(EXT)s$'}
+                        'win32': r'(\.installer)?%(STUB)s\.%(EXT)s$',
+                        'win64': r'(\.installer)?%(STUB)s\.%(EXT)s$'}
         regex = regex_base_name + regex_suffix[self.platform]
 
         return regex % {'APP': self.application,
@@ -701,8 +701,8 @@ def binary_regex(self):
                         'linux64': r'.*\.%(EXT)s$',
                         'mac': r'.*\.%(EXT)s$',
                         'mac64': r'.*\.%(EXT)s$',
-                        'win32': r'.*(\.installer)\.%(EXT)s$',
-                        'win64': r'.*(\.installer)\.%(EXT)s$'}
+                        'win32': r'.*(\.installer)?\.%(EXT)s$',
+                        'win64': r'.*(\.installer)?\.%(EXT)s$'}
 
         regex = regex_base_name + regex_suffix[self.platform]
 

diff --git a/tests/test_cases.md b/tests/test_cases.md
@@ -16,6 +16,7 @@ mozdownload -a firefox -t candidate -p linux -v 21.0
 mozdownload -a firefox -t candidate -p linux64 -v 21.0
 mozdownload -a firefox -t candidate -p mac -v 21.0
 mozdownload -a firefox -t candidate -p win32 -v 21.0
+mozdownload -a firefox -t candidate -p win32 -v 21.0 --extension=txt
 mozdownload -a firefox -t candidate -p win32 -v 21.0 -d firefox-candidate-builds
 mozdownload -a firefox -t candidate -p win32 -v 21.0 -l cs
 mozdownload -a firefox -t candidate -p win32 -v 21.0 -l en-GB
@@ -36,6 +37,7 @@ mozdownload -a firefox -t tinderbox -p mac64 --branch=mozilla-central
 mozdownload -a firefox -t tinderbox -p win32 --branch=mozilla-central
 mozdownload -a firefox -t tinderbox -p win64 --branch=mozilla-central
 mozdownload -a firefox -t tinderbox -p linux --branch=mozilla-central --extension=txt
+mozdownload -a firefox -t tinderbox -p linux --branch=mozilla-central --extension=json
 mozdownload -a firefox -t tinderbox -p win32 --branch=mozilla-central --debug-build
 mozdownload -a firefox -t tinderbox -p win32 --branch=mozilla-central -d firefox-tinderbox-builds
 mozdownload -a firefox -t tinderbox -p win32 --branch=mozilla-central -l el