Changeset 386afdbc13017f56e8030efaf16190030aa8ac2e

Timestamp:

02/24/08 21:03:22 (11 months ago)

Author:

KRKeegan <-NOSPAM-kevin@krkeegan.com>

git-committer:

KRKeegan <-NOSPAM-kevin@krkeegan.com> 1203908602 -0800

git-parent:

[1ce91dc85481263c75e4488a36a7d3fb4d844b75], [c38fb9b94bb4f5b0672a1d6418d327b436e1f332]

git-author:

KRKeegan <-NOSPAM-kevin@krkeegan.com> 1203908602 -0800

Message:

Merge branch 'master' into beta-admin

Files:

• plugins/video/video.py (modified) (1 diff)

plugins/video/video.py

@@ -262 +262 @@
-        default_file = os.path.join(os.path.split(full_path)[0], 'default.txt')
-        description_file = full_path + '.txt'
+        description_file2 = os.path.join(os.path.dirname(full_path), '.meta',
+                                         os.path.basename(full_path))  + '.txt'
-
-        metadata.update(self.__getMetadataFromFile(default_file))
-        metadata.update(self.__getMetadataFromFile(description_file))
+        metadata.update(self.__getMetadataFromFile(description_file2))
-
-        return metadata