|
| Author |
Message |
wmcbrine

Joined: 04 Jan 2008 Posts: 514
|
Posted: Wed Feb 20, 2008 12:02 pm Post subject: No more subfolders-8.3 branch; new "clean" branch |
|
|
I've just merged my subfolders-8.3 branch into my master, so there's no longer a separate subfolders branch (anywhere). I didn't really want to do this yet, but it had become too difficult to merge the changes from the other developers into my old master branch. The new master is again in sync with the other forks.
In exchange, I've added a "clean" branch to my repository. This is what I prefer to use on my Ubuntu system -- it's stripped of the Cheetah and eyeD3 libraries (which you can get from Ubuntu repos), and the Windows ffmpeg binary. I had this branch on my own system before, but this is the first time I'm posting it to git. (Previously I've posted a .zip or two with the same contents.) _________________ My pyTivo fork |
|
| Back to top |
|
 |
PaulS
Joined: 04 Jan 2008 Posts: 148
|
Posted: Wed Feb 20, 2008 12:50 pm Post subject: |
|
|
As someone who was happy in using the "autoshares" option, and now the "hack83=true" + "precache=true" tandem, I wasn't really following the whole "subfolders-8.3" stuff.
What is the impact of this merge ? Has the "subfolders-8.3" stuff been obsoleted by the recent subfolder behavior updates in the master branches, or is there a significant change in pyTivo behavior as a result of this merge ? |
|
| Back to top |
|
 |
wmcbrine

Joined: 04 Jan 2008 Posts: 514
|
Posted: Wed Feb 20, 2008 1:22 pm Post subject: |
|
|
hack83 = subfolders-8.3
This merge is really of no concern to end users, unless they were previously downloading snapshots from my subfolders branch and are now wondering where it went.
hack83 is not obsolete, because you still need it if you want to navigate more than one level down. But if you have only one tier of subfolders, you no longer need it. _________________ My pyTivo fork |
|
| Back to top |
|
 |
windracer

Joined: 04 Jan 2008 Posts: 157 Location: St. Pete, FL
|
Posted: Thu Feb 21, 2008 12:19 pm Post subject: |
|
|
... and there was much rejoicing ...
 _________________ pyTiVo on Ubuntu 8.10 |
|
| Back to top |
|
 |
wmcbrine

Joined: 04 Jan 2008 Posts: 514
|
Posted: Wed Feb 27, 2008 11:27 pm Post subject: |
|
|
And now one more branch -- "semi-clean". This leaves out the Windows ffmpeg binaries but keeps the Cheetah and eyeD3 libraries. I imagine it being useful to, e.g., Mac users. _________________ My pyTivo fork |
|
| Back to top |
|
 |
gonzotek
Joined: 12 Jan 2008 Posts: 20
|
Posted: Thu Feb 28, 2008 8:13 am Post subject: |
|
|
Thanks for the clean branch. I'll be using that as the basis of the debian package. I know I promised I'd put something out soon, but some things have come up at work and home that stole a lot of my free time. I have gotten most of the bits in place that need to be done, so I'm at least closer to a release than I was when I posted. I was wondering if you had had time to work out the changes required for pulling the conf file out of /etc ? Here's my first pass at a patch for it, everything seems to work:
| Code: | --- debsandbox/pytivo-0.01/config.py
+++ pytivo/wmcbrine/config.py
@@ -6,7 +6,10 @@
config = ConfigParser.ConfigParser()
p = os.path.dirname(__file__)
-config.read(os.path.join(p, 'pyTivo.conf'))
+if os.path.isfile('/etc/pyTivo.conf'):
+ config.read('/etc/pyTivo.conf')
+else:
+ config.read(os.path.join(p, 'pyTivo.conf'))
def getGUID():
if config.has_option('Server', 'GUID'):
|
I suppose the configurator would need updating as well. |
|
| Back to top |
|
 |
|