Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

mwscript: use .php lists by default #3966

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

mwscript: use .php lists by default #3966

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b8cb2f8
mwscript: use .php lists by default
Universal-Omega Sep 25, 2024
463affc
Use .php in tests
Universal-Omega Sep 25, 2024
1027309
-TODO
Universal-Omega Sep 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions modules/mediawiki/files/bin/mwscript.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,12 @@ def syscheck(result: CommandInfo | int) -> CommandInfo:


def get_dblist_file(name: str) -> str:
# Check if .php file exists, if not, fallback to .json
if os.path.exists(f'/srv/mediawiki/cache/{name}.php'):
return f'{name}.php'
# Check if .json file exists, if not, use .php by default
# In the future, we will remove support for .json and always use PHP
if os.path.exists(f'/srv/mediawiki/cache/{name}.json'):
return f'{name}.json'

return f'{name}.json'
return f'{name}.php'


def get_commands(args: argparse.Namespace) -> CommandInfo | int:
Expand Down
8 changes: 4 additions & 4 deletions modules/mediawiki/files/bin/test_mwscript.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ def test_get_command_extension_list(mock_getlogin):
args.version = '1.39'
assert mwscript.syscheck(mwscript.get_commands(args)) == {
'confirm': False,
'command': f'sudo -u www-data /usr/local/bin/foreachwikiindblist /home/{os.environ["LOGNAME"]}/CheckUser.json /srv/mediawiki/1.39/maintenance/test.php',
'command': f'sudo -u www-data /usr/local/bin/foreachwikiindblist /home/{os.environ["LOGNAME"]}/CheckUser.php /srv/mediawiki/1.39/maintenance/test.php',
'generate': f'php /srv/mediawiki/1.39/extensions/MirahezeMagic/maintenance/generateExtensionDatabaseList.php --wiki=loginwiki --extension=CheckUser --directory=/home/{os.environ["LOGNAME"]}',
'long': True,
'nolog': False,
Expand All @@ -41,7 +41,7 @@ def test_get_command_all():
args.script = 'test.php'
args.arguments = ['all']
args.version = '1.39'
assert mwscript.syscheck(mwscript.get_commands(args)) == {'confirm': False, 'command': 'sudo -u www-data /usr/local/bin/foreachwikiindblist /srv/mediawiki/cache/databases.json /srv/mediawiki/1.39/maintenance/test.php', 'generate': None, 'long': True, 'nolog': False}
assert mwscript.syscheck(mwscript.get_commands(args)) == {'confirm': False, 'command': 'sudo -u www-data /usr/local/bin/foreachwikiindblist /srv/mediawiki/cache/databases.php /srv/mediawiki/1.39/maintenance/test.php', 'generate': None, 'long': True, 'nolog': False}


def test_get_command_args():
Expand Down Expand Up @@ -86,7 +86,7 @@ def test_get_command_extension_list_runner(mock_getlogin):
args.version = '1.40'
assert mwscript.syscheck(mwscript.get_commands(args)) == {
'confirm': False,
'command': f'sudo -u www-data /usr/local/bin/foreachwikiindblist /home/{os.environ["LOGNAME"]}/CheckUser.json /srv/mediawiki/1.40/maintenance/run.php /srv/mediawiki/1.40/maintenance/test.php',
'command': f'sudo -u www-data /usr/local/bin/foreachwikiindblist /home/{os.environ["LOGNAME"]}/CheckUser.php /srv/mediawiki/1.40/maintenance/run.php /srv/mediawiki/1.40/maintenance/test.php',
'generate': f'php /srv/mediawiki/1.40/maintenance/run.php /srv/mediawiki/1.40/extensions/MirahezeMagic/maintenance/generateExtensionDatabaseList.php --wiki=loginwiki --extension=CheckUser --directory=/home/{os.environ["LOGNAME"]}',
'long': True,
'nolog': False,
Expand All @@ -98,7 +98,7 @@ def test_get_command_all_runner():
args.script = 'test.php'
args.arguments = ['all']
args.version = '1.40'
assert mwscript.syscheck(mwscript.get_commands(args)) == {'confirm': False, 'command': 'sudo -u www-data /usr/local/bin/foreachwikiindblist /srv/mediawiki/cache/databases.json /srv/mediawiki/1.40/maintenance/run.php /srv/mediawiki/1.40/maintenance/test.php', 'generate': None, 'long': True, 'nolog': False}
assert mwscript.syscheck(mwscript.get_commands(args)) == {'confirm': False, 'command': 'sudo -u www-data /usr/local/bin/foreachwikiindblist /srv/mediawiki/cache/databases.php /srv/mediawiki/1.40/maintenance/run.php /srv/mediawiki/1.40/maintenance/test.php', 'generate': None, 'long': True, 'nolog': False}


def test_get_command_args_runner():
Expand Down
Loading