Updated fixreleasenames_threaded.

This commit is contained in:
DariusIII
2014-05-19 00:02:25 +02:00
parent 6dfa9f49a4
commit 1f171f44ee
3 changed files with 29 additions and 7 deletions
+13 -3
View File
@@ -26,11 +26,12 @@ if len(sys.argv) == 1:
+ "python " + sys.argv[0] + " [nfo, filename, par2] prehashid ...: To process all releases not matched to prehashID, using [nfo, filename, par2].\n"
+ "python " + sys.argv[0] + " nfo clean ...: To process all releases processed by filename, using nfo.\n"
+ "python " + sys.argv[0] + " par2 clean ...: To process all releases processed by filename and nfo, using par2.\n"
+ "python " + sys.argv[0] + " predbft clean ...: To process all releases using reverse match by PreDB title.\n"
+ bcolors.ENDC)
sys.exit()
if sys.argv[1] != "nfo" and sys.argv[1] != "filename" and sys.argv[1] != "md5" and sys.argv[1] != "par2":
print(bcolors.ERROR + "\n\An invalid argument was supplied\npostprocess_threaded.py [md5, nfo, filename, par2]\n" + bcolors.ENDC)
if sys.argv[1] != "nfo" and sys.argv[1] != "filename" and sys.argv[1] != "md5" and sys.argv[1] != "par2" and sys.argv[1] != "predbft":
print(bcolors.ERROR + "\n\An invalid argument was supplied\npostprocess_threaded.py [md5, nfo, filename, par2, predbft]\n" + bcolors.ENDC)
sys.exit()
if len(sys.argv) == 3 and sys.argv[1] == "nfo" and sys.argv[2] == "clean":
@@ -66,7 +67,7 @@ elif len(sys.argv) > 1 and (sys.argv[1] == "filename"):
datas = cur[0].fetchall()
elif len(sys.argv) > 1 and (sys.argv[1] == "md5"):
while len(datas) == 0 and maxtries >= -5:
run = "SELECT DISTINCT rel.ID FROM releases rel INNER JOIN releasefiles rf ON rel.ID = rf.releaseID WHERE rel.dehashstatus BETWEEN %s AND 0 AND rel.passwordstatus >= -1 AND (rel.ishashed = 1 OR rf.ishashed = 1) AND prehashID = 0 ORDER BY postdate ASC LIMIT %s"
run = "SELECT DISTINCT rel.ID FROM releases rel INNER JOIN releasefiles rf ON rel.ID = rf.releaseID WHERE rel.dehashstatus BETWEEN %s AND 0 AND (rel.ishashed = 1 OR rf.ishashed = 1) AND prehashID = 0 ORDER BY postdate ASC LIMIT %s"
cur[0].execute(run, (maxtries, int(perrun[0])*int(run_threads[0])))
datas = cur[0].fetchall()
maxtries = maxtries - 1
@@ -75,6 +76,11 @@ elif len(sys.argv) > 1 and (sys.argv[1] == "par2"):
run = "SELECT ID AS releaseID, guid, groupID FROM releases WHERE categoryID = 8010 AND proc_par2 = 0 AND" + clean + "ORDER BY postdate ASC LIMIT %s"
cur[0].execute(run, (int(perrun[0]) * int(run_threads[0])))
datas = cur[0].fetchall()
elif len(sys.argv) > 1 and (sys.argv[1] == "predbft"):
#This one does from oldest posts to newest posts since there are many other more efficient PreDB matching schemes
run = "SELECT ID AS preid FROM prehash WHERE LENGTH(title) >= 15 AND searched = 0 AND title NOT REGEXP '[\"\<\> ]' ORDER BY predate ASC LIMIT %s"
cur[0].execute(run, (int(perrun[0])/10 * int(run_threads[0])))
datas = cur[0].fetchall()
#close connection to mysql
info.disconnect(cur[0], cur[1])
@@ -146,6 +152,10 @@ def main():
for release in datas:
time.sleep(.03)
my_queue.put("%s %s %s %s" % ("par2", release[0], release[1], release[2]))
elif sys.argv[1] == "predbft":
for release in datas:
time.sleep(.03)
my_queue.put("%s %s" % ("predbft", release[0]))
my_queue.join()