Added a global function that runs all needed functions

This commit is contained in:
2017-03-05 15:57:00 +01:00
parent a79e565c3f
commit cd2dbc3479
3 changed files with 31 additions and 21 deletions

View File

@@ -3,7 +3,7 @@
# @Author: KevinMidboe # @Author: KevinMidboe
# @Date: 2017-03-04 16:50:09 # @Date: 2017-03-04 16:50:09
# @Last Modified by: KevinMidboe # @Last Modified by: KevinMidboe
# @Last Modified time: 2017-03-05 14:48:17 # @Last Modified time: 2017-03-05 15:53:19
import os, sqlite3, re, json import os, sqlite3, re, json
from fuzzywuzzy import process from fuzzywuzzy import process
@@ -105,7 +105,8 @@ def getEpisodeInfo(folderItem):
'subtitles': subtitles, 'subtitles': subtitles,
'trash': trash, 'trash': trash,
'tweet_id': 'NULL', 'tweet_id': 'NULL',
'verified': '0'} 'verified': '0',
'moved': '0'}
addToDB(episodeInfo) addToDB(episodeInfo)
@@ -126,11 +127,12 @@ def addToDB(episodeInfo):
trash = json.dumps(episodeInfo['trash']) trash = json.dumps(episodeInfo['trash'])
tweet_id = episodeInfo['tweet_id'] + ',' tweet_id = episodeInfo['tweet_id'] + ','
verified = episodeInfo['verified'] verified = episodeInfo['verified']
moved = episodeInfo['moved']
print((media_items)) print((media_items))
try: try:
c.execute('INSERT INTO stray_episodes VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)', [original,\ c.execute('INSERT INTO stray_episodes VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)', [original,\
full_path, name, season, episode, media_items, subtitles, trash, None, verified]) full_path, name, season, episode, media_items, subtitles, trash, None, verified, moved])
except sqlite3.IntegrityError: except sqlite3.IntegrityError:
print('Episode already registered') print('Episode already registered')
@@ -138,11 +140,11 @@ def addToDB(episodeInfo):
conn.commit() conn.commit()
conn.close() conn.close()
def main(): def findStray():
for item in getNewFolderContents(): for item in getNewFolderContents():
if checkForSingleEpisodes(item): if checkForSingleEpisodes(item):
pprint(getEpisodeInfo(item)) pprint(getEpisodeInfo(item))
if __name__ == '__main__': if __name__ == '__main__':
main() findStray()

View File

@@ -3,7 +3,7 @@
# @Author: KevinMidboe # @Author: KevinMidboe
# @Date: 2017-03-05 13:52:45 # @Date: 2017-03-05 13:52:45
# @Last Modified by: KevinMidboe # @Last Modified by: KevinMidboe
# @Last Modified time: 2017-03-05 15:22:30 # @Last Modified time: 2017-03-05 15:53:04
import sqlite3, json, os import sqlite3, json, os
from re import sub from re import sub
@@ -14,7 +14,7 @@ def unpackEpisodes():
conn = sqlite3.connect(dbPath) conn = sqlite3.connect(dbPath)
c = conn.cursor() c = conn.cursor()
cursor = c.execute('SELECT * FROM stray_episodes WHERE verified = 1') cursor = c.execute('SELECT * FROM stray_episodes WHERE verified = 1 AND moved = 0')
episodeList = [] episodeList = []
for row in c.fetchall(): for row in c.fetchall():
columnNames = [description[0] for description in cursor.description] columnNames = [description[0] for description in cursor.description]
@@ -50,7 +50,7 @@ def newnameMediaitems(media_items):
returnList = [] returnList = []
for item in media_items: for item in media_items:
returnList.append([item[0], sub(item[1], '', item[0])]) returnList.append([item[0], item[0].replace(item[1], '')])
return returnList return returnList
@@ -59,11 +59,20 @@ def newnameSubtitles(subtitles):
returnList = [] returnList = []
for item in subtitles: for item in subtitles:
returnList.append([item[0], sub(item[1], '.' + item[2], item[0])]) returnList.append([item[0], item[0].replace(item[1], '.' + item[2])])
return returnList return returnList
def updateMovedStatus(episodeDict):
conn = sqlite3.connect(dbPath)
c = conn.cursor()
c.execute('UPDATE stray_episodes SET moved = 1 WHERE original is "' + episodeDict['original'] + '"')
conn.commit()
conn.close()
def moveFiles(episode): def moveFiles(episode):
showDir = '/Volumes/media/tv/' showDir = '/Volumes/media/tv/'
episodeFormat = '%s S%sE%s/'% (episode['name'], episode['season'], episode['episode']) episodeFormat = '%s S%sE%s/'% (episode['name'], episode['season'], episode['episode'])
@@ -80,6 +89,8 @@ def moveFiles(episode):
print(showDir + episode['original'] + '/' + item[0]) print(showDir + episode['original'] + '/' + item[0])
print(showDir + seasonFormat + episodeFormat + item[1] + '\n') print(showDir + seasonFormat + episodeFormat + item[1] + '\n')
updateMovedStatus(episode)
def findVerified(): def findVerified():
@@ -89,11 +100,7 @@ def findVerified():
createFolders(episode) createFolders(episode)
moveFiles(episode) moveFiles(episode)
# for item in c.fetchall():
# print(item)
def main():
findVerified()
if __name__ == '__main__': if __name__ == '__main__':
main() findVerified()

View File

@@ -3,7 +3,7 @@
# @Author: KevinMidboe # @Author: KevinMidboe
# @Date: 2017-03-04 16:50:09 # @Date: 2017-03-04 16:50:09
# @Last Modified by: KevinMidboe # @Last Modified by: KevinMidboe
# @Last Modified time: 2017-03-05 13:07:08 # @Last Modified time: 2017-03-05 15:54:31
import tweepy, sqlite3 import tweepy, sqlite3
from pasteee import Paste from pasteee import Paste
@@ -72,7 +72,7 @@ def tweetEpisode(episode):
updateTweetID(episode, tweet_id) updateTweetID(episode, tweet_id)
def tweetNewEpisodes(): def lookForNewEpisodes():
conn = sqlite3.connect(dbPath) conn = sqlite3.connect(dbPath)
c = conn.cursor() c = conn.cursor()
@@ -125,9 +125,10 @@ def checkForReply():
getReply(tweet) getReply(tweet)
def main(): def tweetNewEpisodes():
tweetNewEpisodes() lookForNewEpisodes()
checkForReply() checkForReply()
if __name__ == '__main__': if __name__ == '__main__':
main() tweetNewEpisodes()