Fix dereferer for comments link, apply sabnzbd priority, rename umask…

… to chmod

changelog.md

@@ -1,6 +1,13 @@
 # NZB Hydra changelog
 
 ----------
+### 0.2.227
+Fixed: Dereferer not used for NZB details links. See [#653](https://github.com/theotherp/nzbhydra/issues/653).
+
+Fixed: Sabnzbd default category priority not applied for uploads. See [#666](https://github.com/theotherp/nzbhydra/issues/666)
+
+Changed: Renamed "umask" to "chmod". See [#659](https://github.com/theotherp/nzbhydra/issues/659)
+
 ### 0.2.226
 Fixed: Query generation for manual TV searches in combination with raw search engines would fail. See [#651](https://github.com/theotherp/nzbhydra/issues/651)
 

nzbhydra/downloader.py

@@ -232,7 +232,7 @@ def add_link(self, link, title, category):
                 title += ".nzb"
 
         f = self.get_sab()
-        f.add({"mode": "addurl", "name": link, "nzbname": title})
+        f.add({"mode": "addurl", "name": link, "nzbname": title, "priority": "-100"})
         if category is not None:
             f.add({"cat": category})
         try:
@@ -252,7 +252,7 @@ def add_nzb(self, content, title, category):
                 title += ".nzb"
 
         f = self.get_sab()
-        f.add({"mode": "addfile", "nzbname": title})
+        f.add({"mode": "addfile", "nzbname": title, "priority": "-100"})
         if category is not None:
             f.add({"cat": category})
         try:

nzbhydra/tests/playground.py

@@ -18,7 +18,7 @@ def startTest(apikey, query):
     try:
         print("Starting request")
         before = arrow.now()
-        r = requests.get("http://127.0.0.1:5075/api?q=%s&t=search&apikey=apikey" % (query))
+        r = requests.get("http://127.0.0.1:5076/api?q=%s&t=search&apikey=apikey" % (query))
         r.raise_for_status()
         after = arrow.now()
         took = (after - before).seconds * 1000 + (after - before).microseconds / 1000
@@ -30,7 +30,7 @@ def startTest(apikey, query):
 
 
 runs = 5
-concurrent_searches = 2
+concurrent_searches = 3
 letters = ["1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11"]
 beforeallruns = arrow.now()
 for x in range(1, runs + 1):
@@ -40,7 +40,7 @@ def startTest(apikey, query):
     print("Starting test run #%d/%d" % (x, runs))
     for i in range(1, concurrent_searches + 1):
         beforerun = arrow.now()
-        t = threading.Thread(target=startTest, args=(letters[i], i,))
+        t = threading.Thread(target=startTest, args=(letters[i], str(i)+"-"+str(x),))
         #sleep(1)
         threads.append(t)
         t.start()

static/html/directives/search-result-non-title-columns.html

@@ -21,7 +21,7 @@
         <i class="fa fa-file-text" aria-hidden="true" ng-class="::{'fuzzy-nfo': result.has_nfo == 2}" style="margin-left:3px; margin-right:3px; vertical-align: middle"></i>
     </a>
     <span ng-if="showDetailsDl">
-        <a ng-class="::{'no-nfo': !result.comments}" href="{{::result.details_link}}" target="_blank" class="no-underline"
+        <a ng-class="::{'no-nfo': !result.comments}" href="{{::result.details_link | dereferer}}" target="_blank" class="no-underline"
            uib-tooltip="Comments"
            tooltip-placement="top"
            tooltip-trigger="mouseenter">

ui-src/html/directives/search-result-non-title-columns.html

@@ -21,7 +21,7 @@
         <i class="fa fa-file-text" aria-hidden="true" ng-class="::{'fuzzy-nfo': result.has_nfo == 2}" style="margin-left:3px; margin-right:3px; vertical-align: middle"></i>
     </a>
     <span ng-if="showDetailsDl">
-        <a ng-class="::{'no-nfo': !result.comments}" href="{{::result.details_link}}" target="_blank" class="no-underline"
+        <a ng-class="::{'no-nfo': !result.comments}" href="{{::result.details_link | dereferer}}" target="_blank" class="no-underline"
            uib-tooltip="Comments"
            tooltip-placement="top"
            tooltip-trigger="mouseenter">

ui-src/js/config-fields-service.js

@@ -509,8 +509,8 @@ function ConfigFields($injector) {
                             type: 'horizontalInput',
                             templateOptions: {
                                 type: 'text',
-                                label: 'Log file umask',
-                                help: 'Umask for log files (linux only)'
+                                label: 'Log file chmod',
+                                help: 'chmod for log files (linux only)'
                             },
                             watcher: {
                                 listener: restartListener

version.txt

@@ -1 +1 @@
-0.2.226
+0.2.227