1
0
Fork 0
mirror of https://gitlab.com/SIGBUS/nyaa.git synced 2024-12-30 17:51:55 +00:00
Go to file
queue 4fcef92b94
elasticsearch 7.x compatability (#576)
* es_mapping: update turning off dynamic mappings

they changed it in 6.x

https://www.elastic.co/guide/en/elasticsearch/reference/current/dynamic.html
https://github.com/elastic/elasticsearch/pull/25734

* es_mapping: remove _all field

deprecated in 6.0 anyway

* es_mapping.yml: fix deprecated mapping type

https://www.elastic.co/guide/en/elasticsearch/reference/6.7/removal-of-types.html#_schedule_for_removal_of_mapping_types

it gives a really unhelpful error otherwise, oof.

* es: fix remaining 7.xisms

the enabled: false apparently only applies to
"object" fields now, need index: false

and the _type got removed everywhere. Seems to work now.

* Fix weird offset error with word_delimiter_graph

yet another es7-ism i guess

* Fix warning and some app stuff for ES 7.x

Co-authored-by: Arylide <Arylide@users.noreply.github.com>
2020-07-12 00:10:47 -07:00
.docker feature: docker development environment (#544) 2019-01-15 18:02:59 +01:00
.github Words (#355) 2017-09-01 18:14:11 -04:00
configs moved some files 2017-05-17 00:53:54 -07:00
info_dicts Move bencoded info dicts from mysql torrent_info table to info_dict directory. DB change! 2018-02-02 20:39:02 +01:00
migrations Add trusted application functionality (#533) 2019-08-10 18:18:44 -07:00
nyaa elasticsearch 7.x compatability (#576) 2020-07-12 00:10:47 -07:00
tests tests: add tests for XML char replacement 2019-02-25 12:27:09 +01:00
torrents Move bencoded info dicts from mysql torrent_info table to info_dict directory. DB change! 2018-02-02 20:39:02 +01:00
utils Add very simple benchmarking support when debugging 2019-04-08 19:31:34 +03:00
.gitattributes Add .gitattributes (#310) 2017-07-26 18:57:46 +03:00
.gitignore Small changes to README.MD and .gitignore (#476) 2018-04-23 00:27:09 -07:00
.travis.yml Move to Python 3.7 and update dependencies (#551) 2019-08-10 18:39:53 -07:00
config.example.py ratelimit: add app config examples 2020-06-23 00:49:26 +02:00
create_es.sh elasticsearch 7.x compatability (#576) 2020-07-12 00:10:47 -07:00
db_create.py Refactor into an app factory [2 of 2] (#322) 2017-08-01 21:02:08 +03:00
db_migrate.py Refactor into an app factory [2 of 2] (#322) 2017-08-01 21:02:08 +03:00
dev.py Nyaa development helper (tool) (#324) 2017-08-06 00:04:38 +03:00
es_mapping.yml elasticsearch 7.x compatability (#576) 2020-07-12 00:10:47 -07:00
es_sync_config.example.json Update import_to_es.py to index both torrent flavors, rename sync_es config 2017-05-28 02:12:48 +03:00
import_to_es.py elasticsearch 7.x compatability (#576) 2020-07-12 00:10:47 -07:00
LICENSE Add license (GPLv3) 2017-05-13 01:03:42 +03:00
lint.sh Nyaa development helper (tool) (#324) 2017-08-06 00:04:38 +03:00
rangeban.py Implement range bans (#478) 2018-06-29 20:15:04 -07:00
README.md Move to Python 3.7 and update dependencies (#551) 2019-08-10 18:39:53 -07:00
requirements.txt Add login endpoint rate limiting 2020-06-23 00:49:26 +02:00
run.py Refactor into an app factory [2 of 2] (#322) 2017-08-01 21:02:08 +03:00
setup.cfg Nyaa development helper (tool) (#324) 2017-08-06 00:04:38 +03:00
sync_es.py elasticsearch 7.x compatability (#576) 2020-07-12 00:10:47 -07:00
trackers.txt Replace leechers-paradise with desync (#536) 2018-12-13 18:05:26 -08:00
uwsgi.ini Initial commit. 2017-05-12 20:51:49 +02:00
WSGI.py Refactor into an app factory [2 of 2] (#322) 2017-08-01 21:02:08 +03:00

NyaaV2 Build Status

Setting up for development

This project uses Python 3.7. There are features used that do not exist in 3.6, so make sure to use Python 3.7. This guide also assumes you 1) are using Linux and 2) are somewhat capable with the commandline.
It's not impossible to run Nyaa on Windows, but this guide doesn't focus on that.

Code Quality:

  • Before we get any deeper, remember to follow PEP8 style guidelines and run ./dev.py lint before committing to see a list of warnings/problems.
    • You may also use ./dev.py fix && ./dev.py isort to automatically fix some of the issues reported by the previous command.
  • Other than PEP8, try to keep your code clean and easy to understand, as well. It's only polite!

Running Tests

The tests folder contains tests for the the nyaa module and the webserver. To run the tests:

  • Make sure that you are in the python virtual environment.
  • Run ./dev.py test while in the repository directory.

Setting up Pyenv

pyenv eases the use of different Python versions, and as not all Linux distros offer 3.7 packages, it's right up our alley.

Setting up MySQL/MariaDB database

You may use SQLite but the current support for it in this project is outdated and rather unsupported.

  • Enable USE_MYSQL flag in config.py
  • Install latest mariadb by following instructions here https://downloads.mariadb.org/mariadb/repositories/
    • Tested versions: mysql Ver 15.1 Distrib 10.0.30-MariaDB, for debian-linux-gnu (x86_64) using readline 5.2
  • Run the following commands logged in as your root db user (substitute for your own config.py values if desired):
    • CREATE USER 'test'@'localhost' IDENTIFIED BY 'test123';
    • GRANT ALL PRIVILEGES ON *.* TO 'test'@'localhost';
    • FLUSH PRIVILEGES;
    • CREATE DATABASE nyaav2 DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;

Finishing up

  • Run python db_create.py to create the database and import categories
    • Follow the advice of db_create.py and run ./db_migrate.py stamp head to mark the database version for Alembic
  • Start the dev server with python run.py
  • When you are finished developing, deactivate your virtualenv with pyenv deactivate or source deactivate (or just close your shell session)

You're now ready for simple testing and development!
Continue below to learn about database migrations and enabling the advanced search engine, Elasticsearch.

Database migrations

  • Database migrations are done with flask-Migrate, a wrapper around Alembic.
  • If someone has made changes in the database schema and included a new migration script:
    • If your database has never been marked by Alembic (you're on a database from before the migrations), run ./db_migrate.py stamp head before pulling the new migration script(s).
      • If you already have the new scripts, check the output of ./db_migrate.py history instead and choose a hash that matches your current database state, then run ./db_migrate.py stamp <hash>.
    • Update your branch (eg. git fetch && git rebase origin/master)
    • Run ./db_migrate.py upgrade head to run the migration. Done!
  • If you have made a change in the database schema:
    • Save your changes in models.py and ensure the database schema matches the previous version (ie. your new tables/columns are not added to the live database)
    • Run ./db_migrate.py migrate -m "Short description of changes" to automatically generate a migration script for the changes
      • Check the script (migrations/versions/...) and make sure it works! Alembic may not able to notice all changes.
    • Run ./db_migrate.py upgrade to run the migration and verify the upgrade works.
      • (Run ./db_migrate.py downgrade to verify the downgrade works as well, then upgrade again)

Setting up and enabling Elasticsearch

Installing Elasticsearch

Enabling MySQL Binlogging

  • Edit your MariaDB/MySQL server configuration and add the following under [mariadb]:
    log-bin
    server_id=1
    log-basename=master1
    binlog-format=row
    
  • Restart MariaDB/MySQL (sudo service mysql restart)
  • Copy the example configuration (es_sync_config.example.json) as es_sync_config.json and adjust options in it to your liking (verify the connection options!)
  • Connect to mysql as root
    • Verify that the result of SHOW VARIABLES LIKE 'binlog_format'; is ROW
    • Execute GRANT REPLICATION SLAVE ON *.* TO 'username'@'localhost'; to allow your configured user access to the binlog

Setting up ES

  • Run ./create_es.sh to create the indices for the torrents: nyaa and sukebei
    • The output should show acknowledged: true twice
  • Stop the Nyaa app if you haven't already
  • Run python import_to_es.py to import all the torrents (on nyaa and sukebei) into the ES indices.
    • This may take some time to run if you have plenty of torrents in your database.

Enable the USE_ELASTIC_SEARCH flag in config.py and (re)start the application.
Elasticsearch should now be functional! The ES indices won't be updated "live" with the current setup, continue below for instructions on how to hook Elasticsearch up to MySQL binlog.

However, take note that binglog is not necessary for simple ES testing and development; you can simply run import_to_es.py from time to time to reindex all the torrents.

Setting up sync_es.py

sync_es.py keeps the Elasticsearch indices updated by reading the binlog and pushing the changes to the ES indices.

  • Make sure es_sync_config.json is configured with the user you grated the REPLICATION permissions
  • Run import_to_es.py and copy the outputted JSON into the file specified by save_loc in your es_sync_config.json
  • Run sync_es.py as-is or, for actual deployment, set it up as a service and run it, preferably as the system/root
    • Make sure sync_es.py runs within the venv with the right dependencies!

You're done! The script should now be feeding updates from the database to Elasticsearch.
Take note, however, that the specified ES index refresh interval is 30 seconds, which may feel like a long time on local development. Feel free to adjust it or poke Elasticsearch yourself!