Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.7-alpine3.9
FROM python:3.9-alpine3.14
LABEL maintainer="pymedusa"

ARG GIT_BRANCH
Expand Down
4 changes: 2 additions & 2 deletions dredd/api-description.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1368,7 +1368,7 @@ definitions:
type: array
description:
Array of objects with a mapping of indexer numbering to scene numbering. Available through the detailed query param.
Mappings are pulled from TheXem.de.
Mappings are pulled from thexem.info.
items:
$ref: '#/definitions/episodeMapping'
sceneAbsoluteNumbering:
Expand All @@ -1390,7 +1390,7 @@ definitions:
type: array
description:
Array of manually configured episode mappings of absolute to scene absolute numbering.
Mappings are pulled from TheXem.de.
Mappings are pulled from thexem.info.
items:
type: object
properties:
Expand Down
8 changes: 6 additions & 2 deletions medusa/app.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,12 @@ def __init__(self):
self.CONFIG_INI = 'config.ini'
self.GIT_ORG = 'pymedusa'
self.GIT_REPO = 'Medusa'
self.BASE_PYMEDUSA_URL = 'https://cdn.pymedusa.com'
self.CHANGES_URL = '{base_url}/news/CHANGELOG.md'.format(base_url=self.BASE_PYMEDUSA_URL)

self.BASE_MEDUSA_URL = 'https://raw.githubusercontent.com/pymedusa/Medusa/refs/heads/master'
self.BASE_PYMEDUSA_URL = 'https://raw.githubusercontent.com/pymedusa/medusa.github.io/refs/heads/master'
self.CHANGES_URL = '{base_url}/news/CHANGELOG.md'.format(base_url=self.BASE_MEDUSA_URL)

self.NETWORK_URL = os.getenv('NETWORK_URL', self.BASE_PYMEDUSA_URL)
self.APPLICATION_URL = 'https://github.com/{org}/{repo}'.format(org=self.GIT_ORG, repo=self.GIT_REPO)
self.DONATIONS_URL = '{0}/wiki/Donations'.format(self.APPLICATION_URL)
self.WIKI_URL = '{0}/wiki'.format(self.APPLICATION_URL)
Expand Down
2 changes: 1 addition & 1 deletion medusa/network_timezones.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
def update_network_dict():
"""Update timezone information from Medusa repositories."""
logger.log('Started updating network timezones', logger.DEBUG)
url = '{base_url}/sb_network_timezones/network_timezones.txt'.format(base_url=app.BASE_PYMEDUSA_URL)
url = '{base_url}/sb_network_timezones/network_timezones.txt'.format(base_url=app.NETWORK_URL)
response = session.get(url)
if not response or not response.text:
logger.log('Updating network timezones failed, this can happen from time to time. URL: %s' % url, logger.INFO)
Expand Down
2 changes: 1 addition & 1 deletion medusa/notifiers/join.py
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ def _sendjoin(self, title, message, join_api=None, join_device=None, force=False

join_api = join_api or app.JOIN_API
join_device = join_device or app.JOIN_DEVICE
icon_url = 'https://cdn.pymedusa.com/images/ico/favicon-310.png'
icon_url = '{base_url}/images/ico/favicon-310.png'.format(base_url=app.BASE_PYMEDUSA_URL)

params = {'title': title, 'text': message, 'deviceId': join_device, 'apikey': join_api, 'icon': icon_url}

Expand Down
2 changes: 1 addition & 1 deletion medusa/notifiers/slack.py
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ def _send_slack(self, message=None, webhook=None):
data = {
'text': message,
'username': 'MedusaBot',
'icon_url': 'https://cdn.pymedusa.com/images/ico/favicon-310.png'
'icon_url': '{base_url}/images/ico/favicon-310.png'.format(base_url=app.BASE_PYMEDUSA_URL)
}

try:
Expand Down
2 changes: 1 addition & 1 deletion medusa/scene_exceptions.py
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,7 @@ def _get_custom_exceptions(force):

def _get_xem_exceptions(force):
xem_exceptions = defaultdict(dict)
url = 'http://thexem.de/map/allNames'
url = 'http://thexem.info/map/allNames'
params = {
'origin': None,
'seasonNumbers': 1,
Expand Down
4 changes: 2 additions & 2 deletions medusa/scene_numbering.py
Original file line number Diff line number Diff line change
Expand Up @@ -564,14 +564,14 @@ def xem_refresh(series_obj, force=False):
logger.log(u'{0} is an unsupported indexer in XEM'.format(indexerApi(indexer_id).name), logger.DEBUG)
return
# XEM MAP URL
url = 'http://thexem.de/map/havemap?origin={0}'.format(indexerApi(indexer_id).config['xem_origin'])
url = 'http://thexem.info/map/havemap?origin={0}'.format(indexerApi(indexer_id).config['xem_origin'])
parsed_json = safe_session.get_json(url)
if not parsed_json or 'result' not in parsed_json or 'success' not in parsed_json['result'] or 'data' not in parsed_json or str(series_id) not in parsed_json['data']:
logger.log(u'No XEM data for show ID {0} on {1}'.format(series_id, series_obj.indexer_name), logger.DEBUG)
return

# XEM API URL
url = 'http://thexem.de/map/all?id={0}&origin={1}&destination=scene'.format(series_id, indexerApi(indexer_id).config['xem_origin'])
url = 'http://thexem.info/map/all?id={0}&origin={1}&destination=scene'.format(series_id, indexerApi(indexer_id).config['xem_origin'])
parsed_json = safe_session.get_json(url)
if not parsed_json or 'result' not in parsed_json or 'success' not in parsed_json['result']:
logger.log(u'No XEM data for show ID {0} on {1}'.format(indexer_id, series_obj.indexer_name), logger.DEBUG)
Expand Down
2 changes: 1 addition & 1 deletion medusa/tv/series.py
Original file line number Diff line number Diff line change
Expand Up @@ -1964,7 +1964,7 @@ def add_scene_numbering(self):
# should go by scene numbering or indexer numbering. Warn the user.
if not self.scene and get_xem_numbering_for_show(self):
log.warning(
'{id}: while adding the show {title} we noticed thexem.de has an episode mapping available'
'{id}: while adding the show {title} we noticed thexem.info has an episode mapping available'
'\nyou might want to consider enabling the scene option for this show.',
{'id': self.series_id, 'title': self.name}
)
Expand Down
2 changes: 1 addition & 1 deletion themes-default/slim/src/components/display-show.vue
Original file line number Diff line number Diff line change
Expand Up @@ -971,7 +971,7 @@ export default {
}
}

// Scene numbering downloaded from thexem.de.
// Scene numbering downloaded from thexem.info.
if (xemNumbering.length !== 0) {
const mapped = xemNumbering.filter(x => {
return x.source.season === episode.season && x.source.episode === episode.episode;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
<div
v-if="!exception.custom"
class="external-scene-exception"
v-tooltip.right="'This exception has been automatically added through an automated process sourcing title aliases from medusa github repo, thexem.de or anidb.info'"
v-tooltip.right="'This exception has been automatically added through an automated process sourcing title aliases from medusa github repo, thexem.info or anidb.info'"
>
<div class="align-center">
<img src="images/ico/favicon-16.png" width="16" height="16" alt="search" title="This exception has been automatically added through an automated process sourcing title aliases from medusa github repo, thexem.de or anidb.info">
<img src="images/ico/favicon-16.png" width="16" height="16" alt="search" title="This exception has been automatically added through an automated process sourcing title aliases from medusa github repo, thexem.info or anidb.info">
</div>
</div>
<div v-else class="input-group-btn" @click="removeException(exception)">
Expand Down
2 changes: 1 addition & 1 deletion themes-default/slim/src/components/manage-searches.vue
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ export default {
}, {
id: 'xem',
name: 'XEM',
url: 'http://thexem.de',
url: 'http://thexem.info',
lastRefresh: ''
}, {
id: 'anidb',
Expand Down
2 changes: 1 addition & 1 deletion themes-default/slim/src/components/show-header.vue
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@
<img alt="[trakt]" height="16" width="16" src="images/trakt.png">
</app-link>

<app-link v-if="show.xemNumbering && show.xemNumbering.length > 0" :href="`http://thexem.de/search?q=${show.title}`" :title="`http://thexem.de/search?q=${show.title}`">
<app-link v-if="show.xemNumbering && show.xemNumbering.length > 0" :href="`http://thexem.info/search?q=${show.title}`" :title="`http://thexem.info/search?q=${show.title}`">
<img alt="[xem]" height="16" width="16" src="images/xem.png" style="margin-top: -1px; vertical-align:middle;">
</app-link>

Expand Down
6 changes: 3 additions & 3 deletions themes-default/slim/test/__fixtures__/app-link.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
},
"xemOrigin": "tvdb",
"icon": "thetvdb16.png",
"scene_loc": "https://cdn.pymedusa.com/scene_exceptions/scene_exceptions_tvdb.json",
"scene_loc": "https://raw.githubusercontent.com/pymedusa/medusa.github.io/refs/heads/master/scene_exceptions/scene_exceptions_tvdb.json",
"baseUrl": "https://api.thetvdb.com/",
"showUrl": "https://www.thetvdb.com/dereferrer/series/",
"mappedTo": "tvdb_id",
Expand All @@ -32,7 +32,7 @@
},
"xemOrigin": null,
"icon": "tvmaze16.png",
"scene_loc": "https://cdn.pymedusa.com/scene_exceptions/scene_exceptions_tvmaze.json",
"scene_loc": "https://raw.githubusercontent.com/pymedusa/medusa.github.io/refs/heads/master/scene_exceptions/scene_exceptions_tvmaze.json",
"baseUrl": "http://api.tvmaze.com/",
"showUrl": "http://www.tvmaze.com/shows/",
"mappedTo": "tvmaze_id",
Expand All @@ -48,7 +48,7 @@
},
"xemOrigin": null,
"icon": "tmdb16.png",
"scene_loc": "https://cdn.pymedusa.com/scene_exceptions/scene_exceptions_tmdb.json",
"scene_loc": "https://raw.githubusercontent.com/pymedusa/medusa.github.io/refs/heads/master/scene_exceptions/scene_exceptions_tmdb.json",
"baseUrl": "https://www.themoviedb.org/",
"showUrl": "https://www.themoviedb.org/tv/",
"mappedTo": "tmdb_id",
Expand Down
6 changes: 3 additions & 3 deletions themes-default/slim/test/__fixtures__/common.json
Original file line number Diff line number Diff line change
Expand Up @@ -508,7 +508,7 @@
},
"xemOrigin": "tvdb",
"icon": "thetvdb16.png",
"scene_loc": "https://cdn.pymedusa.com/scene_exceptions/scene_exceptions_tvdb.json",
"scene_loc": "https://raw.githubusercontent.com/pymedusa/medusa.github.io/refs/heads/master/scene_exceptions/scene_exceptions_tvdb.json",
"baseUrl": "https://api.thetvdb.com/",
"showUrl": "https://www.thetvdb.com/dereferrer/series/",
"mappedTo": "tvdb_id",
Expand All @@ -524,7 +524,7 @@
},
"xemOrigin": null,
"icon": "tvmaze16.png",
"scene_loc": "https://cdn.pymedusa.com/scene_exceptions/scene_exceptions_tvmaze.json",
"scene_loc": "https://raw.githubusercontent.com/pymedusa/medusa.github.io/refs/heads/master/scene_exceptions/scene_exceptions_tvmaze.json",
"baseUrl": "http://api.tvmaze.com/",
"showUrl": "http://www.tvmaze.com/shows/",
"mappedTo": "tvmaze_id",
Expand All @@ -540,7 +540,7 @@
},
"xemOrigin": null,
"icon": "tmdb16.png",
"scene_loc": "https://cdn.pymedusa.com/scene_exceptions/scene_exceptions_tmdb.json",
"scene_loc": "https://raw.githubusercontent.com/pymedusa/medusa.github.io/refs/heads/master/scene_exceptions/scene_exceptions_tmdb.json",
"baseUrl": "https://www.themoviedb.org/",
"showUrl": "https://www.themoviedb.org/tv/",
"mappedTo": "tmdb_id",
Expand Down
8 changes: 4 additions & 4 deletions themes/dark/assets/js/medusa-runtime.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion themes/dark/assets/js/medusa-runtime.js.map

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions themes/light/assets/js/medusa-runtime.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion themes/light/assets/js/medusa-runtime.js.map

Large diffs are not rendered by default.