diff options
| author | Lucian Branescu Mihaila <lucian.branescu@gmail.com> | 2009-11-09 16:51:41 (GMT) |
|---|---|---|
| committer | Lucian Branescu Mihaila <lucian.branescu@gmail.com> | 2009-11-09 16:51:41 (GMT) |
| commit | 80f2e0dea350f08c17ec216233b9911863e88941 (patch) | |
| tree | aac089c1aa7cfc7b10721a00b5623580d84727df | |
| parent | 0e5585f457be03e929a04345aab5529c9fe12319 (diff) | |
Browse can now open any .zip file; also, it will look for both index.html and start.html as entry points.
| -rw-r--r-- | activity/activity.info | 2 | ||||
| -rw-r--r-- | downloadmanager.py | 1 | ||||
| -rw-r--r-- | webactivity.py | 12 |
3 files changed, 10 insertions, 5 deletions
diff --git a/activity/activity.info b/activity/activity.info index 794e767..95e4f23 100644 --- a/activity/activity.info +++ b/activity/activity.info @@ -4,5 +4,5 @@ activity_version = 114 bundle_id = org.laptop.WebActivity icon = activity-web exec = sugar-activity webactivity.WebActivity -s -mime_types = image/png;image/gif;image/jpeg;text/html;text/uri-list;application/xhtml+xml;application/rss+xml;application/xml;text/css;application/ogg;audio/x-wav;audio/ogg;video/ogg;audio/x-vorbis+ogg;audio/x-flac+ogg;audio/x-speex+ogg;video/x-theora+ogg;video/x-ogm+ogg +mime_types = image/png;image/gif;image/jpeg;text/html;text/uri-list;application/xhtml+xml;application/rss+xml;application/xml;text/css;application/ogg;audio/x-wav;audio/ogg;video/ogg;audio/x-vorbis+ogg;audio/x-flac+ogg;audio/x-speex+ogg;video/x-theora+ogg;video/x-ogm+ogg;application/zip license = GPLv2+ diff --git a/downloadmanager.py b/downloadmanager.py index 2b513e7..bde77bf 100644 --- a/downloadmanager.py +++ b/downloadmanager.py @@ -494,6 +494,7 @@ class _SaveDocumentProgressListener(object): self._jobject.metadata['icon-color'] = \ profile.get_color().to_string() self._jobject.metadata['mime_type'] = 'application/zip' + # make extra sure it will be opened by Browse self._jobject.metadata['activity'] = 'org.laptop.WebActivity' self._jobject.file_path = self._zip_path datastore.write(self._jobject) diff --git a/webactivity.py b/webactivity.py index 8007bce..f881ea7 100644 --- a/webactivity.py +++ b/webactivity.py @@ -404,11 +404,15 @@ class WebActivity(activity.Activity): for i in z.namelist(): open(os.path.join(temp_dir, i), 'wb').write(z.read(i)) - index_path = os.path.join(temp_dir, 'index.html') - if os.path.isfile(index_path): - self._tabbed_view.props.current_browser.load_uri(index_path) + entry_points = ['index.html', 'start.html'] + for i in entry_points: + index_path = os.path.join(temp_dir, i) + + if os.path.isfile(index_path): + self._tabbed_view.props.current_browser.load_uri(index_path) + break else: - self._tabbed_view.props.current_browser.load_uri(temp_dir) + self._tabbed_view.props.current_browser.load_uri(temp_dir) else: self._tabbed_view.props.current_browser.load_uri(file_path) |