[MediaWiki-commits] [Gerrit] Removed dup opera script - change (analytics/zero-sms)
Yurik has uploaded a new change for review.
https://gerrit.wikimedia.org/r/159978
Change subject: Removed dup opera script
..
Removed dup opera script
Change-Id: I52cd6f42e7910282c7575a3ea0be2ff8ec79857b
---
D scripts/opera.py
M scripts/operaips.py
2 files changed, 2 insertions(+), 38 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/analytics/zero-sms
refs/changes/78/159978/1
diff --git a/scripts/opera.py b/scripts/opera.py
deleted file mode 100644
index 75cb56b..000
--- a/scripts/opera.py
+++ /dev/null
@@ -1,38 +0,0 @@
-import json
-import requests as r
-import api
-from logprocessor import ScriptProcessor
-
-
-class OperaIpUpdater(ScriptProcessor):
-def __init__(self, settingsFile='settings/opera.json'):
-super(OperaIpUpdater, self).__init__(settingsFile, 'opera')
-
-def run(self):
-res =
r.get('https://ipranges.opera.com/mini/operaranges/opera_ip_ranges.json',
proxies=self.proxyUrl)
-operaNets = sorted(set([v.subnet for v in api.parseJson(res)]))
-
-zerowiki = api.wikimedia('zero', 'wikimedia', 'https')
-if self.proxyUrl:
-zerowiki.session.proxies = self.proxyUrl
-
-zerowiki.login(self.settings.apiUsername, self.settings.apiPassword)
-
-title = 'Zero:-OPERA'
-res = next(zerowiki.queryPages(titles=title, prop='revisions',
rvprop='content'))
-data = json.loads(res.revisions[0]['*'], object_hook=api.AttrDict)
-
-if sorted(set(data.ipsets.default)) != operaNets:
-data.ipsets.default = operaNets
-text = json.dumps(data, indent=True, sort_keys=True)
-
-zerowiki(
-'edit',
-title=title,
-summary='(bot) refreshing opera IPs',
-text=text,
-token=zerowiki.token()
-)
-
-if __name__ == '__main__':
-OperaIpUpdater().safeRun()
diff --git a/scripts/operaips.py b/scripts/operaips.py
index 75cb56b..1a03d69 100644
--- a/scripts/operaips.py
+++ b/scripts/operaips.py
@@ -33,6 +33,8 @@
text=text,
token=zerowiki.token()
)
+else:
+print('Zero has the most recent list of IPs')
if __name__ == '__main__':
OperaIpUpdater().safeRun()
--
To view, visit https://gerrit.wikimedia.org/r/159978
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I52cd6f42e7910282c7575a3ea0be2ff8ec79857b
Gerrit-PatchSet: 1
Gerrit-Project: analytics/zero-sms
Gerrit-Branch: master
Gerrit-Owner: Yurik yu...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Removed dup opera script - change (analytics/zero-sms)
Yurik has submitted this change and it was merged.
Change subject: Removed dup opera script
..
Removed dup opera script
Change-Id: I52cd6f42e7910282c7575a3ea0be2ff8ec79857b
---
D scripts/opera.py
M scripts/operaips.py
2 files changed, 2 insertions(+), 38 deletions(-)
Approvals:
Yurik: Verified; Looks good to me, approved
diff --git a/scripts/opera.py b/scripts/opera.py
deleted file mode 100644
index 75cb56b..000
--- a/scripts/opera.py
+++ /dev/null
@@ -1,38 +0,0 @@
-import json
-import requests as r
-import api
-from logprocessor import ScriptProcessor
-
-
-class OperaIpUpdater(ScriptProcessor):
-def __init__(self, settingsFile='settings/opera.json'):
-super(OperaIpUpdater, self).__init__(settingsFile, 'opera')
-
-def run(self):
-res =
r.get('https://ipranges.opera.com/mini/operaranges/opera_ip_ranges.json',
proxies=self.proxyUrl)
-operaNets = sorted(set([v.subnet for v in api.parseJson(res)]))
-
-zerowiki = api.wikimedia('zero', 'wikimedia', 'https')
-if self.proxyUrl:
-zerowiki.session.proxies = self.proxyUrl
-
-zerowiki.login(self.settings.apiUsername, self.settings.apiPassword)
-
-title = 'Zero:-OPERA'
-res = next(zerowiki.queryPages(titles=title, prop='revisions',
rvprop='content'))
-data = json.loads(res.revisions[0]['*'], object_hook=api.AttrDict)
-
-if sorted(set(data.ipsets.default)) != operaNets:
-data.ipsets.default = operaNets
-text = json.dumps(data, indent=True, sort_keys=True)
-
-zerowiki(
-'edit',
-title=title,
-summary='(bot) refreshing opera IPs',
-text=text,
-token=zerowiki.token()
-)
-
-if __name__ == '__main__':
-OperaIpUpdater().safeRun()
diff --git a/scripts/operaips.py b/scripts/operaips.py
index 75cb56b..1a03d69 100644
--- a/scripts/operaips.py
+++ b/scripts/operaips.py
@@ -33,6 +33,8 @@
text=text,
token=zerowiki.token()
)
+else:
+print('Zero has the most recent list of IPs')
if __name__ == '__main__':
OperaIpUpdater().safeRun()
--
To view, visit https://gerrit.wikimedia.org/r/159978
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I52cd6f42e7910282c7575a3ea0be2ff8ec79857b
Gerrit-PatchSet: 1
Gerrit-Project: analytics/zero-sms
Gerrit-Branch: master
Gerrit-Owner: Yurik yu...@wikimedia.org
Gerrit-Reviewer: Yurik yu...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
