From 9b98abdbc631163097098763a56c4772cb040f63 Mon Sep 17 00:00:00 2001 From: j <0x006A@0x2620.org> Date: Thu, 13 Oct 2011 12:21:16 +0200 Subject: [PATCH 1/2] parse_movie_path/create_movie_path --- ox/__init__.py | 3 +- ox/movie.py | 127 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 129 insertions(+), 1 deletion(-) create mode 100644 ox/movie.py diff --git a/ox/__init__.py b/ox/__init__.py index ace9928..581bc54 100644 --- a/ox/__init__.py +++ b/ox/__init__.py @@ -14,6 +14,7 @@ from format import * from html import * from image import * from location import * +from movie import * from normalize import * from text import * -from torrent import * \ No newline at end of file +from torrent import * diff --git a/ox/movie.py b/ox/movie.py new file mode 100644 index 0000000..a20b107 --- /dev/null +++ b/ox/movie.py @@ -0,0 +1,127 @@ +# -*- coding: utf-8 -*- +# vi:si:et:sw=4:sts=4:ts=4 +# GPL 2011 +from __future__ import division + +import os + +from normalize import normalizeName +from text import get_sort_name, findRe + +__all__ = ['parse_movie_path', 'create_movie_path'] + +def parse_movie_path(path): + """ + "A/Abrams, J.J.; Lieber, Jeffrey; Lindelof, Damon/Lost (2004)/Lost.Season 3.Episode 21.Greatest Hits.avi" + "B/Balada, Ivan/Metrum (1967)/Metrum.Part 1.en.srt" + "N/Nakata, Hideo/L - Change the World (2008)/L - Change the World.Part 2.srt" + "R/Reitz, Edgar/Heimat (1984-2006)/Heimat.Season 2.Episode 8.The Wedding.Part 2.avi" + "F/Feuillade, Louis/Les vampires (1915)/Les vampires.Episode 10.Part 2.avi" + title: 'Les vampires', year: '1915', episode: 10, part: 2 + + "G/Godard, Jean-Luc/Histoire(s) du cinema_ Toutes les histoires (1988)/Histoire(s) du cinema_ Toutes les histoires.avi" + "G/Godard, Jean-Luc/Six fois deux (1976)/Six fois deux.Part 1A.Y a personne.avi" + "G/Godard, Jean-Luc; Miéville, Anne-Marie/France_tour_detour_deux_enfants (1977)/France_tour_detour_deux_enfants.Part 5.Impression_Dictée.avi" + + "L/Labarthe, André S_/Cinéastes de notre temps (1964-)/Cinéastes de notre temps.Episode.Jean Renoir le patron, première partie_ La Recherche du relatif.avi" + "S/Scott, Ridley/Blade Runner (1982)/Blade Runner.Directors's Cut.avi" + + """ + episodeTitle = episodeYear = None + episodeDirector = [] + parts = path.split('/') + + #title/year + title = parts[2] + year = findRe(title, '(\(\d{4}\))') + if not year: + year = findRe(title, '(\(\d{4}-\d*\))') + if year and title.endswith(year): + title = title[:-len(year)].strip() + year = year[1:-1] + if '-' in year: + year = findRe(year, '\d{4}') + #director + director = parts[1] + if director.endswith('_'): + director = "%s." % director[:-1] + director = director.split('; ') + director = [normalizeName(d).strip() for d in director] + + #extension/language + fileparts = parts[-1].split('.') + extension = fileparts[-1] + + if len(fileparts[-2]) == 2: + language = fileparts[-2] + else: + language = '' + + #season/episode/episodeTitle + season = findRe(parts[-1], '\.Season (\d+)\.') + if season: + season = int(season) + else: + season = None + + episode = findRe(parts[-1], '\.Episode (\d+)\.') + if episode: + episode = int(episode) + else: + episode = None + + if episode: + episodeTitle = fileparts.index('Episode %d' % episode) + 1 + episodeTitle = fileparts[episodeTitle] + if episodeTitle == extension or episodeTitle.startswith('Part'): + episodeTitle = None + + #part + part = findRe(parts[-1], '\.Part (\d+)\.') + if part: + part = int(part) + else: + part = 0 + + return { + 'director': director, + 'episodeDirector': episodeDirector, + 'episode': episode, + 'episodeTitle': episodeTitle, + 'episodeYear': episodeYear, + 'extension': extension, + 'language': language, + 'part': part, + 'season': season, + 'title': title, + 'year': year, + } + +def create_movie_path(title, director, year, + season, episode, episodeTitle, episodeDirector, episodeYear, + part, language, extension): + ''' + { + title: '', director: [''], year: '', + season: int, episode: int, episodeTitle: '', episodeDirector: [''], episodeYear: '', + part: int, language: '', extension: '', extra: bool + }) + ''' + partTitle = None + director = '; '.join(map(get_sort_name, director)) + episodeDirector = '; '.join(map(get_sort_name, episodeDirector)) + filename = [title] + if season: + filename += ['Season %d' % season] + if episode: + filename += ['Episode %d' % episode] + if episodeTitle: + filename += [episodeTitle] + if part: + filename += ['Part %s' % part] + if partTitle: + filename += [partTitle] + filename += [extension] + filename = '.'.join(filename) + path = os.path.join(director[0], director, '%s (%s)' % (title, year), filename) + return path From c2c5fbb7253cf5b331eb51fe8d74f5744b081479 Mon Sep 17 00:00:00 2001 From: j <0x006A@0x2620.org> Date: Thu, 13 Oct 2011 15:08:40 +0200 Subject: [PATCH 2/2] add get_oxid --- ox/movie.py | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/ox/movie.py b/ox/movie.py index a20b107..54e53e4 100644 --- a/ox/movie.py +++ b/ox/movie.py @@ -4,11 +4,12 @@ from __future__ import division import os +import hashlib from normalize import normalizeName from text import get_sort_name, findRe -__all__ = ['parse_movie_path', 'create_movie_path'] +__all__ = ['parse_movie_path', 'create_movie_path', 'get_oxid'] def parse_movie_path(path): """ @@ -47,6 +48,7 @@ def parse_movie_path(path): director = "%s." % director[:-1] director = director.split('; ') director = [normalizeName(d).strip() for d in director] + director = filter(lambda d: d not in ('Unknown Director', 'Various Directors'), director) #extension/language fileparts = parts[-1].split('.') @@ -125,3 +127,17 @@ def create_movie_path(title, director, year, filename = '.'.join(filename) path = os.path.join(director[0], director, '%s (%s)' % (title, year), filename) return path + +def get_oxid(title, director=[], year='', + season='', episode='', episode_title='', episode_director=[], episode_year=''): + def get_hash(string): + return hashlib.sha1(string.encode('utf-8')).hexdigest().upper() + director = ', '.join(director) + episode_director = ', '.join(episode_director) + if not episode: + oxid = get_hash(director)[:8] + get_hash('\n'.join([title, str(year)]))[:8] + else: + oxid = get_hash('\n'.join([director, title, str(year), str(season)]))[:8] + \ + get_hash('\n'.join([str(episode), episode_director, episode_title, str(episode_year)]))[:8] + return u'0x' + oxid +