1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
|
diff -Naur flickrfs-1.2.9.orig/flickrapi.py flickrfs-1.2.9/flickrapi.py
--- flickrfs-1.2.9.orig/flickrapi.py 2006-05-26 02:57:08.000000000 +0200
+++ flickrfs-1.2.9/flickrapi.py 2006-07-26 09:16:23.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!python
#
# Flickr API implementation
#
diff -Naur flickrfs-1.2.9.orig/flickrfs.conf flickrfs-1.2.9/flickrfs.conf
--- flickrfs-1.2.9.orig/flickrfs.conf 1970-01-01 01:00:00.000000000 +0100
+++ flickrfs-1.2.9/flickrfs.conf 2006-07-26 09:16:23.000000000 +0200
@@ -0,0 +1,18 @@
+[USER]
+
+# for out-of-band auth inside a web browser
+browserName : /usr/bin/firefox
+
+
+#-------------------------------------------------------------------
+
+# It is not necessary to change these. They just identifies this as
+# this application as flickrfs so that flickr.com can track the
+# usage by different api's
+
+# API key
+flickrAPIKey : f8aa9917a9ae5e44a87cae657924f42d
+
+# shared "secret"
+flickrSecret : 3fbf7144be7eca28
+
diff -Naur flickrfs-1.2.9.orig/flickrfs.py flickrfs-1.2.9/flickrfs.py
--- flickrfs-1.2.9.orig/flickrfs.py 2006-05-28 09:07:25.000000000 +0200
+++ flickrfs-1.2.9/flickrfs.py 2006-07-26 09:28:28.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!python
#===============================================================================
# flickrfs - Virtual Filesystem for Flickr
# Copyright (c) 2005 Manish Rai Jain <manishrjain@gmail.com>
@@ -18,7 +18,14 @@
from errno import *
from stat import *
from traceback import format_exc
+
+import fuse
+# Necessary for new python api to fuse
+# --G.Wrobel
+fuse.compat_0_1 = True
+
from fuse import Fuse
+
from flickrapi import FlickrAPI
import random
import commands
@@ -26,10 +33,8 @@
#Some global definitions and functions
DEFAULTBLOCKSIZE = 4*1024 #4KB
-# flickr auth information
-flickrAPIKey = "f8aa9917a9ae5e44a87cae657924f42d" # API key
-flickrSecret = "3fbf7144be7eca28" # shared "secret"
-browserName = "/usr/bin/firefox" # for out-of-band auth inside a web browser
+# Import ConfigParser
+from ConfigParser import ConfigParser
#Set up the .flickfs directory.
homedir = os.getenv('HOME')
@@ -40,6 +45,19 @@
# Remove previous metadata files from ~/.flickrfs
for a in glob(os.path.join(flickrfsHome, '.*')):
os.remove(os.path.join(flickrfsHome, a))
+def read_config(config_file = '/etc/flickrfs/flickrfs.conf'):
+ defaults = {
+ 'flickrAPIKey' : "f8aa9917a9ae5e44a87cae657924f42d", # API key
+ 'flickrSecret' : "3fbf7144be7eca28", # shared "secret"
+ 'browserName' : "/usr/bin/firefox",} # for out-of-band auth inside a web browser
+
+ config = ConfigParser(defaults)
+ config.add_section('USER')
+
+ if os.access(config_file, os.R_OK):
+ config.read(config_file)
+
+ return config
# Set up logging
log = logging.getLogger('flickrfs')
@@ -1214,6 +1232,12 @@
if __name__ == '__main__':
+
+ config = read_config()
+ flickrAPIKey = config.get('USER', 'flickrAPIKey')
+ flickrSecret = config.get('USER', 'flickrSecret')
+ browserName = config.get('USER', 'browserName')
+
try:
server = Flickrfs()
server.multithreaded = 1;
diff -Naur flickrfs-1.2.9.orig/setup.py flickrfs-1.2.9/setup.py
--- flickrfs-1.2.9.orig/setup.py 1970-01-01 01:00:00.000000000 +0100
+++ flickrfs-1.2.9/setup.py 2006-07-26 09:16:23.000000000 +0200
@@ -0,0 +1,20 @@
+#!/usr/bin/env python
+
+import sys
+
+from distutils.core import setup
+
+# this affects the names of all the directories we do stuff with
+sys.path.insert(0, './')
+
+setup(name = 'flickrfs',
+ version = '1.1.9',
+ description = 'A virtual filesystem that provides easy access to flickr',
+ author = 'Manish Rai Jain',
+ author_email = 'manishrjain@gmail.com',
+ url = 'http://manishrjain.googlepages.com/flickrfs',
+ py_modules = ['flickrapi'],
+ scripts = ['flickrfs'],
+ data_files = [('/etc/flickrfs', ['flickrfs.conf'])],
+ license = 'GPL',
+ )
|
GitWeb