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.

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

Fix basic searching using new-show.vue component. #8448

Merged
merged 45 commits into from
Nov 16, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
fd6ddcf
Fix basic searching using new-show.vue component.
p0psicles Sep 6, 2020
3c6b37d
Fix searching using cancel token.
p0psicles Sep 10, 2020
d77a0db
Added showLists to add-show-options.vue
p0psicles Sep 12, 2020
727dabf
Vueify addShowsExisting
p0psicles Sep 13, 2020
b2eb3ed
Make the new-show.vue component ready to be included in new-shows-exi…
p0psicles Sep 14, 2020
8c0535f
Replace jquery formwizard with vue-form-wizard.
p0psicles Sep 16, 2020
7a2a9f6
Added all steps from the addShowQueue item -> apiv2 series route.
p0psicles Sep 20, 2020
c9659c4
Fix handling result of a successful add new show.
p0psicles Sep 20, 2020
bbb8c10
Fix route to /home after adding a show.
p0psicles Sep 22, 2020
16eb7e9
Replace jquery tabs.
p0psicles Sep 22, 2020
6215a86
Add option to modify the auto anime list.
p0psicles Sep 23, 2020
f3c51c6
Use ShowQueue to add a show through apiv2.
p0psicles Sep 25, 2020
191d2e2
Return step updates through the websocket.
p0psicles Sep 27, 2020
88e5142
Add a div to show progress of the addShow queueitem.
p0psicles Sep 27, 2020
29c4560
Add options for adding unattended.
p0psicles Sep 28, 2020
c67cfa7
Fix pass preset options.
p0psicles Sep 29, 2020
ef7633d
Added option useCustomizeOptions to use the presetOptions.
p0psicles Oct 10, 2020
330fc6b
Remove explanation
p0psicles Oct 10, 2020
d40de5f
Merge remote-tracking branch 'remotes/origin/develop' into feature/vu…
p0psicles Oct 10, 2020
44e5af8
Update gitignore for unrar2.
p0psicles Oct 10, 2020
2587af8
bundle runtime & vendors after upmerge.
p0psicles Oct 10, 2020
49d4e3b
Add dialog for when adding a show that already has a folder in the se…
p0psicles Oct 22, 2020
830eb7f
cleanup server/web/home/add_shows.py.
p0psicles Oct 22, 2020
e28e1ab
Enable the externals lookup
p0psicles Oct 22, 2020
ce591bc
Replace vue-js-modal dialog with a dynamic modal. In modals/existing-…
p0psicles Oct 24, 2020
4365e45
Fix colors buttons light/dark layouts.
p0psicles Oct 25, 2020
97dfcdb
Don't hide table if season is false.
p0psicles Oct 26, 2020
024be9a
Merge remote-tracking branch 'remotes/origin/develop' into feature/vu…
p0psicles Oct 26, 2020
c73da72
Fix pytest
p0psicles Oct 26, 2020
c4902ae
Fix eslint
p0psicles Oct 26, 2020
a0834af
Fix default anime showlist.
p0psicles Oct 27, 2020
b6fff0a
Reealy fix it now
p0psicles Oct 27, 2020
2b4ccb2
Fix other addShow calls.
p0psicles Oct 27, 2020
4c2a0e4
Fix add shows through addShowByID()
p0psicles Oct 28, 2020
0e20503
Fix saveDefaults.
p0psicles Oct 28, 2020
4a59611
Fix cornflakes
p0psicles Oct 28, 2020
e4eb136
Fix lint-css
p0psicles Oct 28, 2020
5942b80
fix jest
p0psicles Oct 29, 2020
2de3855
Add config menu to config - anime.
p0psicles Oct 31, 2020
b51d7b6
* Renamed SHOWLIST_DEFAULT -> SHOWLISTS_DEFAULT
p0psicles Nov 16, 2020
f8adeb5
Change SHOWLIST_DEFAULT_ANIME: Allow to preselect multiple lists.
p0psicles Nov 16, 2020
450b5eb
Renamed SHOWLIST_DEFAULT_ANIME -> SHOWLISTS_DEFAULT_ANIME
medariox Nov 16, 2020
55251be
Merge branch 'develop' into feature/vueify-add-show
medariox Nov 16, 2020
572d961
Fix eslint & yarn dev
medariox Nov 16, 2020
89e9fe0
unrar2 was removed
medariox Nov 16, 2020
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
4 changes: 4 additions & 0 deletions medusa/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -605,6 +605,7 @@ def initialize(self, console_logging=True):
app.INDEXER_TIMEOUT = check_setting_int(app.CFG, 'General', 'indexer_timeout', 20)
app.ANIME_DEFAULT = bool(check_setting_int(app.CFG, 'General', 'anime_default', 0))
app.SCENE_DEFAULT = bool(check_setting_int(app.CFG, 'General', 'scene_default', 0))
app.SHOWLISTS_DEFAULT = check_setting_list(app.CFG, 'General', 'showlist_default', ['series'])
app.PROVIDER_ORDER = check_setting_list(app.CFG, 'General', 'provider_order')
app.NAMING_PATTERN = check_setting_str(app.CFG, 'General', 'naming_pattern', 'Season %0S/%SN - S%0SE%0E - %EN')
app.NAMING_ABD_PATTERN = check_setting_str(app.CFG, 'General', 'naming_abd_pattern', '%SN - %A.D - %EN')
Expand Down Expand Up @@ -972,6 +973,7 @@ def initialize(self, console_logging=True):
app.ANIME_SPLIT_HOME = bool(check_setting_int(app.CFG, 'ANIME', 'anime_split_home', 0))
app.ANIME_SPLIT_HOME_IN_TABS = bool(check_setting_int(app.CFG, 'ANIME', 'anime_split_home_in_tabs', 0))
app.AUTO_ANIME_TO_LIST = bool(check_setting_int(app.CFG, 'ANIME', 'auto_anime_to_list', 0))
app.SHOWLISTS_DEFAULT_ANIME = check_setting_list(app.CFG, 'ANIME', 'showlist_default_anime', [])

app.METADATA_KODI = check_setting_list(app.CFG, 'General', 'metadata_kodi', ['0'] * 10, transform=int)
app.METADATA_KODI_12PLUS = check_setting_list(app.CFG, 'General', 'metadata_kodi_12plus', ['0'] * 10, transform=int)
Expand Down Expand Up @@ -1559,6 +1561,7 @@ def save_config():
new_config['General']['tvdb_dvd_order_ep_ignore'] = int(app.TVDB_DVD_ORDER_EP_IGNORE)
new_config['General']['anime_default'] = int(app.ANIME_DEFAULT)
new_config['General']['scene_default'] = int(app.SCENE_DEFAULT)
new_config['General']['showlist_default'] = list(app.SHOWLISTS_DEFAULT)
new_config['General']['provider_order'] = app.PROVIDER_ORDER
new_config['General']['version_notify'] = int(app.VERSION_NOTIFY)
new_config['General']['auto_update'] = int(app.AUTO_UPDATE)
Expand Down Expand Up @@ -2010,6 +2013,7 @@ def save_config():
new_config['ANIME']['anime_split_home'] = int(app.ANIME_SPLIT_HOME)
new_config['ANIME']['anime_split_home_in_tabs'] = int(app.ANIME_SPLIT_HOME_IN_TABS)
new_config['ANIME']['auto_anime_to_list'] = int(app.AUTO_ANIME_TO_LIST)
new_config['ANIME']['showlist_default_anime'] = list(app.SHOWLISTS_DEFAULT_ANIME)

new_config.write()

Expand Down
2 changes: 2 additions & 0 deletions medusa/app.py
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,8 @@ def __init__(self):
self.INDEXER_TIMEOUT = None
self.SCENE_DEFAULT = False
self.ANIME_DEFAULT = False
self.SHOWLISTS_DEFAULT = ['series']
self.SHOWLISTS_DEFAULT_ANIME = []
self.PROVIDER_ORDER = []

self.NAMING_MULTI_EP = False
Expand Down
8 changes: 4 additions & 4 deletions medusa/indexers/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,14 @@ def indexer_id_to_name(indexer):
return indexerConfig[indexer]['identifier']


def indexer_id_to_slug(indexer, indexer_id):
"""Translate a shows indexex and indexer id to a slug.
def indexer_id_to_slug(indexer, series_id):
"""Translate a shows indexer and series id to a slug.

:param indexer: The indexer id. For example 1 for tvdb and 3 for tvmaze.
:param indexer_id: The shows id, for the specific indexer.
:param series_id: The shows id, for the specific indexer.
:return: A slug. For example tvdb1234 for indexer 1 and indexer id 1234.
"""
return '{name}{indexer_id}'.format(name=indexerConfig[indexer]['identifier'], indexer_id=indexer_id)
return '{name}{series_id}'.format(name=indexerConfig[indexer]['identifier'], series_id=series_id)


def slug_to_indexer_id(slug):
Expand Down
3 changes: 2 additions & 1 deletion medusa/queues/generic_queue.py
Original file line number Diff line number Diff line change
Expand Up @@ -115,13 +115,14 @@ def __init__(self, name, action_id=0):
self.added = None
self.queue_time = datetime.utcnow()
self.start_time = None
self.success = None
self._to_json = {
'identifier': str(uuid4()),
'name': self.name,
'priority': self.priority,
'actionId': self.action_id,
'queueTime': str(self.queue_time),
'success': None
'success': self.success
}

def run(self):
Expand Down
Loading