From b988fff854b8faf7b7bcce58b666a52c9c58db92 Mon Sep 17 00:00:00 2001 From: Charley Peng Date: Tue, 15 Oct 2013 22:15:23 +1100 Subject: [PATCH 1/5] fixed up base site --- sites/basesite.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sites/basesite.py b/sites/basesite.py index a9b6ccc..5b3d3e7 100755 --- a/sites/basesite.py +++ b/sites/basesite.py @@ -49,7 +49,7 @@ def __init__(self, url, urls_only=False, debugging=False): os.mkdir(self.base_dir) self.url = self.sanitize_url(url) # Directory to store images in - self.working_dir = '%s%s%s' % (self.base_dir, os.sep, self.get_dir(self.url)) + self.working_dir = '%s%s%s' % (self.base_dir, '/', self.get_dir(self.url)) self.max_threads = MAX_THREADS self.thread_count = 0 self.image_count = 0 @@ -282,7 +282,7 @@ def create_thumb(self, inp): sys.stderr.write('Go to http://www.pythonware.com/products/pil/ to install PIL\n') sys.stderr.flush() return - fields = inp.split(os.sep) + fields = inp.split('/') fields.insert(-1, 'thumbs') saveas = os.sep.join(fields) if os.path.exists(saveas): return From 5b216017f80287429e461928b1b0fc6be530ae9c Mon Sep 17 00:00:00 2001 From: Charley Peng Date: Sun, 20 Oct 2013 21:24:55 +1100 Subject: [PATCH 2/5] I hope these don't break anything :) --- rips/view.cgi | 3 +++ 1 file changed, 3 insertions(+) diff --git a/rips/view.cgi b/rips/view.cgi index d6d82b7..3743027 100755 --- a/rips/view.cgi +++ b/rips/view.cgi @@ -326,6 +326,8 @@ def get_images_for_album(album, start, count, thumbs=False): if dstart >= start and (dcount < count or count == -1): image = '%s%s%s' % (roots, sep, f) image = image.replace('%', '%25') + image = image.replace('\\', '/') + image = image.replace('/thumbs/', '/') images.append( { 'image' : image, 'thumb' : get_thumb(image) @@ -635,6 +637,7 @@ def get_keys(): # Retrieve key/value pairs from query, puts in dict return keys def get_thumb(img): # Get thumbnail based on image, or 'nothumb.png' if not found + img= img.replace("\\",sep) # silly windows fs = img.split(sep) fs.insert(-1, 'thumbs') f = sep.join(fs) From 8bb08a99c09591147bc8f1f804e71345d77f4ec7 Mon Sep 17 00:00:00 2001 From: Charley Peng Date: Sun, 24 Nov 2013 23:53:51 +1100 Subject: [PATCH 3/5] adding youtube-dl --- .gitmodules | 3 +++ youtube-dl | 1 + 2 files changed, 4 insertions(+) create mode 100644 .gitmodules create mode 160000 youtube-dl diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..fca489e --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "youtube-dl"] + path = youtube-dl + url = https://github.com/rg3/youtube-dl.git diff --git a/youtube-dl b/youtube-dl new file mode 160000 index 0000000..dc65dcb --- /dev/null +++ b/youtube-dl @@ -0,0 +1 @@ +Subproject commit dc65dcbb6d709ef6e38f336fe77c14767d6c8f9d From a76174a854a5b6342240d1f0a286ae4f3c9627e6 Mon Sep 17 00:00:00 2001 From: Charley Peng Date: Sun, 24 Nov 2013 23:58:45 +1100 Subject: [PATCH 4/5] actually adding the file --- vid.cgi | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/vid.cgi b/vid.cgi index f5db780..b5e27fc 100755 --- a/vid.cgi +++ b/vid.cgi @@ -74,6 +74,7 @@ def get_url(siteurl): if 'cliphunter.com' in siteurl: return get_site_cliphunter(siteurl) if 'spankwire.com' in siteurl: return get_site_spankwire(siteurl) if 'kinkylicious.com' in siteurl: return get_site_kinkylicious(siteurl) + if 'youtube.com' in siteurl: return get_site_youtube(siteurl) site_key = None for key in sites.keys(): @@ -92,6 +93,14 @@ def get_url(siteurl): url = unquote(url) return url +def get_site_youtube(siteurl): + import sys + sys.path.append('youtube-dl') + import youtube_dl + yt = youtube_dl.YoutubeDL(param) + yt.add_default_info_extractors() + return yt.extract_info(siteurl)['entries'][0]['url'] + def get_site_beeg(siteurl): r = web.get(siteurl) if not "'file': '" in r: From 8bf3e75a812e4a676a8c898a50658e3f39651893 Mon Sep 17 00:00:00 2001 From: Charley Peng Date: Mon, 25 Nov 2013 00:06:13 +1100 Subject: [PATCH 5/5] sorry about the commented out code --- vid.cgi | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/vid.cgi b/vid.cgi index b5e27fc..0c7be9e 100755 --- a/vid.cgi +++ b/vid.cgi @@ -37,7 +37,7 @@ def get_video_url(siteurl): }) def get_url(siteurl): - is_supported(siteurl) + # is_supported(siteurl) sites = { 'videobam.com/' : { 'begend' : ['"', '"'], 'unquote' : 1 }, 'xhamster.com/' : { 'begend' : ['"', '"'], 'unquote' : 1 }, @@ -406,10 +406,10 @@ def get_site_kinkylicious(siteurl): return 'http://kinkylicious.com/vdata/%s.flv' % vid -def is_supported(url): - for not_supported in ['youtube.com/']: - if not_supported in url: - raise Exception('%s is not supported' % not_supported) +# def is_supported(url): +# for not_supported in ['youtube.com/']: +# if not_supported in url: +# raise Exception('%s is not supported' % not_supported) def get_deepest_ind(source, ext_inds): deep_ind = 0