Skip to content

Commit 9ea60fb

Browse files
Add optional message
filename is too long in some cases
1 parent 01040e2 commit 9ea60fb

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

lib/inputstreamhelper.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ def _json_rpc_request(self, payload):
169169

170170
return json.loads(response)
171171

172-
def _http_request(self, download=False):
172+
def _http_request(self, download=False, message=None):
173173
"""Makes HTTP request and displays a progress dialog on download."""
174174
self._log('Request URL: {0}'.format(self._url))
175175
filename = self._url.split('/')[-1]
@@ -190,10 +190,12 @@ def _http_request(self, download=False):
190190

191191
busy_dialog.close()
192192
if download:
193+
if not message: # display "downloading [filename]"
194+
message = self._language(30015).format(filename)
193195
self._download_path = os.path.join(self._temp_path(), filename)
194196
total_length = float(req.headers.get('content-length'))
195197
progress_dialog = xbmcgui.DialogProgress()
196-
progress_dialog.create(self._language(30014), self._language(30015).format(filename))
198+
progress_dialog.create(self._language(30014), message)
197199

198200
with open(self._download_path, 'wb') as f:
199201
dl = 0
@@ -353,7 +355,7 @@ def _install_widevine_cdm_arm(self):
353355
dialog.ok(self._language(30004), self._language(30021).format('losetup'))
354356
return False
355357

356-
downloaded = self._http_request(download=True)
358+
downloaded = self._http_request(download=True, message=self._language(30022))
357359
if downloaded:
358360
if not self._unzip_bin() or not self._losetup() or not self._mnt_loop_dev():
359361
self._cleanup()

resources/language/resource.language.en_gb/strings.po

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,3 +97,6 @@ msgctxt "#30021"
9797
msgid "[B]'{0}'[/B] command needs to exist on system to extract the [B]Widevine DRM[/B]."
9898
msgstr ""
9999

100+
msgctxt "#30022"
101+
msgid "Downloading Chrome OS recovery image."
102+
msgstr ""

0 commit comments

Comments
 (0)