I'm still seeing differences between git and svn on linux.
Code:
--------------------
cd /usr/share/lms/server
git pull
HEAD is now at c69498e No need to set the ArtworkCache's DB parameters. This
is handled in the
remote: Counting objects: 159, done.
remote: Compressing objects: 100% (6/6), done.
remote: Total 57 (delta 51), reused 57 (delta 51)
Unpacking objects: 100% (57/57), done.
From git://github.com/Logitech/slimserver
c69498e..c09a87a public/7.8 -> origin/public/7.8
fca4a98..26af488 public/feature/no-slimservice ->
origin/public/feature/no-slimservice
Updating c69498e..c09a87a
Fast-forward
Slim/Web/ImageProxy.pm | 77 ++++++++++++++++++++++++++----------------------
1 file changed, 42 insertions(+), 35 deletions(-)
cd /usr/share/lms/server.svn/
root@scserver:/usr/share/lms/server.svn
svn up
At revision 37526.
root@scserver:/usr/share/lms/server.svn
diff ./Slim/Web/ImageProxy.pm ../server/Slim/Web/ImageProxy.pm
68a69,107
>
> my $handleProxiedUrl = sub {
> my $url = shift;
>
> main::DEBUGLOG && $log->debug("Found URL to get artwork:
$url");
>
> $queue{$url} ||= [];
>
> # we're going to queue up requests, so we don't need to
download
> # the same file multiple times due to a race condition
> push @{ $queue{$url} }, {
> client => $client,
> cachekey => $path,
> params => $params,
> callback => $callback,
> spec => $spec,
> args => \@args,
> };
>
> if ( $url =~ /^file:/ ) {
> my $path = Slim::Utils::Misc::pathFromFileURL($url);
> _resizeFromFile($url, $path);
> }
> elsif ( $url =~ /^https?:/ ) {
> # no need to do the http request if we're already
fetching it
> return if scalar @{ $queue{$url} } > 1;
>
> my $http = Slim::Networking::SimpleAsyncHTTP->new(
> \&_gotArtwork,
> \&_gotArtworkError,
> {
> timeout => 30,
> cache => 1,
> },
> );
>
> $http->get( $url );
> }
> };
72c111,112
< $url = $handler->($url, $spec);
---
> $url = $handler->($url, $spec, $handleProxiedUrl);
> return unless defined $url;
75,102c115
< main::DEBUGLOG && $log->debug("Found URL to get artwork: $url");
<
< $queue{$url} ||= [];
<
< # we're going to queue up requests, so we don't need to download
< # the same file multiple times due to a race condition
< push @{ $queue{$url} }, {
< client => $client,
< cachekey => $path,
< params => $params,
< callback => $callback,
< spec => $spec,
< args => \@args,
< };
<
< # no need to do the http request if we're already fetching it
< return if scalar @{ $queue{$url} } > 1;
<
< my $http = Slim::Networking::SimpleAsyncHTTP->new(
< \&_gotArtwork,
< \&_gotArtworkError,
< {
< timeout => 30,
< cache => 1,
< },
< );
<
< $http->get( $url );
---
> $handleProxiedUrl->($url);
118a132,159
> _resizeFromFile($url, $fullpath);
>
> unlink $fullpath;
> }
>
> sub _gotArtworkError {
> my $http = shift;
> my $url = $http->url;
>
> # File does not exist, return 404
> main::INFOLOG && $log->info("Artwork not found, returning 404: " .
$http->url);
>
> while ( my $item = shift @{ $queue{$url} }) {
> my $client = $item->{client};
> my $spec = $item->{spec};
> my $args = $item->{args};
> my $params = $item->{params};
> my $callback = $item->{callback};
>
> _artworkError( $client, $params, $spec, 404, $callback,
@$args );
> }
>
> delete $queue{$url};
> }
>
> sub _resizeFromFile {
> my ($url, $fullpath) = @_;
>
157,179d197
<
< unlink $fullpath;
< }
<
< sub _gotArtworkError {
< my $http = shift;
< my $url = $http->url;
<
< # File does not exist, return 404
< main::INFOLOG && $log->info("Artwork not found, returning 404: " .
$http->url);
<
< # XXX - process the full queue
< while ( my $item = shift @{ $queue{$url} }) {
< my $client = $item->{client};
< my $spec = $item->{spec};
< my $args = $item->{args};
< my $params = $item->{params};
< my $callback = $item->{callback};
<
< _artworkError( $client, $params, $spec, 404, $callback,
@$args );
< }
<
< delete $queue{$url};
320,328d337
<
< # Set highmem params for the artwork cache
< if ( $prefs->get('dbhighmem') ) {
< $cache->pragma('cache_size = 20000');
< $cache->pragma('temp_store = MEMORY');
< }
< else {
< $cache->pragma('cache_size = 300');
< }
root@scserver:/usr/share/lms/server.svn
svn --version
svn, version 1.6.17 (r1128011)
compiled Jun 26 2013, 20:44:36
--------------------
------------------------------------------------------------------------
gharris999's Profile: http://forums.slimdevices.com/member.php?userid=115
View this thread: http://forums.slimdevices.com/showthread.php?t=99667
_______________________________________________
beta mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/beta
