- add option to customize path parsing
https://wiki.0x2620.org/wiki/pandora_client/plugins - dont send ignored files
This commit is contained in:
parent
8790f223fc
commit
b631af59d5
3 changed files with 98 additions and 41 deletions
11
config.plugin_example.py
Normal file
11
config.plugin_example.py
Normal file
|
@ -0,0 +1,11 @@
|
||||||
|
{
|
||||||
|
"url": "http://pandora_url/api/",
|
||||||
|
"profile": "480p.webm",
|
||||||
|
"username": "username",
|
||||||
|
"password": "password",
|
||||||
|
"cache": "~/.ox/project.sqlite",
|
||||||
|
"plugin.d": "~/.ox/projectname.d",
|
||||||
|
"volumes": {
|
||||||
|
"my videos": "/home/example/Movies"
|
||||||
|
}
|
||||||
|
}
|
|
@ -5,6 +5,8 @@
|
||||||
from __future__ import division, with_statement
|
from __future__ import division, with_statement
|
||||||
|
|
||||||
import getpass
|
import getpass
|
||||||
|
from glob import glob
|
||||||
|
import imp
|
||||||
import json
|
import json
|
||||||
import math
|
import math
|
||||||
import os
|
import os
|
||||||
|
@ -45,9 +47,9 @@ def encode(filename, prefix, profile, info=None, extract_frames=True):
|
||||||
print frame_f
|
print frame_f
|
||||||
extract.frame(filename, frame_f, pos)
|
extract.frame(filename, frame_f, pos)
|
||||||
frames.append(frame_f)
|
frames.append(frame_f)
|
||||||
video_f = os.path.join(cache, profile)
|
media_f = os.path.join(cache, profile)
|
||||||
if not os.path.exists(video_f):
|
if not os.path.exists(media_f):
|
||||||
extract.video(filename, video_f, profile, info)
|
extract.video(filename, media_f, profile, info)
|
||||||
else:
|
else:
|
||||||
print info
|
print info
|
||||||
print filename
|
print filename
|
||||||
|
@ -56,7 +58,7 @@ def encode(filename, prefix, profile, info=None, extract_frames=True):
|
||||||
'info': info,
|
'info': info,
|
||||||
'oshash': oshash,
|
'oshash': oshash,
|
||||||
'frames': frames,
|
'frames': frames,
|
||||||
'video': video_f
|
'media': media_f
|
||||||
}
|
}
|
||||||
|
|
||||||
def encode_cmd(filename, prefix, profile, info):
|
def encode_cmd(filename, prefix, profile, info):
|
||||||
|
@ -66,8 +68,40 @@ def encode_cmd(filename, prefix, profile, info):
|
||||||
return None
|
return None
|
||||||
oshash = info['oshash']
|
oshash = info['oshash']
|
||||||
cache = os.path.join(prefix, os.path.join(*utils.hash_prefix(oshash)))
|
cache = os.path.join(prefix, os.path.join(*utils.hash_prefix(oshash)))
|
||||||
video_f = os.path.join(cache, profile)
|
media_f = os.path.join(cache, profile)
|
||||||
return extract.video_cmd(filename, video_f, profile, info)
|
return extract.video_cmd(filename, media_f, profile, info)
|
||||||
|
|
||||||
|
def parse_path(client, path):
|
||||||
|
'''
|
||||||
|
args:
|
||||||
|
path - path without volume prefix
|
||||||
|
client - Client instance
|
||||||
|
return:
|
||||||
|
return None if file will not be used, dict with parsed item information otherwise
|
||||||
|
'''
|
||||||
|
if len(path.split('/')) != client.folderdepth:
|
||||||
|
return None
|
||||||
|
info = ox.movie.parse_path(path)
|
||||||
|
if client.folderdepth == 3:
|
||||||
|
info['director'] = []
|
||||||
|
info['directorSort'] = []
|
||||||
|
return info
|
||||||
|
|
||||||
|
def example_path(client):
|
||||||
|
return '\t' + (client.folderdepth == 4 and 'L/Last, First/Title (Year)/Title.avi' or 'T/Title/Title.dv')
|
||||||
|
|
||||||
|
def ignore_file(client, path):
|
||||||
|
filename = os.path.basename(path)
|
||||||
|
if filename.startswith('._') \
|
||||||
|
or filename in ('.DS_Store', ) \
|
||||||
|
or filename.endswith('~') \
|
||||||
|
or 'Extras/' in path \
|
||||||
|
or 'Versions/' in path \
|
||||||
|
or not os.path.exists(path) \
|
||||||
|
or os.stat(path).st_size == 0:
|
||||||
|
return True
|
||||||
|
return False
|
||||||
|
|
||||||
|
|
||||||
class Client(object):
|
class Client(object):
|
||||||
_configfile = None
|
_configfile = None
|
||||||
|
@ -81,6 +115,8 @@ class Client(object):
|
||||||
except ValueError:
|
except ValueError:
|
||||||
print "Failed to parse config at", config
|
print "Failed to parse config at", config
|
||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
|
base = self._config.get('plugin.d', '~/.ox/client.d')
|
||||||
|
self.load_plugins(base)
|
||||||
else:
|
else:
|
||||||
self._config = config
|
self._config = config
|
||||||
if not self._config['url'].endswith('/'):
|
if not self._config['url'].endswith('/'):
|
||||||
|
@ -134,6 +170,23 @@ class Client(object):
|
||||||
c.execute(i)
|
c.execute(i)
|
||||||
conn.commit()
|
conn.commit()
|
||||||
|
|
||||||
|
def load_plugins(self, base='~/.ox/client.d'):
|
||||||
|
global parse_path, example_path, ignore_file, encode, encode_cmd
|
||||||
|
base = os.path.expanduser(base)
|
||||||
|
for path in sorted(glob('%s/*.py' % base)):
|
||||||
|
with open(path) as fp:
|
||||||
|
module = imp.load_source(os.path.basename(path).split('.')[0], base, fp)
|
||||||
|
if hasattr(module, 'parse_path'):
|
||||||
|
parse_path = module.parse_path
|
||||||
|
if hasattr(module, 'example_path'):
|
||||||
|
example_path = module.example_path
|
||||||
|
if hasattr(module, 'ignore_file'):
|
||||||
|
ignore_file = module.ignore_file
|
||||||
|
if hasattr(module, 'encode'):
|
||||||
|
encode = module.encode
|
||||||
|
if hasattr(module, 'encode_cmd'):
|
||||||
|
encode_cmd = module.encode_cmd
|
||||||
|
|
||||||
def _conn(self):
|
def _conn(self):
|
||||||
db_conn = os.path.expanduser(self._config['cache'])
|
db_conn = os.path.expanduser(self._config['cache'])
|
||||||
if not os.path.exists(os.path.dirname(db_conn)):
|
if not os.path.exists(os.path.dirname(db_conn)):
|
||||||
|
@ -167,10 +220,7 @@ class Client(object):
|
||||||
path = self.path(oshash)
|
path = self.path(oshash)
|
||||||
if info and path:
|
if info and path:
|
||||||
path = '/'.join(path[0].split('/')[-self.folderdepth:])
|
path = '/'.join(path[0].split('/')[-self.folderdepth:])
|
||||||
info.update(ox.movie.parse_path(path))
|
info.update(parse_path(self, path) or {})
|
||||||
if self.folderdepth == 3:
|
|
||||||
info['director'] = []
|
|
||||||
info['directorSort'] = []
|
|
||||||
return info
|
return info
|
||||||
|
|
||||||
def path(self, oshash):
|
def path(self, oshash):
|
||||||
|
@ -339,6 +389,7 @@ class Client(object):
|
||||||
known_files = [r[0] for r in c.fetchall()]
|
known_files = [r[0] for r in c.fetchall()]
|
||||||
|
|
||||||
files = []
|
files = []
|
||||||
|
unknown = []
|
||||||
for dirpath, dirnames, filenames in os.walk(path, followlinks=True):
|
for dirpath, dirnames, filenames in os.walk(path, followlinks=True):
|
||||||
if isinstance(dirpath, str):
|
if isinstance(dirpath, str):
|
||||||
dirpath = dirpath.decode('utf-8')
|
dirpath = dirpath.decode('utf-8')
|
||||||
|
@ -346,15 +397,25 @@ class Client(object):
|
||||||
for filename in sorted(filenames):
|
for filename in sorted(filenames):
|
||||||
if isinstance(filename, str):
|
if isinstance(filename, str):
|
||||||
filename = filename.decode('utf-8')
|
filename = filename.decode('utf-8')
|
||||||
if not filename.startswith('._') \
|
file_path = os.path.join(dirpath, filename)
|
||||||
and not filename in ('.DS_Store', ) \
|
if not ignore_file(self, file_path):
|
||||||
and not filename.endswith('~'):
|
files.append(file_path)
|
||||||
file_path = os.path.join(dirpath, filename)
|
for f in files:
|
||||||
if not 'Extras/' in file_path \
|
if not parse_path(self, f[len(path):]):
|
||||||
and os.path.exists(file_path) and os.stat(file_path).st_size>0:
|
unknown.append(f)
|
||||||
files.append(file_path)
|
|
||||||
self.scan_file(file_path)
|
files = list(set(files) - set(unknown))
|
||||||
|
for f in files:
|
||||||
|
self.scan_file(f)
|
||||||
|
|
||||||
|
if unknown:
|
||||||
|
example = example_path(self)
|
||||||
|
print 'Files need to be in a folder structure like this:\n%s\n' % example
|
||||||
|
print 'The following files do not fit into the folder structure and will not be synced:'
|
||||||
|
print '\t',
|
||||||
|
print '\n\t'.join([f[len(path):] for f in unknown])
|
||||||
|
print ''
|
||||||
|
|
||||||
deleted_files = filter(lambda f: f not in files, known_files)
|
deleted_files = filter(lambda f: f not in files, known_files)
|
||||||
new_files = filter(lambda f: f not in known_files, files)
|
new_files = filter(lambda f: f not in known_files, files)
|
||||||
conn, c = self._conn()
|
conn, c = self._conn()
|
||||||
|
@ -364,16 +425,6 @@ class Client(object):
|
||||||
c.execute('UPDATE file SET deleted=? WHERE path=?', (deleted, f))
|
c.execute('UPDATE file SET deleted=? WHERE path=?', (deleted, f))
|
||||||
conn.commit()
|
conn.commit()
|
||||||
|
|
||||||
ignored=[]
|
|
||||||
for f in files:
|
|
||||||
f = f[len(path):]
|
|
||||||
if len(f.split('/')) != self.folderdepth and not 'Versions' in f or 'Extras' in f:
|
|
||||||
ignored.append(f)
|
|
||||||
if ignored:
|
|
||||||
example = self.folderdepth == 4 and 'L/Last, First/Title (Year)/Title.avi' or 'T/Title/Title.dv'
|
|
||||||
print 'The following files do not conform to the required folder structure and will be ignored. only files like this are synced:\n\t%s' % example
|
|
||||||
print '\n'.join(ignored)
|
|
||||||
|
|
||||||
print "scanned volume %s: %s files, %s new, %s deleted" % (
|
print "scanned volume %s: %s files, %s new, %s deleted" % (
|
||||||
name, len(files), len(new_files), len(deleted_files))
|
name, len(files), len(new_files), len(deleted_files))
|
||||||
|
|
||||||
|
@ -390,13 +441,6 @@ class Client(object):
|
||||||
|
|
||||||
if os.path.exists(path):
|
if os.path.exists(path):
|
||||||
files += self.files(path)['info']
|
files += self.files(path)['info']
|
||||||
def no_extras(oshash):
|
|
||||||
for path in self.path(oshash):
|
|
||||||
if '/extras' in path.lower() or \
|
|
||||||
'/versions' in path.lower():
|
|
||||||
return False
|
|
||||||
return True
|
|
||||||
files = filter(no_extras, files)
|
|
||||||
else:
|
else:
|
||||||
files = [len(f) == 16 and f or ox.oshash(f) for f in args]
|
files = [len(f) == 16 and f or ox.oshash(f) for f in args]
|
||||||
else:
|
else:
|
||||||
|
@ -663,12 +707,12 @@ class API(ox.API):
|
||||||
form.add_file('frame', fname, open(frame, 'rb'))
|
form.add_file('frame', fname, open(frame, 'rb'))
|
||||||
r = self._json_request(self.url, form)
|
r = self._json_request(self.url, form)
|
||||||
|
|
||||||
#upload video
|
#upload media
|
||||||
if os.path.exists(i['video']):
|
if os.path.exists(i['media']):
|
||||||
size = ox.format_bytes(os.path.getsize(i['video']))
|
size = ox.format_bytes(os.path.getsize(i['media']))
|
||||||
print "uploading %s of %s (%s)" % (profile, os.path.basename(filename), size)
|
print "uploading %s of %s (%s)" % (profile, os.path.basename(filename), size)
|
||||||
url = self.url + 'upload/' + '?profile=' + str(profile) + '&id=' + i['oshash']
|
url = self.url + 'upload/' + '?profile=' + str(profile) + '&id=' + i['oshash']
|
||||||
if not self.upload_chunks(url, i['video'], data):
|
if not self.upload_chunks(url, i['media'], data):
|
||||||
if DEBUG:
|
if DEBUG:
|
||||||
print "failed"
|
print "failed"
|
||||||
return False
|
return False
|
||||||
|
|
4
setup.py
4
setup.py
|
@ -35,7 +35,9 @@ It is currently known to work on Linux and Mac OS X.
|
||||||
packages=[
|
packages=[
|
||||||
'pandora_client'
|
'pandora_client'
|
||||||
],
|
],
|
||||||
install_requires=['ox'],
|
install_requires=[
|
||||||
|
'ox >= 2.1.1'
|
||||||
|
],
|
||||||
keywords = [
|
keywords = [
|
||||||
],
|
],
|
||||||
classifiers = [
|
classifiers = [
|
||||||
|
|
Loading…
Reference in a new issue