starred/newznab-tmux
1
0
Fork 0
mirror of https://github.com/NNTmux/newznab-tmux.git synced 2026-08-31 02:08:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
DariusIII
2014-09-08 21:59:02 +02:00
parent b62ee86a51 ce3924539d
commit 41bbbaefbb
23 changed files with 8 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/Enzebe.php
-1
View File
@@ -1,5 +1,4 @@
<?php
require_once(dirname(__FILE__) . "/../bin/config.php");
require_once(WWW_DIR."/lib/framework/db.php");
require_once(WWW_DIR."/lib/site.php");
require_once(WWW_DIR."/lib/category.php");
lib/IRCScraper.php
-1
View File
@@ -1,5 +1,4 @@
<?php
require_once(dirname(__FILE__) . "/../bin/config.php");
require_once(WWW_DIR . "/lib/framework/db.php");
require_once("prehash.php");
require_once("IRCClient.php");
lib/IRCScraper/scrape.php
-1
View File
@@ -1,5 +1,4 @@
<?php
require_once(dirname(__FILE__) . "/../../bin/config.php");
require_once(dirname(__FILE__) . "/../IRCScraper.php");
require_once 'settings.php';
if (!is_file('/var/www/newznab/misc/update_scripts/nix_scripts/tmux/lib/IRCScraper/settings.php')) {
lib/Info.php
-1
View File
@@ -1,5 +1,4 @@
<?php
require_once(dirname(__FILE__) . "/../bin/config.php");
require_once(WWW_DIR . "/lib/framework/db.php");
require_once(WWW_DIR . "/lib/site.php");
require_once(WWW_DIR . "/lib/Tmux.php");
lib/Konsole.php
-1
View File
@@ -1,5 +1,4 @@
<?php
require_once(dirname(__FILE__)."/../bin/config.php");
require_once(WWW_DIR."/lib/framework/db.php");
require_once(WWW_DIR."/lib/amazon.php");
require_once(WWW_DIR."lib/site.php");
lib/Pprocess.php
-1
View File
@@ -1,5 +1,4 @@
<?php
require_once(dirname(__FILE__) . "/../bin/config.php");
require_once(WWW_DIR . "lib/rarinfo/par2info.php");
require_once(WWW_DIR . "lib/rarinfo/archiveinfo.php");
require_once(WWW_DIR . "lib/rarinfo/zipinfo.php");
lib/ProcessAdditional.php
-1
View File
@@ -1,5 +1,4 @@
<?php
require_once(dirname(__FILE__) . "/../bin/config.php");
require_once(WWW_DIR . "/lib/rarinfo/par2info.php");
require_once(WWW_DIR . "/lib/rarinfo/archiveinfo.php");
require_once(WWW_DIR . "/lib/rarinfo/zipinfo.php");
lib/ReleaseCleaner.php
+1 -4
View File
@@ -1,5 +1,4 @@
<?php
require_once(dirname(__FILE__)."/../bin/config.php");
require_once(WWW_DIR . "lib/framework/db.php");
require_once(WWW_DIR."lib/groups.php");
require_once("prehash.php");
@@ -15,7 +14,6 @@ class ReleaseCleaning
{
public $subject = '';
public $groupName = '';
public $size = '';
public $fromName = '';
/**
@@ -30,13 +28,12 @@ class ReleaseCleaning
$this->db = new DB();
}
public function releaseCleaner($subject, $fromName, $size, $groupName, $usepre = false)
public function releaseCleaner($subject, $fromName, $groupName, $usepre = false)
{
$match = $matches = array();
$this->groupName = $groupName;
$this->subject = $subject;
$this->fromName = $fromName;
$this->size = $size;
// Get pre style name from releases.name
if (preg_match_all('/([\w\(\)]+[\s\._-]([\w\(\)]+[\s\._-])+[\w\(\)]+-\w+)/', $this->subject, $matches)) {
lib/ReleaseRemover.php
-1
View File
@@ -1,5 +1,4 @@
<?php
require_once(dirname(__FILE__) . "/../bin/config.php");
require_once(WWW_DIR . "/lib/framework/cache.php");
require_once(WWW_DIR . "/lib/framework/db.php");
require_once(WWW_DIR . "/lib/releases.php");
lib/Sharing.php
-1
View File
@@ -1,5 +1,4 @@
<?php
require_once(dirname(__FILE__) . "/../bin/config.php");
require_once(WWW_DIR . "lib/framework/db.php");
require_once(WWW_DIR . '/lib/nntp.php');
require_once("functions.php");
lib/TraktTv.php
-1
View File
@@ -1,5 +1,4 @@
<?php
require_once(dirname(__FILE__) . "/../bin/config.php");
require_once(WWW_DIR . '/lib/Tmux.php');
require_once(WWW_DIR . '/lib/util.php');
lib/TvAnger.php
-1
View File
@@ -1,5 +1,4 @@
<?php
require_once(dirname(__FILE__) . "/../bin/config.php");
require_once(WWW_DIR . "/lib/framework/db.php");
require_once(WWW_DIR . "/lib/category.php");
require_once(WWW_DIR . "/lib/Tmux.php");
lib/copy_this/misc/update_scripts/import.php
-1
View File
@@ -1,7 +1,6 @@
<?php
define('FS_ROOT', realpath(dirname(__FILE__)));
require_once(FS_ROOT . "/../../www/config.php");
require_once(FS_ROOT . "/../../www/lib/framework/db.php");
require_once(FS_ROOT . "/../../www/lib/releases.php");
require_once(FS_ROOT . "/../../www/lib/nzbinfo.php");
lib/copy_this/www/lib/releases.php
+1 -1
View File
@@ -1707,7 +1707,7 @@ class Releases
$releaseCleaning = new ReleaseCleaning();
$cleanRelName = $this->cleanReleaseName($row['relname']);
$cleanedName = $releaseCleaning->releaseCleaner(
$row['relname'], $row['fromname'], $row['filesize'], $row['group_name']
$row['relname'], $row['fromname'], $row['group_name']
);
if (is_array($cleanedName)) {
lib/fixReleaseNames.php
-2
View File
@@ -9,8 +9,6 @@
*/
//This script is adapted from nZEDb
require_once(dirname(__FILE__)."/../bin/config.php");
require_once("namefixer.php");
require_once("prehash.php");
require_once("functions.php");
lib/functions.php
-1
View File
@@ -1,5 +1,4 @@
<?php
require_once(dirname(__FILE__) . "/../bin/config.php");
require_once(WWW_DIR . "/lib/framework/db.php");
require_once(WWW_DIR . "/lib/category.php");
require_once(WWW_DIR . "/lib/releases.php");
lib/namefixer.php
+1
View File
@@ -77,6 +77,7 @@ class NameFixer
$this->timeall = ' AND rel.adddate > (NOW() - INTERVAL 6 HOUR) GROUP BY rel.ID ORDER BY postdate DESC';
$this->fullother = ' AND rel.categoryID IN (1090, 2020, 3050, 6050, 5050, 7050, 8010) GROUP BY rel.ID';
$this->fullall = '';
$this->_fileName = '';
$this->done = $this->matched = false;
$this->c = new ColorCLI();
$this->consoletools = new ConsoleTools();
lib/nzbcontents.php
-1
View File
@@ -1,5 +1,4 @@
<?php
require_once(dirname(__FILE__)."/../bin/config.php");
require_once(WWW_DIR."/lib/framework/db.php");
require_once(WWW_DIR."/lib/nntp.php");
require_once(WWW_DIR . "/lib/nzb.php");
lib/postprocess_pre.php
+1 -1
View File
@@ -1,6 +1,6 @@
<?php
require_once(dirname(__FILE__) . "/../bin/config.php");
require_once(WWW_DIR . "lib/nntp.php");
require_once(WWW_DIR . "/lib/nntp.php");
require_once("prehash.php");
require_once("ColorCLI.php");
lib/prehash.php
-1
View File
@@ -1,5 +1,4 @@
<?php
require_once(dirname(__FILE__)."/../bin/config.php");
require_once(WWW_DIR."lib/framework/db.php");
require_once(WWW_DIR."lib/groups.php");
require_once(WWW_DIR."lib/nfo.php");
lib/removeCrapReleases.php
+3 -3
View File
@@ -5,9 +5,9 @@
*/
require_once(dirname(__FILE__)."/../bin/config.php");
require_once(WWW_DIR."lib/framework/db.php");
require_once(WWW_DIR."lib/releases.php");
require_once(WWW_DIR."lib/site.php");
require_once(WWW_DIR."/lib/framework/db.php");
require_once(WWW_DIR."/lib/releases.php");
require_once(WWW_DIR."/lib/site.php");
require_once("functions.php");
require_once ("ColorCLI.php");
require_once("ReleaseRemover.php");
lib/showsleep.php
-1
View File
@@ -1,6 +1,5 @@
<?php
//This script is ported from nZEDb and adapted for newznab
require_once(dirname(__FILE__)."/../bin/config.php");
require_once("consoletools.php");
// This script is simply so I can show sleep progress in bash script
python/groupfixrelnames_threaded.py
+1 -1
View File
@@ -39,7 +39,7 @@ where = ""
datelimit = "AND DATEDIFF(NOW(), r.adddate) <= 7"
groupby = "GROUP BY LEFT(r.guid, 1)"
orderby = "ORDER BY LEFT(r.guid, 1) ASC"
rowlimit = "LIMIT 16"
rowlimit = "LIMIT 100"
cur[0].execute("SELECT value FROM tmux WHERE setting = 'fixnamethreads'")
run_threads = cur[0].fetchone()