Skip to content

Commit

Permalink
Backport [24878] from trunk.
Browse files Browse the repository at this point in the history 
Fix adding MythVideo files to a DVD created with MythArchive when the file is
stored in a storage group. Also includes some DB query clean ups.
Patch from wagnerrp. Fixes #8115

git-svn-id: http://svn.mythtv.org/svn/branches/release-0-23-fixes@24879 7dbf422c-18fa-0310-86e9-fd20926502f2
  • Loading branch information
Paul Harrison committed May 26, 2010
1 parent 4ad1cee commit 820652a
Showing 1 changed file with 45 additions and 44 deletions.
89 changes: 45 additions & 44 deletions mythplugins/mytharchive/mythburn/scripts/mythburn.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
#******************************************************************************

# version of script - change after each update
VERSION="0.1.20090139-1"
VERSION="0.1.20100526-1"

# keep all temporary files for debugging purposes
# set this to True before a first run through when testing
Expand Down Expand Up @@ -804,8 +804,8 @@ def getDefaultParametersFromMythTVDB():
write( "Obtaining MythTV settings from MySQL database for hostname " + configHostname)

#TVFormat is not dependant upon the hostname.
sqlstatement="""select value, data from settings where value in('DBSchemaVer')
or (hostname='""" + configHostname + """' and value in(
sqlstatement="""SELECT value, data FROM settings WHERE value IN('DBSchemaVer')
OR (hostname=%s AND value IN(
'VideoStartupDir',
'GalleryDir',
'MusicLocation',
Expand Down Expand Up @@ -838,7 +838,7 @@ def getDefaultParametersFromMythTVDB():
'ISO639Language0',
'ISO639Language1',
'JobQueueCPU'
)) order by value"""
)) ORDER BY value"""

#write( sqlstatement)

Expand All @@ -847,7 +847,7 @@ def getDefaultParametersFromMythTVDB():
# create a cursor
cursor = db.cursor()
# execute SQL statement
cursor.execute(sqlstatement)
cursor.execute(sqlstatement, configHostname)
# get the resultset as a tuple
result = cursor.fetchall()

Expand All @@ -871,13 +871,12 @@ def saveSetting(name, data):
db = getDatabaseConnection()
cursor = db.cursor()

query = "DELETE from settings "
query += "WHERE value = '" + name + "' AND hostname = '" + configHostname + "'"
cursor.execute(query)
cursor.execute("""DELETE FROM settings
WHERE value=%s
AND hostname=%s""", (name, configHostname))

query = "INSERT INTO settings (value, data, hostname) "
query += "VALUES ('" + name + "', '" + data + "', '" + configHostname + "')"
cursor.execute(query)
cursor.execute("""INSERT INTO settings (value, data, hostname)
VALUES(%s, %s, %s)""", (name, data, configHostname))

db.close()
del db
Expand All @@ -894,7 +893,7 @@ def clearArchiveItems():
db = getDatabaseConnection()
cursor = db.cursor()

cursor.execute("DELETE from archiveitems;")
cursor.execute("DELETE FROM archiveitems")

db.close()
del db
Expand Down Expand Up @@ -1404,12 +1403,12 @@ def getFileInformation(file, folder):
# if this a myth recording we still need to find the chanid, starttime and hascutlist
if file.attributes["type"].value=="recording":
basename = os.path.basename(file.attributes["filename"].value)
sqlstatement = """SELECT starttime, chanid FROM recorded
WHERE basename = '%s'""" % basename.replace("'", "\\'")

db = getDatabaseConnection()
cursor = db.cursor()
cursor.execute(sqlstatement)
cursor.execute("""SELECT starttime, chanid FROM recorded
WHERE basename=%s""", basename)

result = cursor.fetchall()
numrows = int(cursor.rowcount)

Expand All @@ -1433,12 +1432,13 @@ def getFileInformation(file, folder):
chanid = record[1]

# find the cutlist if available
sqlstatement = """SELECT mark, type FROM recordedmarkup
WHERE chanid = '%s' AND starttime = '%s'
AND type IN (0,1) ORDER BY mark""" % (chanid, starttime)
cursor = db.cursor()
# execute SQL statement
cursor.execute(sqlstatement)
cursor.execute("""SELECT mark, type FROM recordedmarkup
WHERE chanid=%s
AND starttime=%s
AND type IN(0,1)
ORDER BY mark""", (chanid, starttime))

if cursor.rowcount > 0:
node = infoDOM.createElement("hascutlist")
node.appendChild(infoDOM.createTextNode("yes"))
Expand All @@ -1450,12 +1450,12 @@ def getFileInformation(file, folder):

# find the cut list end marks if available to use as chapter marks
if file.attributes["usecutlist"].value == "0" and addCutlistChapters == True:
sqlstatement = """SELECT mark, type FROM recordedmarkup
WHERE chanid = '%s' AND starttime = '%s'
AND type = 0 ORDER BY mark""" % (chanid, starttime)
cursor = db.cursor()
# execute SQL statement
cursor.execute(sqlstatement)
cursor.execute("""SELECT mark, type FROM recordedmarkup
WHERE chanid=%s
AND starttime=%s
AND type=0
ORDER BY mark""", (chanid, starttime))
# get the resultset as a tuple
result = cursor.fetchall()
if cursor.rowcount > 0:
Expand All @@ -1475,16 +1475,16 @@ def getFileInformation(file, folder):

elif file.attributes["type"].value=="recording":
basename = os.path.basename(file.attributes["filename"].value)
sqlstatement = """SELECT progstart, stars, cutlist, category, description, subtitle,
title, starttime, chanid
FROM recorded WHERE basename = '%s'""" % basename.replace("'", "\\'")

# connect
db = getDatabaseConnection()
# create a cursor
cursor = db.cursor()
# execute SQL statement
cursor.execute(sqlstatement)
cursor.execute("""SELECT progstart, stars, cutlist, category,
description, subtitle, title, starttime,
chanid
FROM recorded
WHERE basename=%s""", basename)
# get the resultset as a tuple
result = cursor.fetchall()
# get the number of rows in the resultset
Expand Down Expand Up @@ -1552,12 +1552,14 @@ def getFileInformation(file, folder):
chanid = record[8]

# find the cutlist if available
sqlstatement = """SELECT mark, type FROM recordedmarkup
WHERE chanid = '%s' AND starttime = '%s'
AND type IN (0,1) ORDER BY mark""" % (chanid, starttime)
cursor = db.cursor()
# execute SQL statement
cursor.execute(sqlstatement)
cursor.execute("""SELECT mark, type FROM recordedmarkup
WHERE chanid=%s
AND starttime=%s
AND type IN(0,1)
ORDER BY mark""", (chanid, starttime))

if cursor.rowcount > 0:
node = infoDOM.createElement("hascutlist")
node.appendChild(infoDOM.createTextNode("yes"))
Expand All @@ -1569,12 +1571,13 @@ def getFileInformation(file, folder):

if file.attributes["usecutlist"].value == "0" and addCutlistChapters == True:
# find the cut list end marks if available
sqlstatement = """SELECT mark, type FROM recordedmarkup
WHERE chanid = '%s' AND starttime = '%s'
AND type = 0 ORDER BY mark""" % (chanid, starttime)
cursor = db.cursor()
# execute SQL statement
cursor.execute(sqlstatement)
cursor.execute("""SELECT mark, type FROM recordedmarkup
WHERE chanid=%s
AND starttime=%s
AND type=0
ORDER BY mark""", (chanid, starttime))
# get the resultset as a tuple
result = cursor.fetchall()
if cursor.rowcount > 0:
Expand All @@ -1593,17 +1596,15 @@ def getFileInformation(file, folder):
del cursor

elif file.attributes["type"].value=="video":
filename = os.path.join(videopath, file.attributes["filename"].value.replace("'", "\\'"))
sqlstatement="""select title, director, plot, rating, inetref, year,
userrating, length, coverfile from videometadata
where filename='%s'""" % filename

# connect
db = getDatabaseConnection()
# create a cursor
cursor = db.cursor()
# execute SQL statement
cursor.execute(sqlstatement)
cursor.execute("""SELECT title, director, plot, rating, inetref, year,
userrating, length, coverfile
FROM videometadata
WHERE filename LIKE %s""", '%'+file.attributes["filename"].value)
# get the resultset as a tuple
result = cursor.fetchall()
# get the number of rows in the resultset
Expand Down

0 comments on commit 820652a

Please sign in to comment.