1266740 - Resync search plugins for 4.0

Status: RESOLVED FIXED

(Firefox for iOS :: General, defect)

Description

[Mike Kaply [:mkaply]]

Due to the addition of some Googles codes in Mobile, we need to resync the search plugins.

Before this happens, two things need to happen:

1. I need to understand what channel you sync from. There is an order problem with list.txt for en-US that we might need to fix manually in github. (It's not fixed in any other places because it's not needed on Android mobile).

2. This PR:

https://github.com/mozilla/firefox-ios/pull/1730

Will need to be merged.

Comment 1

[Francesco Lodolo [:flod]]

Adding Brian since he's the one who built the system to sync iOS and Android, and he's most familiar with it. Not sure if he also did the search implementation.

To answer your question #1: l10n is synced from aurora
https://github.com/mozilla/firefox-ios/blob/master/Client/Assets/Search/scrape_plugins.py#L136

And you should be able to set up overrides as you want for English
https://github.com/mozilla/firefox-ios/tree/master/Client/Assets/Search/SearchOverrides/en

Comment 2

[Mike Kaply [:mkaply]]

Unfortunately this particular override is a change to list.txt, so that won't work.

I'll get the reorder checked into aurora and we can sync from there.

Comment 3

[Brian Nicholson (:bnicholson)]

en-US is actually the only locale we *don't* sync (we probably should, but it's not part of the l10n repo and haven't gotten around to including it separately). The entire set of en-US engines, including list.txt, is in the overrides directory that flod linked to.

Comment 4

[Mike Kaply [:mkaply]]

> en-US is actually the only locale we *don't* sync (we probably should, but it's not part of the l10n repo and haven't gotten around to including it separately). The entire set of en-US engines, including list.txt, is in the overrides directory that flod linked to.

Beautiful. I'll do some testing and then add list.txt changes to my pull request.

Comment 5

[Mike Kaply [:mkaply]]

> The entire set of en-US engines, including list.txt, is in the overrides directory that flod linked to.

I did some builds and testing and in all my tests, it was using the engines from SearchPlugins/en not SearchOverrides/en.

Not sure why. I guess it really shouldn't matter though. I should probably make my changes in both places.

Comment 6

[Brian Nicholson (:bnicholson)]

Whenever we update the search engines, we re-run the search import script (scrape_plugins.py). That script completely deletes the SearchPlugins directory and redownloads every Android search engine, importing them into a newly-created SearchPlugins directory. This process also includes making any iOS-specific changes to the search engines by copying engines in the Overrides directory to the SearchPlugins directory (full details at [1]).

So the general workflow for updating engines is to update the engines in their respective l10n repos or add items to overlays/overrides, then re-run the script. You generally don't need to modify SearchPlugins directly -- it will be updated when you run the script.

Sorry for being unclear before!

[1] https://github.com/mozilla/firefox-ios/tree/master/Client/Assets/Search#import-process

Comment 7

[Mike Kaply [:mkaply]]

Attachment: Update EN search plugins

This updates the en overrides to the new engines.

After this is done, we'll need to resync the engines.

Comment 8

[Brian Nicholson (:bnicholson)]

Comment on attachment 8744919 [details] [review]
Update EN search plugins

Looks fine to me! I'll run the script and commit.

Comment 9

[Brian Nicholson (:bnicholson)]

Merged. Also updated the script to ignore :hidden engines and did a fresh import.

master: f9e8311
v4.x: 1467228