Commit f1f73a40 authored by echel0n's avatar echel0n Committed by echel0n

NEW: Rewrote the startup/restat/shutdown of the app to utilize tornado's...

NEW: Rewrote the startup/restat/shutdown of the app to utilize tornado's ioloop and autoreload features.
NEW: Replaced scheduler with APScheduler.
NEW: Rewrote provider modules to create dynamic instances on the fly and switched to using dicts.
NEW: Removed libs folder and created requirements.txt for installing required libs
NEW: Added in v2 API access for theTVDB.com to support better searches.
FIX: Corrected several filenaming pep8 issues.
FIX: Seperated variables from core code in main __init__ file.
FIX: Fixed several bugs related to metadata parsing.

Many additions, correctios, and bugfixes have gone into this beta release for me to list so please use with caution as always and enjoy!
parent eac348dc

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.

# SR Travis-CI Files #
######################
/.travis.yml
# SR Markdown Files #
######################
/contributing.md
/readme.md
/README.md
# SR User Related #
######################
/cache/
/Logs/
/data/
restore/
backup*/
cache.db*
config.ini*
sickbeard.db*
failed.db*
autoProcessTV.cfg
server.crt
server.key
/restore/
/backup*/
/cache.db*
/config.ini*
/sickbeard.db*
/sickrage.db*
/failed.db*
/autoProcessTV.cfg
/server.crt
/server.key
# SR Test Related #
######################
/tests/Logs/
/tests/cache/
/tests/sickbeard.db*
/tests/sickrage.db*
/tests/cache.db*
/tests/failed.db
/tests/data/
......@@ -46,7 +49,6 @@ server.key
*.sw?
Session.vim
.ropeproject/*
*.iml
.idea
*.ipr
.settings/*
......@@ -63,10 +65,6 @@ Thumbs.db
*~
*.torrent
# Unrar Executable #
######################
lib/unrar2/UnRAR.exe
# Bower #
######################
bower_components
......
This diff is collapsed.
......@@ -16,7 +16,7 @@
<meta name="theme-color" content="#333333">
% endif
<title>SickRage - BRANCH:[${sickbeard.BRANCH}] - ${title}</title>
<title>SickRage - BRANCH:[${sickbeard.GIT_BRANCH}] - ${title}</title>
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
......
<%inherit file="/layouts/main.mako"/>
<%!
import sys, os
import sickbeard
from sickbeard import db
import db
from sickbeard.helpers import anon_url
import sys, os
%>
<%block name="content">
% if not header is UNDEFINED:
......@@ -27,7 +27,7 @@
<table class="infoTable" cellspacing="1" border="0" cellpadding="0" width="100%">
<tr><td class="infoTableHeader">SR Version: </td><td class="infoTableCell">
% if sickbeard.VERSION_NOTIFY:
BRANCH: (${sickbeard.BRANCH}) / COMMIT: (${sickbeard.CUR_COMMIT_HASH}) <!-- &ndash; build.date //--><br>
BRANCH: (${sickbeard.GIT_BRANCH}) / COMMIT: (${sickbeard.CUR_COMMIT_HASH}) <!-- &ndash; build.date //--><br>
% else:
You don't have version checking turned on. Please turn on "Check for Update" in Config > General.<br>
% endif
......
......@@ -3,9 +3,9 @@
import datetime
import locale
import sickbeard
from sickbeard.common import SKIPPED, WANTED, UNAIRED, ARCHIVED, IGNORED, SNATCHED, SNATCHED_PROPER, SNATCHED_BEST, FAILED
from sickbeard.common import Quality, qualityPresets, statusStrings, qualityPresetStrings, cpu_presets
from sickbeard.sbdatetime import sbdatetime, date_presets, time_presets
from common import SKIPPED, WANTED, UNAIRED, ARCHIVED, IGNORED, SNATCHED, SNATCHED_PROPER, SNATCHED_BEST, FAILED
from common import Quality, qualityPresets, statusStrings, qualityPresetStrings, cpu_presets
from sbdatetime import sbdatetime, date_presets, time_presets
from sickbeard import config
from sickbeard import metadata
from sickbeard.metadata.generic import GenericMetadata
......
......@@ -3,9 +3,9 @@
import datetime
import locale
import sickbeard
from sickbeard.common import SKIPPED, WANTED, UNAIRED, ARCHIVED, IGNORED, SNATCHED, SNATCHED_PROPER, SNATCHED_BEST, FAILED
from sickbeard.common import Quality, qualityPresets, statusStrings, qualityPresetStrings, cpu_presets
from sickbeard.sbdatetime import sbdatetime, date_presets, time_presets
from common import SKIPPED, WANTED, UNAIRED, ARCHIVED, IGNORED, SNATCHED, SNATCHED_PROPER, SNATCHED_BEST, FAILED
from common import Quality, qualityPresets, statusStrings, qualityPresetStrings, cpu_presets
from sbdatetime import sbdatetime, date_presets, time_presets
from sickbeard import config
from sickbeard import metadata
from sickbeard.metadata.generic import GenericMetadata
......@@ -114,7 +114,8 @@
<label for="log_dir">
<span class="component-title">Log file folder location</span>
<span class="component-desc">
<input type="text" name="log_dir" id="log_dir" value="${sickbeard.ACTUAL_LOG_DIR}" class="form-control input-sm input350" autocapitalize="off" />
<input type="text" name="log_dir" id="log_dir" value="${sickbeard.LOG_DIR}"
class="form-control input-sm input350" autocapitalize="off"/>
</span>
</label>
</div>
......@@ -211,7 +212,8 @@
<label>
<span class="component-title">Check the server every*</span>
<span class="component-desc">
<input type="text" name="update_frequency" id="update_frequency" value="${sickbeard.UPDATE_FREQUENCY}" class="form-control input-sm input75" />
<input type="text" name="update_frequency" id="update_frequency"
value="${sickbeard.UPDATER_FREQ}" class="form-control input-sm input75"/>
<p>hours for software updates (default:12)</p>
</span>
</label>
......@@ -610,6 +612,7 @@
<span class="component-desc">
<input type="text" name="proxy_setting" value="${sickbeard.PROXY_SETTING}" class="form-control input-sm input300" autocapitalize="off" />
<div class="clear-left"><p>blank to disable or proxy to use when connecting to providers</p></div>
</span>
</label>
</div>
......@@ -627,12 +630,15 @@
<label for="skip_removed_files">
<span class="component-title">Skip Remove Detection</span>
<span class="component-desc">
<input type="checkbox" name="skip_removed_files" id="skip_removed_files" ${('', 'checked="checked"')[bool(sickbeard.SKIP_REMOVED_FILES)]}/>
<p>Skip detection of removed files. If disable it will set default deleted status</p>
<input type="checkbox" name="skip_removed_files"
id="skip_removed_files" ${('', 'checked="checked"')[bool(sickbeard.SKIP_REMOVED_FILES)]}/>
<p>Skip detection of removed files. If disable it will set default deleted
status</p>
</span>
<div class="clear-left">
<span class="component-desc"><b>NOTE:</b> This may mean SickRage misses renames as well</span>
<span class="component-desc"><b>NOTE:</b> This may mean SickRage misses renames as well</span>
</div>
</label>
</div>
<div class="field-pair">
......@@ -679,18 +685,18 @@
<span class="component-title">Branch version:</span>
<span class="component-desc">
<select id="branchVersion" class="form-control form-control-inline input-sm pull-left">
<% gh_branch = sickbeard.versionCheckScheduler.action.list_remote_branches() %>
% if gh_branch:
% for cur_branch in gh_branch:
% if sickbeard.GIT_USERNAME and sickbeard.GIT_PASSWORD and sickbeard.DEVELOPER == 1:
<option value="${cur_branch}" ${('', 'selected="selected"')[sickbeard.BRANCH == cur_branch]}>${cur_branch}</option>
% elif sickbeard.GIT_USERNAME and sickbeard.GIT_PASSWORD and cur_branch in ['master', 'develop']:
<option value="${cur_branch}" ${('', 'selected="selected"')[sickbeard.BRANCH == cur_branch]}>${cur_branch}</option>
% elif cur_branch == 'master':
<option value="${cur_branch}" ${('', 'selected="selected"')[sickbeard.BRANCH == cur_branch]}>${cur_branch}</option>
% endif
% endfor
% endif
<% gh_branch = sickbeard.UPDATER.list_remote_branches %>
% if gh_branch:
% for cur_branch in gh_branch:
% if sickbeard.GIT_USERNAME and sickbeard.GIT_PASSWORD and sickbeard.DEVELOPER == 1:
<option value="${cur_branch}" ${('', 'selected="selected"')[sickbeard.GIT_BRANCH == cur_branch]}>${cur_branch}</option>
% elif sickbeard.GIT_USERNAME and sickbeard.GIT_PASSWORD and cur_branch in ['master', 'develop']:
<option value="${cur_branch}" ${('', 'selected="selected"')[sickbeard.GIT_BRANCH == cur_branch]}>${cur_branch}</option>
% elif cur_branch == 'master':
<option value="${cur_branch}" ${('', 'selected="selected"')[sickbeard.GIT_BRANCH == cur_branch]}>${cur_branch}</option>
% endif
% endfor
% endif
</select>
% if not gh_branch:
<input class="btn btn-inline" style="margin-left: 6px;" type="button" id="branchCheckout" value="Checkout Branch" disabled>
......
......@@ -3,8 +3,8 @@
import re
import sickbeard
from sickbeard.helpers import anon_url
from sickbeard.common import SKIPPED, WANTED, UNAIRED, ARCHIVED, IGNORED, SNATCHED, SNATCHED_PROPER, SNATCHED_BEST, FAILED
from sickbeard.common import Quality, qualityPresets, statusStrings, qualityPresetStrings, cpu_presets, multiEpStrings
from common import SKIPPED, WANTED, UNAIRED, ARCHIVED, IGNORED, SNATCHED, SNATCHED_PROPER, SNATCHED_BEST, FAILED
from common import Quality, qualityPresets, statusStrings, qualityPresetStrings, cpu_presets, multiEpStrings
%>
<%block name="scripts">
......
......@@ -2,8 +2,8 @@
<%!
import os.path
import sickbeard
from sickbeard.common import SKIPPED, WANTED, UNAIRED, ARCHIVED, IGNORED, SNATCHED, SNATCHED_PROPER, SNATCHED_BEST, FAILED
from sickbeard.common import Quality, qualityPresets, statusStrings, qualityPresetStrings, cpu_presets, multiEpStrings
from common import SKIPPED, WANTED, UNAIRED, ARCHIVED, IGNORED, SNATCHED, SNATCHED_PROPER, SNATCHED_BEST, FAILED
from common import Quality, qualityPresets, statusStrings, qualityPresetStrings, cpu_presets, multiEpStrings
from sickbeard import config
from sickbeard import metadata
from sickbeard.metadata.generic import GenericMetadata
......@@ -87,7 +87,9 @@
<div class="field-pair">
<label class="nocheck">
<span class="component-title">Auto Post-Processing Frequency</span>
<input type="number" min="10" name="autopostprocesser_frequency" id="autopostprocesser_frequency" value="${sickbeard.AUTOPOSTPROCESSER_FREQUENCY}" class="form-control input-sm input75" />
<input type="number" min="10" name="autopostprocesser_frequency"
id="autopostprocesser_frequency" value="${sickbeard.AUTOPOSTPROCESSOR_FREQ}"
class="form-control input-sm input75"/>
</label>
<label class="nocheck">
<span class="component-title">&nbsp;</span>
......@@ -1073,7 +1075,7 @@
</div>
% for (cur_name, cur_generator) in m_dict.iteritems():
<% cur_metadata_inst = sickbeard.metadata_provider_dict[cur_generator.name] %>
<% cur_metadata_inst = sickbeard.metadataProvideDict[cur_generator.name] %>
<% cur_id = cur_generator.get_id() %>
<div class="metadataDiv" id="${cur_id}">
<div class="metadata_options_wrapper">
......
This diff is collapsed.
......@@ -62,7 +62,7 @@
<select id="check_propers_interval" name="check_propers_interval" class="form-control input-sm">
<% check_propers_interval_text = {'daily': "24 hours", '4h': "4 hours", '90m': "90 mins", '45m': "45 mins", '15m': "15 mins"} %>
% for curInterval in ('daily', '4h', '90m', '45m', '15m'):
<option value="${curInterval}" ${('', 'selected="selected"')[sickbeard.CHECK_PROPERS_INTERVAL == curInterval]}>${check_propers_interval_text[curInterval]}</option>
<option value="${curInterval}" ${('', 'selected="selected"')[sickbeard.PROPER_SEARCHER_INTERVAL == curInterval]}>${check_propers_interval_text[curInterval]}</option>
% endfor
</select>
</span>
......@@ -74,8 +74,11 @@
<label>
<span class="component-title">Backlog search frequency</span>
<span class="component-desc">
<input type="text" name="backlog_frequency" value="${sickbeard.BACKLOG_FREQUENCY}" class="form-control input-sm input75" />
<p>time in minutes between searches (min. ${sickbeard.MIN_BACKLOG_FREQUENCY})</p>
<input type="text" name="backlog_frequency"
value="${sickbeard.BACKLOG_SEARCHER_FREQ}"
class="form-control input-sm input75"/>
<p>time in minutes between searches (min. ${sickbeard.MIN_BACKLOG_SEARCHER_FREQ}
)</p>
</span>
</label>
</div>
......@@ -84,8 +87,10 @@
<label>
<span class="component-title">Daily search frequency</span>
<span class="component-desc">
<input type="text" name="dailysearch_frequency" value="${sickbeard.DAILYSEARCH_FREQUENCY}" class="form-control input-sm input75" />
<p>time in minutes between searches (min. ${sickbeard.MIN_DAILYSEARCH_FREQUENCY})</p>
<input type="text" name="dailysearch_frequency"
value="${sickbeard.DAILY_SEARCHER_FREQ}"