Merge pull request #680 from pymedusa/beta

Merge beta into master
pymedusa · Jun 12, 2016 · d0c1d27 · d0c1d27
2 parents d707b2b + e6c8442
commit d0c1d27
Show file tree

Hide file tree

Showing 108 changed files with 8,834 additions and 10,538 deletions.
diff --git a/.pullapprove.yml b/.pullapprove.yml
@@ -4,40 +4,14 @@ reject_regex: (^Rejected|^Fix it)
 reset_on_push: false
 reviewers:
   -
-    name: backend-devs
+    name: devs
     required: 1
     members:
       - duramato
       - fernandog
       - labrys
       - medariox
+      - ratoaq2
       - p0psicles
-      - adaur
-# # CONDITIONS REQUIRE PRO ACCOUNT
-#    conditions:
-#      branches:
-#        - master
-#        - beta
-#        - develop
-#      files:
-#        - "*.py"
-  -
-    name: gui-devs
-    required: 1
-    members:
-      - Labrys
       - OmgImAlexis
-      - p0psicles
-# # CONDITIONS REQUIRE PRO ACCOUNT
-#    conditions:
-#      branches:
-#        - master
-#        - beta
-#        - develop
-#      files:
-#        - "gui/"
-  -
-    name: support
-    required: 0
-    members:
-      - neoatomic
+      - adaur
diff --git a/SickBeard.py b/SickBeard.py
@@ -43,8 +43,8 @@
                          is installed
 """
 
-from __future__ import unicode_literals
 from __future__ import print_function
+from __future__ import unicode_literals
 
 import codecs
 import datetime
@@ -94,7 +94,7 @@
 import sickbeard
 from sickbeard import db, logger, network_timezones, failed_history, name_cache
 from sickbeard.tv import TVShow
-from sickbeard.webserveInit import SRWebServer
+from sickbeard.server.core import SRWebServer
 from sickbeard.event_queue import Events
 from configobj import ConfigObj  # pylint: disable=import-error
 

diff --git a/gui/slick/images/manualsearch-white.png b/gui/slick/images/manualsearch-white.png
diff --git a/gui/slick/images/providers/bithdtv.png b/gui/slick/images/providers/bithdtv.png
diff --git a/gui/slick/images/providers/zooqle.png b/gui/slick/images/providers/zooqle.png
diff --git a/gui/slick/views/config_general.mako b/gui/slick/views/config_general.mako
@@ -4,7 +4,7 @@
     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.common import Quality, qualityPresets, statusStrings, qualityPresetStrings, cpu_presets, privacy_levels
     from sickbeard.sbdatetime import sbdatetime, date_presets, time_presets
     from sickbeard import config
     from sickbeard import metadata
@@ -526,26 +526,6 @@
                             </label>
                         </div>
 
-                        <div class="field-pair">
-                            <label for="debug">
-                                <span class="component-title">Enable debug</span>
-                                <span class="component-desc">
-                                    <input type="checkbox" name="debug" id="debug" ${('', 'checked="checked"')[bool(sickbeard.DEBUG)]}/>
-                                    <p>Enable debug logs<p>
-                                </span>
-                            </label>
-                        </div>
-
-                        <div class="field-pair">
-                            <label for="subliminal_log">
-                                <span class="component-title">Subliminal logs</span>
-                                <span class="component-desc">
-                                    <input type="checkbox" name="subliminal_log" id="subliminal_log" ${('', 'checked="checked"')[bool(sickbeard.SUBLIMINAL_LOG)]}/>
-                                    <p>enable logs from subliminal library (subtitles)</p>
-                                </span>
-                            </label>
-                        </div>
-
                         <div class="field-pair">
                             <label for="ssl_verify">
                                 <span class="component-title">Verify SSL Certs</span>
@@ -608,6 +588,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>
 
@@ -631,6 +612,7 @@
                                 <div class="clear-left">
                                 <span class="component-desc"><b>NOTE:</b> This may mean Medusa misses renames as well</span>
                                 </div>
+                            </label>
                         </div>
 
                         <div class="field-pair">
@@ -663,6 +645,53 @@
                         <input type="submit" class="btn config_submitter" value="Save Changes" />
                     </fieldset>
                 </div>
+                <div class="component-group">
+                    <div class="component-group-desc">
+                        <h3>Logging</h3>
+                    </div>
+                    <fieldset class="component-group-list">
+                        <div class="field-pair">
+                            <label for="debug">
+                                <span class="component-title">Enable debug</span>
+                                <span class="component-desc">
+                                    <input type="checkbox" name="debug" id="debug" ${('', 'checked="checked"')[bool(sickbeard.DEBUG)]}/>
+                                    <p>Enable debug logs<p>
+                                </span>
+                            </label>
+                        </div>
+
+                        <div class="field-pair">
+                            <label for="subliminal_log">
+                                <span class="component-title">Subliminal logs</span>
+                                <span class="component-desc">
+                                    <input type="checkbox" name="subliminal_log" id="subliminal_log" ${('', 'checked="checked"')[bool(sickbeard.SUBLIMINAL_LOG)]}/>
+                                    <p>enable logs from subliminal library (subtitles)</p>
+                                </span>
+                            </label>
+                        </div>
+
+                        <div class="field-pair">
+                            <label>
+                                <span class="component-title">Privacy:</span>
+                                <span class="component-desc">
+                                    <select id="privacy_level" name="privacy_level" class="form-control input-sm">
+                                    % for privacy_level in ['high', 'normal', 'low', ]:
+                                        <option value="${privacy_level}" ${('', 'selected="selected"')[sickbeard.PRIVACY_LEVEL == privacy_level]}>${privacy_level.capitalize()}</option>
+                                    % endfor
+                                    </select>
+                                    <span>
+                                        Set the level of log-filtering.
+                                        Normal (default).
+                                        <br />NOTE: A restart may be required to take effect.
+                                        <br />WARNING: Setting to "DISABLED" will show sensitive information such as passwords in the logs!
+                                    </span>
+                                </span>
+                            </label>
+                        </div>
+                        <input type="submit" class="btn config_submitter" value="Save Changes" />
+                    </fieldset>
+
+                </div>
 
                 <div class="component-group">
                     <div class="component-group-desc">

diff --git a/gui/slick/views/config_postProcessing.mako b/gui/slick/views/config_postProcessing.mako
@@ -82,7 +82,7 @@
                         <div class="field-pair">
                             <label class="nocheck">
                                 <span class="component-title">Auto Post-Processing Frequency</span>
-                                <input type="number" min="10" step="1" name="autopostprocesser_frequency" id="autopostprocesser_frequency" value="${sickbeard.AUTOPOSTPROCESSER_FREQUENCY}" class="form-control input-sm input75" />
+                                <input type="number" min="10" step="1" name="autopostprocessor_frequency" id="autopostprocessor_frequency" value="${sickbeard.AUTOPOSTPROCESSOR_FREQUENCY}" class="form-control input-sm input75" />
                             </label>
                             <label class="nocheck">
                                 <span class="component-title">&nbsp;</span>

diff --git a/gui/slick/views/config_providers.mako b/gui/slick/views/config_providers.mako
@@ -402,7 +402,7 @@ $('#config-components').tabs();
                             <label for="${curTorrentProvider.get_id()}_password">
                                 <span class="component-title">Password:</span>
                                 <span class="component-desc">
-                                    <input type="password" name="${curTorrentProvider.get_id()}_password" id="${curTorrentProvider.get_id()}_password" value="${curTorrentProvider.password}" class="form-control input-sm input350" autocomplete="no" autocapitalize="off" />
+                                    <input type="password" name="${curTorrentProvider.get_id()}_password" id="${curTorrentProvider.get_id()}_password" value="${curTorrentProvider.password | h}" class="form-control input-sm input350" autocomplete="no" autocapitalize="off" />
                                 </span>
                             </label>
                         </div>